From 65a769df9134ac6535e4abc50b45566e51c84143 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Mon, 13 Sep 2021 22:32:52 +0200
Subject: [PATCH 01/14] fix typo from backgeound to background

---
 example/README.md                             |   4 +-
 example/android/app/build.gradle              |   2 +-
 .../android/app/src/debug/AndroidManifest.xml |   2 +-
 .../android/app/src/main/AndroidManifest.xml  |   4 +-
 .../MainActivity.kt                           |   2 +-
 .../app/src/profile/AndroidManifest.xml       |   2 +-
 example/ios/Runner.xcodeproj/project.pbxproj  |   6 +-
 example/ios/Runner/Info.plist                 |   2 +-
 example/pubspec.lock                          |  35 +--
 example/pubspec.yaml                          |   2 +-
 pubspec.lock                                  | 257 +-----------------
 test/background_location_test.dart            |   2 +-
 12 files changed, 27 insertions(+), 293 deletions(-)

diff --git a/example/README.md b/example/README.md
index df1bfbf..15b8fad 100644
--- a/example/README.md
+++ b/example/README.md
@@ -1,3 +1,3 @@
-# backgeound_location_example
+# background_location_example
 
-Demonstrates how to use the backgeound_location plugin.
+Demonstrates how to use the background_location plugin.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 7711656..6651aee 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -38,7 +38,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.example.backgeound_location_example"
+        applicationId "com.example.background_location_example"
         minSdkVersion 16
         targetSdkVersion 28
         versionCode flutterVersionCode.toInteger()
diff --git a/example/android/app/src/debug/AndroidManifest.xml b/example/android/app/src/debug/AndroidManifest.xml
index 7e35056..258f82f 100644
--- a/example/android/app/src/debug/AndroidManifest.xml
+++ b/example/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.backgeound_location_example">
+    package="com.example.background_location_example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 1d4dd93..78c0c2c 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.backgeound_location_example">
+    package="com.example.background_location_example">
 
     <!-- io.flutter.app.FlutterApplication is an android.app.Application that
          calls FlutterMain.startInitialization(this); in its onCreate method.
@@ -13,7 +13,7 @@
 
     <application
         android:name="io.flutter.app.FlutterApplication"
-        android:label="backgeound_location_example"
+        android:label="background_location_example"
         android:icon="@mipmap/ic_launcher">
         <activity
             android:name=".MainActivity"
diff --git a/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
index c56b255..753335b 100644
--- a/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
+++ b/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.backgeound_location_example
+package com.example.background_location_example
 
 import android.os.Bundle
 
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
index 7e35056..258f82f 100644
--- a/example/android/app/src/profile/AndroidManifest.xml
+++ b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.backgeound_location_example">
+    package="com.example.background_location_example">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
index 311e3a7..787a1a6 100644
--- a/example/ios/Runner.xcodeproj/project.pbxproj
+++ b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -377,7 +377,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgeoundLocationExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgroundLocationExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 4.0;
@@ -510,7 +510,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgeoundLocationExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgroundLocationExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -540,7 +540,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgeoundLocationExample;
+				PRODUCT_BUNDLE_IDENTIFIER = com.example.backgroundLocationExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_SWIFT3_OBJC_INFERENCE = On;
diff --git a/example/ios/Runner/Info.plist b/example/ios/Runner/Info.plist
index 47fa98c..ef7f261 100644
--- a/example/ios/Runner/Info.plist
+++ b/example/ios/Runner/Info.plist
@@ -22,7 +22,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>backgeound_location_example</string>
+	<string>background_location_example</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
diff --git a/example/pubspec.lock b/example/pubspec.lock
index cd55bb6..e8e0880 100644
--- a/example/pubspec.lock
+++ b/example/pubspec.lock
@@ -7,14 +7,14 @@ packages:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   background_location:
     dependency: "direct dev"
     description:
       path: ".."
       relative: true
     source: path
-    version: "0.4.3"
+    version: "0.6.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -35,7 +35,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -87,7 +87,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -95,27 +95,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.0"
-  permission_handler:
-    dependency: transitive
-    description:
-      name: permission_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.1.3"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.2.0"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -127,7 +106,7 @@ packages:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -162,7 +141,7 @@ packages:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -179,4 +158,4 @@ packages:
     version: "2.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  flutter: ">=1.17.0"
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
index b7e5e6b..313294b 100644
--- a/example/pubspec.yaml
+++ b/example/pubspec.yaml
@@ -1,5 +1,5 @@
 name: background_location_example
-description: Demonstrates how to use the backgeound_location plugin.
+description: Demonstrates how to use the background_location plugin.
 publish_to: "none"
 
 environment:
diff --git a/pubspec.lock b/pubspec.lock
index 8711223..ee2248e 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1,34 +1,13 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
-  _fe_analyzer_shared:
-    dependency: transitive
-    description:
-      name: _fe_analyzer_shared
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "21.0.0"
-  analyzer:
-    dependency: transitive
-    description:
-      name: analyzer
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.0"
-  args:
-    dependency: transitive
-    description:
-      name: args
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
   async:
     dependency: transitive
     description:
       name: async
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.5.0"
+    version: "2.8.1"
   boolean_selector:
     dependency: transitive
     description:
@@ -49,14 +28,7 @@ packages:
       name: charcode
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
-  cli_util:
-    dependency: transitive
-    description:
-      name: cli_util
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.0"
+    version: "1.3.1"
   clock:
     dependency: transitive
     description:
@@ -71,27 +43,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.15.0"
-  convert:
-    dependency: transitive
-    description:
-      name: convert
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  coverage:
-    dependency: transitive
-    description:
-      name: coverage
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.2"
-  crypto:
-    dependency: transitive
-    description:
-      name: crypto
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
   fake_async:
     dependency: transitive
     description:
@@ -99,13 +50,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  file:
-    dependency: transitive
-    description:
-      name: file
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.1.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -116,48 +60,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  glob:
-    dependency: transitive
-    description:
-      name: glob
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.1"
-  http_multi_server:
-    dependency: transitive
-    description:
-      name: http_multi_server
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "4.0.0"
-  io:
-    dependency: transitive
-    description:
-      name: io
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  js:
-    dependency: transitive
-    description:
-      name: js
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.6.3"
-  logging:
-    dependency: transitive
-    description:
-      name: logging
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
   matcher:
     dependency: transitive
     description:
@@ -171,28 +73,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.3.0"
-  mime:
-    dependency: transitive
-    description:
-      name: mime
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  node_preamble:
-    dependency: transitive
-    description:
-      name: node_preamble
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.4.13"
-  package_config:
-    dependency: transitive
-    description:
-      name: package_config
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
+    version: "1.7.0"
   path:
     dependency: transitive
     description:
@@ -207,95 +88,18 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.11.0"
-  permission_handler:
-    dependency: "direct main"
-    description:
-      name: permission_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.1.3"
-  permission_handler_platform_interface:
-    dependency: transitive
-    description:
-      name: permission_handler_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.2.0"
-  plugin_platform_interface:
-    dependency: transitive
-    description:
-      name: plugin_platform_interface
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  pool:
-    dependency: transitive
-    description:
-      name: pool
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.5.0"
-  pub_semver:
-    dependency: transitive
-    description:
-      name: pub_semver
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  shelf:
-    dependency: transitive
-    description:
-      name: shelf
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.1.0"
-  shelf_packages_handler:
-    dependency: transitive
-    description:
-      name: shelf_packages_handler
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  shelf_static:
-    dependency: transitive
-    description:
-      name: shelf_static
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  shelf_web_socket:
-    dependency: transitive
-    description:
-      name: shelf_web_socket
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.1"
   sky_engine:
     dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.99"
-  source_map_stack_trace:
-    dependency: transitive
-    description:
-      name: source_map_stack_trace
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.1.0"
-  source_maps:
-    dependency: transitive
-    description:
-      name: source_maps
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.10.10"
   source_span:
     dependency: transitive
     description:
       name: source_span
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.8.0"
+    version: "1.8.1"
   stack_trace:
     dependency: transitive
     description:
@@ -324,27 +128,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.0"
-  test:
-    dependency: "direct dev"
-    description:
-      name: test
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.16.5"
   test_api:
     dependency: transitive
     description:
       name: test_api
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.2.19"
-  test_core:
-    dependency: transitive
-    description:
-      name: test_core
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "0.3.15"
+    version: "0.4.2"
   typed_data:
     dependency: transitive
     description:
@@ -359,41 +149,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
-  vm_service:
-    dependency: transitive
-    description:
-      name: vm_service
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "6.2.0"
-  watcher:
-    dependency: transitive
-    description:
-      name: watcher
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  web_socket_channel:
-    dependency: transitive
-    description:
-      name: web_socket_channel
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "2.0.0"
-  webkit_inspection_protocol:
-    dependency: transitive
-    description:
-      name: webkit_inspection_protocol
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
-  yaml:
-    dependency: transitive
-    description:
-      name: yaml
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.0"
 sdks:
   dart: ">=2.12.0 <3.0.0"
-  flutter: ">=1.22.0"
+  flutter: ">=1.17.0"
diff --git a/test/background_location_test.dart b/test/background_location_test.dart
index 8eb3907..9773336 100644
--- a/test/background_location_test.dart
+++ b/test/background_location_test.dart
@@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart';
 // import 'package:background_location/background_location.dart';
 
 void main() {
-  const channel = MethodChannel('backgeound_location');
+  const channel = MethodChannel('background_location');
 
   setUp(() {
     channel.setMockMethodCallHandler((MethodCall methodCall) async {

From 4b9ee408fa81345503f8e00c8e80fb682f721936 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Mon, 13 Sep 2021 22:33:46 +0200
Subject: [PATCH 02/14] update android studio settings

---
 .../executionHistory/executionHistory.lock    | Bin 17 -> 0 bytes
 .gradle/5.4/fileChanges/last-build.bin        | Bin 1 -> 0 bytes
 .gradle/5.4/fileHashes/fileHashes.lock        | Bin 17 -> 0 bytes
 .gradle/5.4/gc.properties                     |   0
 .../buildOutputCleanup.lock                   | Bin 17 -> 0 bytes
 .gradle/buildOutputCleanup/cache.properties   |   2 -
 .gradle/vcs-1/gc.properties                   |   0
 .idea/encodings.xml                           |   4 -
 .idea/gradle.xml                              |  11 --
 .idea/libraries/Dart_SDK.xml                  |  31 ++--
 .idea/misc.xml                                |   7 +-
 .idea/runConfigurations.xml                   |  12 --
 .idea/workspace.xml                           | 132 +++---------------
 android/build.gradle                          |  20 ++-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 background_location.iml                       |  10 +-
 build.gradle                                  |   1 -
 example/android/app/build.gradle              |  13 +-
 example/android/build.gradle                  |  10 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 example/android/settings.gradle               |  18 +--
 local.properties                              |   8 --
 22 files changed, 73 insertions(+), 210 deletions(-)
 delete mode 100644 .gradle/5.4/executionHistory/executionHistory.lock
 delete mode 100644 .gradle/5.4/fileChanges/last-build.bin
 delete mode 100644 .gradle/5.4/fileHashes/fileHashes.lock
 delete mode 100644 .gradle/5.4/gc.properties
 delete mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock
 delete mode 100644 .gradle/buildOutputCleanup/cache.properties
 delete mode 100644 .gradle/vcs-1/gc.properties
 delete mode 100644 .idea/encodings.xml
 delete mode 100644 .idea/gradle.xml
 delete mode 100644 .idea/runConfigurations.xml
 delete mode 100644 build.gradle
 delete mode 100644 local.properties

diff --git a/.gradle/5.4/executionHistory/executionHistory.lock b/.gradle/5.4/executionHistory/executionHistory.lock
deleted file mode 100644
index 181da1d0074113ec30883d84207142f832f598cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZQx<RjgdwQ=z>1}FdkFXsdI

diff --git a/.gradle/5.4/fileChanges/last-build.bin b/.gradle/5.4/fileChanges/last-build.bin
deleted file mode 100644
index f76dd238ade08917e6712764a16a22005a50573d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1
IcmZPo000310RR91

diff --git a/.gradle/5.4/fileHashes/fileHashes.lock b/.gradle/5.4/fileHashes/fileHashes.lock
deleted file mode 100644
index ae2f6ddee615a6da4247806a9cdc70fed442bb0d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
TcmZQxbZdh1{^IZ%3{U_7ITQqR

diff --git a/.gradle/5.4/gc.properties b/.gradle/5.4/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
deleted file mode 100644
index e0031e4f8b36a43bebe1127cdb423f48fe510cc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17
UcmZQp{`dD}`PH6q1_)pT06?S#8vp<R

diff --git a/.gradle/buildOutputCleanup/cache.properties b/.gradle/buildOutputCleanup/cache.properties
deleted file mode 100644
index c39a4b7..0000000
--- a/.gradle/buildOutputCleanup/cache.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Sun Aug 11 01:52:31 AST 2019
-gradle.version=5.4
diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties
deleted file mode 100644
index e69de29..0000000
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index 15a15b2..0000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
-</project>
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index cc04d0a..0000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 62be7ea..b364e85 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,26 +1,17 @@
 <component name="libraryTable">
   <library name="Dart SDK">
     <CLASSES>
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/async" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/cli" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/collection" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/convert" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/core" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/developer" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/ffi" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/html" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/indexed_db" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/io" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/isolate" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/js_util" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/math" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/mirrors" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/svg" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/typed_data" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_audio" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_gl" />
-      <root url="file://$USER_HOME$/flutter/bin/cache/dart-sdk/lib/web_sql" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/async" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/collection" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/convert" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/core" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/developer" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/html" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/io" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/isolate" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/math" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/mirrors" />
+      <root url="file:///usr/share/flutter/bin/cache/dart-sdk/lib/typed_data" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4872587..f8c5fc9 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
+  <component name="FrameworkDetectionExcludesConfiguration">
+    <type id="android" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
deleted file mode 100644
index 7f68460..0000000
--- a/.idea/runConfigurations.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1cbc3e8..0b9db36 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,137 +1,51 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="NONE" />
+  </component>
   <component name="ChangeListManager">
-    <list default="true" id="637d4c7a-6891-4fb3-9c72-34ad7702802c" name="Default Changelist" comment="" />
-    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
+    <list default="true" id="c12e51df-6686-4c5d-8db5-f1e5aa8826a4" name="Default Changelist" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
-  <component name="ExternalProjectsManager">
-    <system id="GRADLE">
-      <state>
-        <projects_view />
-      </state>
-    </system>
-  </component>
-  <component name="FileEditorManager">
-    <leaf>
-      <file pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/lib/backgeound_location.dart">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="345">
-              <caret line="24" column="43" lean-forward="true" selection-start-line="24" selection-start-column="43" selection-end-line="24" selection-end-column="43" />
-            </state>
-          </provider>
-        </entry>
-      </file>
-    </leaf>
-  </component>
-  <component name="ProjectFrameBounds" extendedState="6">
-    <option name="y" value="23" />
-    <option name="width" value="1680" />
-    <option name="height" value="1027" />
-  </component>
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[]" />
+  <component name="ProjectId" id="1y69cI1WFcnagP9wwxsYiQ8G2qx" />
   <component name="ProjectView">
-    <navigator proportions="" version="1">
-      <foldersAlwaysOnTop value="true" />
-    </navigator>
+    <navigator currentView="ProjectPane" proportions="" version="1" />
     <panes>
-      <pane id="ProjectPane" />
-      <pane id="AndroidView">
-        <subPane>
-          <expand>
-            <path>
-              <item name="backgeound_location" type="1abcf292:AndroidViewProjectNode" />
-              <item name="backgeound_location" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="backgeound_location" type="1abcf292:AndroidViewProjectNode" />
-              <item name="backgeound_location" type="462c0819:PsiDirectoryNode" />
-              <item name="example" type="462c0819:PsiDirectoryNode" />
-            </path>
-          </expand>
-          <select />
-        </subPane>
+      <pane id="ProjectPane">
+        <option name="show-excluded-files" value="false" />
       </pane>
-      <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
   <component name="PropertiesComponent">
-    <property name="android.sdk.path" value="$USER_HOME$/Library/Android/sdk" />
-    <property name="dart.analysis.tool.window.force.activate" value="false" />
-    <property name="io.flutter.reload.alreadyRun" value="true" />
-    <property name="settings.editor.selected.configurable" value="AndroidSdkUpdater" />
+    <property name="dart.analysis.tool.window.force.activate" value="true" />
+    <property name="dart.analysis.tool.window.visible" value="false" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/example/android/build.gradle" />
+    <property name="settings.editor.selected.configurable" value="dart.settings" />
     <property name="show.migrate.to.gradle.popup" value="false" />
   </component>
-  <component name="RunDashboard">
-    <option name="ruleStates">
-      <list>
-        <RuleState>
-          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
-        </RuleState>
-        <RuleState>
-          <option name="name" value="StatusDashboardGroupingRule" />
-        </RuleState>
-      </list>
-    </option>
-  </component>
-  <component name="RunManager">
-    <configuration name="main.dart" type="FlutterRunConfigurationType" factoryName="Flutter" singleton="false">
-      <option name="filePath" value="$PROJECT_DIR$/example/lib/main.dart" />
-      <method v="2" />
-    </configuration>
-  </component>
-  <component name="SvnConfiguration">
-    <configuration />
-  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
-      <changelist id="637d4c7a-6891-4fb3-9c72-34ad7702802c" name="Default Changelist" comment="" />
-      <created>1565476066267</created>
+      <changelist id="c12e51df-6686-4c5d-8db5-f1e5aa8826a4" name="Default Changelist" comment="" />
+      <created>1631561248834</created>
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
-      <updated>1565476066267</updated>
+      <updated>1631561248834</updated>
     </task>
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1680" height="1027" extended-state="6" />
+    <editor active="true" />
     <layout>
-      <window_info content_ui="combo" id="Project" visible="true" weight="0.32967034" />
-      <window_info id="Structure" side_tool="true" />
-      <window_info id="Build Variants" side_tool="true" />
-      <window_info id="Image Layers" />
-      <window_info id="Designer" />
-      <window_info id="Resources Explorer" />
-      <window_info id="Capture Tool" />
-      <window_info id="Favorites" side_tool="true" />
-      <window_info id="Captures" order="0" weight="0.25" />
-      <window_info anchor="bottom" id="Run" weight="0.32941177" />
-      <window_info anchor="bottom" id="Dart Analysis" weight="0.32941177" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="TODO" />
-      <window_info anchor="bottom" id="Debug" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Flutter Performance" side_tool="true" />
-      <window_info anchor="right" id="Capture Analysis" />
-      <window_info anchor="right" id="Gradle" />
-      <window_info anchor="right" id="Theme Preview" />
-      <window_info anchor="right" id="Flutter Inspector" />
-      <window_info anchor="right" id="Flutter Outline" />
-      <window_info anchor="right" id="Palette&#9;" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
     </layout>
   </component>
-  <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/lib/backgeound_location.dart">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="345">
-          <caret line="24" column="43" lean-forward="true" selection-start-line="24" selection-start-column="43" selection-end-line="24" selection-end-column="43" />
-        </state>
-      </provider>
-    </entry>
-  </component>
 </project>
\ No newline at end of file
diff --git a/android/build.gradle b/android/build.gradle
index 165be10..b473979 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -2,14 +2,14 @@ group 'com.almoullim.background_location'
 version '1.0-SNAPSHOT'
 
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -17,7 +17,7 @@ buildscript {
 rootProject.allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
@@ -25,7 +25,16 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
@@ -34,6 +43,7 @@ android {
         minSdkVersion 18
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
+    
     lintOptions {
         disable 'InvalidPackage'
     }
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 1b16c34..3c9d085 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
diff --git a/background_location.iml b/background_location.iml
index 2e13c0d..a4d2e26 100644
--- a/background_location.iml
+++ b/background_location.iml
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
       <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
       <excludeFolder url="file://$MODULE_DIR$/.pub" />
       <excludeFolder url="file://$MODULE_DIR$/build" />
       <excludeFolder url="file://$MODULE_DIR$/example/.dart_tool" />
@@ -18,7 +13,6 @@
       <excludeFolder url="file://$MODULE_DIR$/example/build" />
       <excludeFolder url="file://$MODULE_DIR$/example/ios/Flutter/App.framework/flutter_assets/packages" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" name="Dart SDK" level="project" />
     <orderEntry type="library" name="Flutter Plugins" level="project" />
diff --git a/build.gradle b/build.gradle
deleted file mode 100644
index 495c503..0000000
--- a/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 6651aee..9d1d2b3 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -26,21 +26,22 @@ apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    lintOptions {
-        disable 'InvalidPackage'
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.background_location_example"
         minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/example/android/build.gradle b/example/android/build.gradle
index 4452bca..18261f3 100644
--- a/example/android/build.gradle
+++ b/example/android/build.gradle
@@ -1,12 +1,12 @@
 buildscript {
-    ext.kotlin_version = '1.3.31'
+    ext.kotlin_version = '1.3.50'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:7.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
@@ -14,15 +14,13 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }
 
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
index 2819f02..b8793d3 100644
--- a/example/android/gradle/wrapper/gradle-wrapper.properties
+++ b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
index 5a2f14f..44e62bc 100644
--- a/example/android/settings.gradle
+++ b/example/android/settings.gradle
@@ -1,15 +1,11 @@
 include ':app'
 
-def flutterProjectRoot = rootProject.projectDir.parentFile.toPath()
+def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
+def properties = new Properties()
 
-def plugins = new Properties()
-def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins')
-if (pluginsFile.exists()) {
-    pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) }
-}
+assert localPropertiesFile.exists()
+localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
 
-plugins.each { name, path ->
-    def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile()
-    include ":$name"
-    project(":$name").projectDir = pluginDirectory
-}
+def flutterSdkPath = properties.getProperty("flutter.sdk")
+assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
diff --git a/local.properties b/local.properties
deleted file mode 100644
index 71dfaf1..0000000
--- a/local.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-## This file must *NOT* be checked into Version Control Systems,
-# as it contains information specific to your local configuration.
-#
-# Location of the SDK. This is only used by Gradle.
-# For customization when using a Version Control System, please read the
-# header note.
-#Sun Aug 11 01:27:46 AST 2019
-sdk.dir=/Users/ali/Library/Android/sdk

From ddf61066ff78a58068166a61a70452fb45e7453d Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:05:20 +0200
Subject: [PATCH 03/14] Remove deprecated PreferenceManager and add dedicated
 preference file

---
 .../com/almoullim/background_location/Utils.kt      | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/Utils.kt b/android/src/main/kotlin/com/almoullim/background_location/Utils.kt
index d221f8b..9473cb6 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/Utils.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/Utils.kt
@@ -18,25 +18,20 @@ package com.almoullim.background_location
 
 
 import android.content.Context
-import android.location.Location
-import android.preference.PreferenceManager
-
-import java.text.DateFormat
-import java.util.Date
 
 internal object Utils {
 
-    const val KEY_REQUESTING_LOCATION_UPDATES = "requesting_location_updates"
+    private const val KEY_REQUESTING_LOCATION_UPDATES = "requesting_location_updates"
+    private const val SHARED_PREFERENCES_FILE = "${BackgroundLocationPlugin.PLUGIN_ID}_preferences"
 
 
     fun requestingLocationUpdates(context: Context): Boolean {
-        return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(KEY_REQUESTING_LOCATION_UPDATES, false)
+        return context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE).getBoolean(KEY_REQUESTING_LOCATION_UPDATES, false)
     }
 
 
     fun setRequestingLocationUpdates(context: Context, requestingLocationUpdates: Boolean) {
-        PreferenceManager.getDefaultSharedPreferences(context)
+        context.getSharedPreferences(SHARED_PREFERENCES_FILE, Context.MODE_PRIVATE)
                 .edit()
                 .putBoolean(KEY_REQUESTING_LOCATION_UPDATES, requestingLocationUpdates)
                 .apply()

From 357bd989737184f4c55d306b4c02ac5448327d91 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:33:09 +0200
Subject: [PATCH 04/14] Update to FlutterPlugin and split code into service

---
 .../BackgroundLocationPlugin.kt               | 181 +++-------------
 .../BackgroundLocationService.kt              | 204 ++++++++++++++++++
 2 files changed, 233 insertions(+), 152 deletions(-)
 create mode 100644 android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
index 566c6ad..8e299bd 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
@@ -10,185 +10,62 @@ import android.util.Log
 import android.widget.Toast
 import androidx.core.app.ActivityCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import com.almoullim.background_location.Utils
-import com.almoullim.background_location.LocationUpdatesService
-import com.almoullim.background_location.R
+import io.flutter.embedding.engine.plugins.FlutterPlugin
+import io.flutter.embedding.engine.plugins.FlutterPlugin.FlutterPluginBinding
+import io.flutter.embedding.engine.plugins.activity.ActivityAware
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+import io.flutter.plugin.common.BinaryMessenger
 import io.flutter.plugin.common.MethodCall
 import io.flutter.plugin.common.MethodChannel
 import io.flutter.plugin.common.MethodChannel.MethodCallHandler
 import io.flutter.plugin.common.MethodChannel.Result
 import io.flutter.plugin.common.PluginRegistry
-import io.flutter.plugin.common.PluginRegistry.Registrar
+import io.flutter.plugin.common.PluginRegistry.NewIntentListener
 
 
-class BackgroundLocationPlugin() : MethodCallHandler, PluginRegistry.RequestPermissionsResultListener {
 
 
-    private lateinit var registrar: Registrar
-    private lateinit var channel: MethodChannel
-    private var myReceiver: MyReceiver? = null
-    private var mService: LocationUpdatesService? = null
-    private var mBound: Boolean = false
-
-    companion object {
-        @JvmStatic
-        fun registerWith(registrar: Registrar) {
-            val channel = MethodChannel(registrar.messenger(), "almoullim.com/background_location")
-            channel.setMethodCallHandler(BackgroundLocationPlugin(registrar, channel))
-        }
-
-        private const val TAG = "com.almoullim.Log.Tag"
-        private const val REQUEST_PERMISSIONS_REQUEST_CODE = 34
-    }
-
-
-    constructor(registrar: Registrar, channel: MethodChannel) : this() {
-        this.registrar = registrar
-        this.channel = channel
 
+class BackgroundLocationPlugin : FlutterPlugin, ActivityAware {
 
-        myReceiver = MyReceiver()
+    companion object {
 
-        if (Utils.requestingLocationUpdates(registrar.activeContext())) {
-            if (!checkPermissions()) {
-                requestPermissions()
-            }
+        /**
+        Legacy for v1 embedding
+         */
+        @SuppressWarnings("deprecation")
+        fun registerWith(registrar: PluginRegistry.Registrar) {
+            val service = BackgroundLocationService.getInstance()
+            service.onAttachedToEngine(registrar.context(), registrar.messenger())
         }
-        LocalBroadcastManager.getInstance(registrar.activeContext()).registerReceiver(myReceiver!!,
-                IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
-    }
 
-
-    override fun onMethodCall(call: MethodCall, result: Result) {
-        when {
-            call.method == "stop_location_service" -> {
-                mService?.removeLocationUpdates()
-                LocalBroadcastManager.getInstance(registrar.activeContext()).unregisterReceiver(myReceiver!!)
-
-                if (mBound) {
-                    registrar.activeContext().unbindService(mServiceConnection)
-                    mBound = false
-                }
-
-                result.success(0);
-            }
-            call.method == "start_location_service" -> {
-                LocalBroadcastManager.getInstance(registrar.activeContext()).registerReceiver(myReceiver!!,
-                        IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
-                if (!mBound) {
-                    val distanceFilter : Double? = call.argument("distance_filter")                    
-                    val intent = Intent(registrar.activeContext(), LocationUpdatesService::class.java);
-                    intent.putExtra("distance_filter", distanceFilter)
-                    registrar.activeContext().bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)
-                }
-
-                result.success(0);
-
-            }
-            call.method == "set_android_notification" -> {
-                val notificationTitle: String? = call.argument("title");
-                val notificationMessage: String? = call.argument("message");
-                val notificationIcon: String? = call.argument("icon");
-
-                if (notificationTitle != null) LocationUpdatesService.NOTIFICATION_TITLE = notificationTitle
-                if (notificationMessage != null) LocationUpdatesService.NOTIFICATION_MESSAGE = notificationMessage
-                if (notificationIcon != null) LocationUpdatesService.NOTIFICATION_ICON = notificationIcon
-
-                if (mService != null) {
-                    mService?.updateNotification()
-                }
-
-                result.success(0);
-            }
-            call.method == "set_configuration" -> {
-                val timeInterval: Long? = call.argument<String>("interval")?.toLongOrNull();
-                if (timeInterval != null) LocationUpdatesService.UPDATE_INTERVAL_IN_MILLISECONDS = timeInterval
-
-                result.success(0);
-            }
-            else -> result.notImplemented()
-        }
+        const val TAG = "com.almoullim.Log.Tag"
+        const val PLUGIN_ID = "com.almoullim/background_location"
     }
 
 
-    private val mServiceConnection = object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName, service: IBinder) {
-            mBound = true
-            val binder = service as LocationUpdatesService.LocalBinder
-            mService = binder.service
-            requestLocation()
-        }
-
-        override fun onServiceDisconnected(name: ComponentName) {
-            mService = null
-        }
+    override fun onAttachedToEngine(binding: FlutterPluginBinding) {
+        BackgroundLocationService.getInstance().onAttachedToEngine(binding.applicationContext, binding.binaryMessenger)
     }
 
-
-    private fun requestLocation() {
-
-        if (!checkPermissions()) {
-            requestPermissions()
-        } else {
-            mService!!.requestLocationUpdates()
-        }
-
-
+    override fun onDetachedFromEngine(binding: FlutterPluginBinding) {
+        BackgroundLocationService.getInstance().onDetachedFromEngine()
     }
 
-
-    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?): Boolean {
-
-        Log.i(TAG, "onRequestPermissionResult")
-        if (requestCode == REQUEST_PERMISSIONS_REQUEST_CODE) {
-            when {
-                grantResults!!.isEmpty() -> Log.i(TAG, "User interaction was cancelled.")
-                grantResults[0] == PackageManager.PERMISSION_GRANTED -> mService!!.requestLocationUpdates()
-                else -> Toast.makeText(registrar.activeContext(), R.string.permission_denied_explanation, Toast.LENGTH_LONG).show()
-            }
-        }
-        return true
-
+    override fun onAttachedToActivity(binding: ActivityPluginBinding) {
+        BackgroundLocationService.getInstance().setActivity(binding)
     }
 
-    private inner class MyReceiver : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val location = intent.getParcelableExtra<Location>(LocationUpdatesService.EXTRA_LOCATION)
-            if (location != null) {
-                val locationMap = HashMap<String, Any>()
-                locationMap["latitude"] = location.latitude
-                locationMap["longitude"] = location.longitude
-                locationMap["altitude"] = location.altitude
-                locationMap["accuracy"] = location.accuracy.toDouble()
-                locationMap["bearing"] = location.bearing.toDouble()
-                locationMap["speed"] = location.speed.toDouble()
-                locationMap["time"] = location.time.toDouble()
-                locationMap["is_mock"] = location.isFromMockProvider
-                channel.invokeMethod("location", locationMap, null)
-            }
-        }
+    override fun onDetachedFromActivityForConfigChanges() {
+        TODO("Not yet implemented")
     }
 
-    private fun checkPermissions(): Boolean {
-        return PackageManager.PERMISSION_GRANTED == ActivityCompat.checkSelfPermission(registrar.activeContext(),
-                Manifest.permission.ACCESS_FINE_LOCATION)
+    override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
+        TODO("Not yet implemented")
     }
 
-    private fun requestPermissions() {
-        val shouldProvideRationale = ActivityCompat.shouldShowRequestPermissionRationale(registrar.activity(),
-                Manifest.permission.ACCESS_FINE_LOCATION)
-        if (shouldProvideRationale) {
-
-            Log.i(TAG, "Displaying permission rationale to provide additional context.")
-            Toast.makeText(registrar.activeContext(), R.string.permission_rationale, Toast.LENGTH_LONG).show()
-
-        } else {
-            Log.i(TAG, "Requesting permission")
-            ActivityCompat.requestPermissions(registrar.activity(),
-                    arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
-                    REQUEST_PERMISSIONS_REQUEST_CODE)
-        }
+    override fun onDetachedFromActivity() {
+        BackgroundLocationService.getInstance().setActivity(null)
     }
 
-
 }
diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
new file mode 100644
index 0000000..bb622e8
--- /dev/null
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
@@ -0,0 +1,204 @@
+package com.almoullim.background_location
+
+import android.Manifest
+import io.flutter.plugin.common.MethodChannel
+
+import io.flutter.plugin.common.BinaryMessenger
+import android.app.Activity
+import android.content.*
+import android.content.pm.PackageManager
+import android.location.Location
+import android.os.IBinder
+import android.util.Log
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
+
+import io.flutter.plugin.common.MethodCall
+
+
+class BackgroundLocationService: MethodChannel.MethodCallHandler {
+    companion object {
+        const val METHOD_CHANNEL_NAME = "${BackgroundLocationPlugin.PLUGIN_ID}/methods"
+        private const val REQUEST_PERMISSIONS_REQUEST_CODE = 34
+
+        private var instance: BackgroundLocationService? = null
+
+        /**
+         * Requests the singleton instance of [BackgroundLocationService] or creates it,
+         * if it does not yet exist.
+         */
+        fun getInstance(): BackgroundLocationService {
+            if (instance == null) {
+                instance = BackgroundLocationService()
+            }
+            return instance!!
+        }
+    }
+
+
+    /**
+     * Context that is set once attached to a FlutterEngine.
+     * Context should no longer be referenced when detached.
+     */
+    private lateinit var context: Context
+    private var channel: MethodChannel? = null
+    private var activity: Activity? = null
+    private var isAttached = false
+    private var receiver: MyReceiver? = null
+    private var service: LocationUpdatesService? = null
+    private var bound: Boolean = false
+
+    fun onAttachedToEngine(context: Context, messenger: BinaryMessenger) {
+        this.context = context
+        isAttached = true
+        channel = MethodChannel(messenger, METHOD_CHANNEL_NAME)
+        channel!!.setMethodCallHandler(this)
+
+        receiver = MyReceiver()
+
+        LocalBroadcastManager.getInstance(context).registerReceiver(receiver!!,
+                IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
+    }
+
+    fun onDetachedFromEngine() {
+        isAttached = false
+    }
+
+    fun setActivity(binding: ActivityPluginBinding?) {
+        this.activity = binding?.activity
+
+        if(this.activity != null){
+            if (Utils.requestingLocationUpdates(context)) {
+                if (!checkPermissions()) {
+                    requestPermissions()
+                }
+            }
+        }
+    }
+
+    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+        when (call.method) {
+            "stop_location_service" -> {
+                service?.removeLocationUpdates()
+                LocalBroadcastManager.getInstance(context).unregisterReceiver(receiver!!)
+
+                if (bound) {
+                    context.unbindService(mServiceConnection)
+                    bound = false
+                }
+
+                result.success(0)
+            }
+            "start_location_service" -> {
+                LocalBroadcastManager.getInstance(context).registerReceiver(receiver!!,
+                        IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
+                if (!bound) {
+                    val distanceFilter : Double? = call.argument("distance_filter")
+                    val intent = Intent(context, LocationUpdatesService::class.java)
+                    intent.putExtra("distance_filter", distanceFilter)
+                    context.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)
+                }
+
+                result.success(0)
+
+            }
+            "set_android_notification" -> {
+                val notificationTitle: String? = call.argument("title")
+                val notificationMessage: String? = call.argument("message")
+                val notificationIcon: String? = call.argument("icon")
+
+                if (notificationTitle != null) LocationUpdatesService.NOTIFICATION_TITLE = notificationTitle
+                if (notificationMessage != null) LocationUpdatesService.NOTIFICATION_MESSAGE = notificationMessage
+                if (notificationIcon != null) LocationUpdatesService.NOTIFICATION_ICON = notificationIcon
+
+                if (service != null) {
+                    service?.updateNotification()
+                }
+
+                result.success(0)
+            }
+            "set_configuration" -> {
+                val timeInterval: Long? = call.argument<String>("interval")?.toLongOrNull()
+                if (timeInterval != null) LocationUpdatesService.UPDATE_INTERVAL_IN_MILLISECONDS = timeInterval
+
+                result.success(0)
+            }
+            else -> result.notImplemented()
+        }
+    }
+
+    private val mServiceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            bound = true
+            val binder = service as LocationUpdatesService.LocalBinder
+            this@BackgroundLocationService.service = binder.service
+            requestLocation()
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {
+            service = null
+        }
+    }
+
+    /**
+     * Requests a location updated.
+     * If permission is denied, it requests the needed permission
+     */
+    private fun requestLocation() {
+        if (!checkPermissions()) {
+            requestPermissions()
+        } else {
+            service?.requestLocationUpdates()
+        }
+    }
+
+    /**
+     * Checks the current permission for `ACCESS_FINE_LOCATION`
+     */
+    private fun checkPermissions(): Boolean {
+        return PackageManager.PERMISSION_GRANTED == ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
+    }
+
+
+    /**
+     * Requests permission for location.
+     * Depending on the current activity, displays a rationale for the request.
+     */
+    private fun requestPermissions() {
+        if(activity == null) {
+            return
+        }
+
+        val shouldProvideRationale = ActivityCompat.shouldShowRequestPermissionRationale(activity!!, Manifest.permission.ACCESS_FINE_LOCATION)
+        if (shouldProvideRationale) {
+            Log.i(BackgroundLocationPlugin.TAG, "Displaying permission rationale to provide additional context.")
+            Toast.makeText(context, R.string.permission_rationale, Toast.LENGTH_LONG).show()
+
+        } else {
+            Log.i(BackgroundLocationPlugin.TAG, "Requesting permission")
+            ActivityCompat.requestPermissions(activity!!,
+                    arrayOf(Manifest.permission.ACCESS_FINE_LOCATION),
+                    REQUEST_PERMISSIONS_REQUEST_CODE)
+        }
+    }
+
+    private inner class MyReceiver : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            val location = intent.getParcelableExtra<Location>(LocationUpdatesService.EXTRA_LOCATION)
+            if (location != null) {
+                val locationMap = HashMap<String, Any>()
+                locationMap["latitude"] = location.latitude
+                locationMap["longitude"] = location.longitude
+                locationMap["altitude"] = location.altitude
+                locationMap["accuracy"] = location.accuracy.toDouble()
+                locationMap["bearing"] = location.bearing.toDouble()
+                locationMap["speed"] = location.speed.toDouble()
+                locationMap["time"] = location.time.toDouble()
+                locationMap["is_mock"] = location.isFromMockProvider
+                channel?.invokeMethod("location", locationMap, null)
+            }
+        }
+    }
+}
\ No newline at end of file

From 13721426c7ffe66a579e0e1bc0e83d9dc2b8e2d4 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:34:40 +0200
Subject: [PATCH 05/14] Update mainactivity and fix typo in folder name

---
 .../backgeound_location_example/MainActivity.kt     | 13 -------------
 .../background_location_example/MainActivity.kt     |  6 ++++++
 2 files changed, 6 insertions(+), 13 deletions(-)
 delete mode 100644 example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
 create mode 100644 example/android/app/src/main/kotlin/com/example/background_location_example/MainActivity.kt

diff --git a/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
deleted file mode 100644
index 753335b..0000000
--- a/example/android/app/src/main/kotlin/com/example/backgeound_location_example/MainActivity.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.example.background_location_example
-
-import android.os.Bundle
-
-import io.flutter.app.FlutterActivity
-import io.flutter.plugins.GeneratedPluginRegistrant
-
-class MainActivity: FlutterActivity() {
-  override fun onCreate(savedInstanceState: Bundle?) {
-    super.onCreate(savedInstanceState)
-    GeneratedPluginRegistrant.registerWith(this)
-  }
-}
diff --git a/example/android/app/src/main/kotlin/com/example/background_location_example/MainActivity.kt b/example/android/app/src/main/kotlin/com/example/background_location_example/MainActivity.kt
new file mode 100644
index 0000000..9a3a938
--- /dev/null
+++ b/example/android/app/src/main/kotlin/com/example/background_location_example/MainActivity.kt
@@ -0,0 +1,6 @@
+package com.example.background_location_example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity() {
+}

From a11656c774ed1db47f27de55c0c75944d26d0056 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:37:39 +0200
Subject: [PATCH 06/14] Update manifest

---
 example/android/app/src/main/AndroidManifest.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 78c0c2c..56a3502 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -12,9 +12,11 @@
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
-        android:name="io.flutter.app.FlutterApplication"
         android:label="background_location_example"
         android:icon="@mipmap/ic_launcher">
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
@@ -26,9 +28,6 @@
                  until Flutter renders its first frame. It can be removed if
                  there is no splash screen (such as the default splash screen
                  defined in @style/LaunchTheme). -->
-            <meta-data
-                android:name="io.flutter.app.android.SplashScreenUntilFirstFrame"
-                android:value="true" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>

From 55e028edf080569e2629ea30c3b7df8d4f31ea26 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:47:29 +0200
Subject: [PATCH 07/14] Add v1 activity for backwards compatibility testing

---
 .../android/app/src/main/AndroidManifest.xml    |  7 +++++++
 .../EmbeddingV1Activity.kt                      | 17 +++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt

diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 56a3502..8626ffd 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -33,5 +33,12 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity
+            android:name=".EmbeddingV1Activity"
+            android:theme="@style/LaunchTheme"
+            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale"
+            android:hardwareAccelerated="true"
+            android:windowSoftInputMode="adjustResize">
+        </activity>
     </application>
 </manifest>
diff --git a/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt b/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt
new file mode 100644
index 0000000..b904d7f
--- /dev/null
+++ b/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt
@@ -0,0 +1,17 @@
+package com.example.background_location_example
+
+import io.flutter.embedding.android.FlutterActivity
+import android.os.Bundle
+import com.almoullim.background_location.BackgroundLocationPlugin
+import io.flutter.plugins.GeneratedPluginRegistrant
+
+
+/**
+ * This activity's purpose is to test, wether backwards compatability to v1 embedding still works
+ */
+class EmbeddingV1Activity: FlutterActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        GeneratedPluginRegistrant.registerWith(this.flutterEngine!!)
+    }
+}
\ No newline at end of file

From 85c5d6453888bbfc9290a9d88b65d413497f72d6 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 00:55:10 +0200
Subject: [PATCH 08/14] Remove reference to context when detached

---
 .../BackgroundLocationService.kt                  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
index bb622e8..526f005 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
@@ -42,7 +42,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
      * Context that is set once attached to a FlutterEngine.
      * Context should no longer be referenced when detached.
      */
-    private lateinit var context: Context
+    private var context: Context? = null
     private var channel: MethodChannel? = null
     private var activity: Activity? = null
     private var isAttached = false
@@ -63,6 +63,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
     }
 
     fun onDetachedFromEngine() {
+        context = null
         isAttached = false
     }
 
@@ -70,7 +71,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
         this.activity = binding?.activity
 
         if(this.activity != null){
-            if (Utils.requestingLocationUpdates(context)) {
+            if (Utils.requestingLocationUpdates(context!!)) {
                 if (!checkPermissions()) {
                     requestPermissions()
                 }
@@ -82,23 +83,23 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
         when (call.method) {
             "stop_location_service" -> {
                 service?.removeLocationUpdates()
-                LocalBroadcastManager.getInstance(context).unregisterReceiver(receiver!!)
+                LocalBroadcastManager.getInstance(context!!).unregisterReceiver(receiver!!)
 
                 if (bound) {
-                    context.unbindService(mServiceConnection)
+                    context!!.unbindService(mServiceConnection)
                     bound = false
                 }
 
                 result.success(0)
             }
             "start_location_service" -> {
-                LocalBroadcastManager.getInstance(context).registerReceiver(receiver!!,
+                LocalBroadcastManager.getInstance(context!!).registerReceiver(receiver!!,
                         IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
                 if (!bound) {
                     val distanceFilter : Double? = call.argument("distance_filter")
                     val intent = Intent(context, LocationUpdatesService::class.java)
                     intent.putExtra("distance_filter", distanceFilter)
-                    context.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)
+                    context!!.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)
                 }
 
                 result.success(0)
@@ -158,7 +159,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
      * Checks the current permission for `ACCESS_FINE_LOCATION`
      */
     private fun checkPermissions(): Boolean {
-        return PackageManager.PERMISSION_GRANTED == ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION)
+        return PackageManager.PERMISSION_GRANTED == ActivityCompat.checkSelfPermission(context!!, Manifest.permission.ACCESS_FINE_LOCATION)
     }
 
 

From 4c1b122f9c6b0cae09db4b16260dd1cb529f5f97 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 14:39:09 +0200
Subject: [PATCH 09/14] Remove unused import

---
 .../example/background_location_example/EmbeddingV1Activity.kt   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt b/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt
index b904d7f..40813b5 100644
--- a/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt
+++ b/example/android/app/src/main/kotlin/com/example/background_location_example/EmbeddingV1Activity.kt
@@ -2,7 +2,6 @@ package com.example.background_location_example
 
 import io.flutter.embedding.android.FlutterActivity
 import android.os.Bundle
-import com.almoullim.background_location.BackgroundLocationPlugin
 import io.flutter.plugins.GeneratedPluginRegistrant
 
 

From 7f70001148b8e48e376e8cd19593c6fc460317ce Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 14:39:36 +0200
Subject: [PATCH 10/14] Fix minSdkVersion

---
 example/android/app/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
index 9d1d2b3..c37bd79 100644
--- a/example/android/app/build.gradle
+++ b/example/android/app/build.gradle
@@ -40,7 +40,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.example.background_location_example"
-        minSdkVersion 16
+        minSdkVersion 18
         targetSdkVersion 30
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

From f0fc1230cfe2101db4c4a86ffd4d6586af138056 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 14:40:34 +0200
Subject: [PATCH 11/14] Fix method channel naming

---
 .../almoullim/background_location/BackgroundLocationPlugin.kt   | 2 +-
 lib/background_location.dart                                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
index 8e299bd..f80ce34 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
@@ -40,7 +40,7 @@ class BackgroundLocationPlugin : FlutterPlugin, ActivityAware {
         }
 
         const val TAG = "com.almoullim.Log.Tag"
-        const val PLUGIN_ID = "com.almoullim/background_location"
+        const val PLUGIN_ID = "com.almoullim.background_location"
     }
 
 
diff --git a/lib/background_location.dart b/lib/background_location.dart
index fa9836f..bdb8188 100644
--- a/lib/background_location.dart
+++ b/lib/background_location.dart
@@ -10,7 +10,7 @@ class BackgroundLocation {
   // The channel to be used for communication.
   // This channel is also refrenced inside both iOS and Abdroid classes
   static const MethodChannel _channel =
-      MethodChannel('almoullim.com/background_location');
+      MethodChannel('com.almoullim.background_location/methods');
 
   /// Stop receiving location updates
   static stopLocationService() async {

From 54bf24ade44898c5d03cf5b2d26683fe7906345d Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 14:41:17 +0200
Subject: [PATCH 12/14] Add permission request result listener

---
 .../BackgroundLocationPlugin.kt               |  9 ++++--
 .../BackgroundLocationService.kt              | 29 +++++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
index f80ce34..8e773e5 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationPlugin.kt
@@ -37,6 +37,7 @@ class BackgroundLocationPlugin : FlutterPlugin, ActivityAware {
         fun registerWith(registrar: PluginRegistry.Registrar) {
             val service = BackgroundLocationService.getInstance()
             service.onAttachedToEngine(registrar.context(), registrar.messenger())
+            registrar.addRequestPermissionsResultListener(service)
         }
 
         const val TAG = "com.almoullim.Log.Tag"
@@ -53,15 +54,17 @@ class BackgroundLocationPlugin : FlutterPlugin, ActivityAware {
     }
 
     override fun onAttachedToActivity(binding: ActivityPluginBinding) {
-        BackgroundLocationService.getInstance().setActivity(binding)
+        val service = BackgroundLocationService.getInstance()
+        service.setActivity(binding)
+        binding.addRequestPermissionsResultListener(service)
     }
 
     override fun onDetachedFromActivityForConfigChanges() {
-        TODO("Not yet implemented")
+        this.onDetachedFromActivity()
     }
 
     override fun onReattachedToActivityForConfigChanges(binding: ActivityPluginBinding) {
-        TODO("Not yet implemented")
+        this.onAttachedToActivity(binding)
     }
 
     override fun onDetachedFromActivity() {
diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
index 526f005..06f5462 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
@@ -11,14 +11,16 @@ import android.location.Location
 import android.os.IBinder
 import android.util.Log
 import android.widget.Toast
+import androidx.annotation.NonNull
 import androidx.core.app.ActivityCompat
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import io.flutter.embedding.engine.plugins.activity.ActivityPluginBinding
 
 import io.flutter.plugin.common.MethodCall
+import io.flutter.plugin.common.PluginRegistry
 
 
-class BackgroundLocationService: MethodChannel.MethodCallHandler {
+class BackgroundLocationService: MethodChannel.MethodCallHandler, PluginRegistry.RequestPermissionsResultListener {
     companion object {
         const val METHOD_CHANNEL_NAME = "${BackgroundLocationPlugin.PLUGIN_ID}/methods"
         private const val REQUEST_PERMISSIONS_REQUEST_CODE = 34
@@ -43,18 +45,18 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
      * Context should no longer be referenced when detached.
      */
     private var context: Context? = null
-    private var channel: MethodChannel? = null
+    private lateinit var channel: MethodChannel
     private var activity: Activity? = null
     private var isAttached = false
     private var receiver: MyReceiver? = null
     private var service: LocationUpdatesService? = null
     private var bound: Boolean = false
 
-    fun onAttachedToEngine(context: Context, messenger: BinaryMessenger) {
+    fun onAttachedToEngine(@NonNull context: Context, @NonNull messenger: BinaryMessenger) {
         this.context = context
         isAttached = true
         channel = MethodChannel(messenger, METHOD_CHANNEL_NAME)
-        channel!!.setMethodCallHandler(this)
+        channel.setMethodCallHandler(this)
 
         receiver = MyReceiver()
 
@@ -63,6 +65,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
     }
 
     fun onDetachedFromEngine() {
+        channel.setMethodCallHandler(null)
         context = null
         isAttached = false
     }
@@ -79,7 +82,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
         }
     }
 
-    override fun onMethodCall(call: MethodCall, result: MethodChannel.Result) {
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: MethodChannel.Result) {
         when (call.method) {
             "stop_location_service" -> {
                 service?.removeLocationUpdates()
@@ -202,4 +205,20 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler {
             }
         }
     }
+
+    /**
+     * Handle the response from a permission request
+     * @return true if the result has been handled.
+     */
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>?, grantResults: IntArray?): Boolean {
+        Log.i(BackgroundLocationPlugin.TAG, "onRequestPermissionResult")
+        if (requestCode == REQUEST_PERMISSIONS_REQUEST_CODE) {
+            when {
+                grantResults!!.isEmpty() -> Log.i(BackgroundLocationPlugin.TAG, "User interaction was cancelled.")
+                grantResults[0] == PackageManager.PERMISSION_GRANTED -> service?.requestLocationUpdates()
+                else -> Toast.makeText(context, R.string.permission_denied_explanation, Toast.LENGTH_LONG).show()
+            }
+        }
+        return true
+    }
 }
\ No newline at end of file

From 830c8f13494966eac3c6b14c6ceb706177120dd6 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 14:42:55 +0200
Subject: [PATCH 13/14] Fix unnecessary unsafe operator

---
 .../almoullim/background_location/BackgroundLocationService.kt  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
index 06f5462..b61e751 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
@@ -201,7 +201,7 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler, PluginRegistry
                 locationMap["speed"] = location.speed.toDouble()
                 locationMap["time"] = location.time.toDouble()
                 locationMap["is_mock"] = location.isFromMockProvider
-                channel?.invokeMethod("location", locationMap, null)
+                channel.invokeMethod("location", locationMap, null)
             }
         }
     }

From 4af8bd51ef442edbecf1560b497541a905d77406 Mon Sep 17 00:00:00 2001
From: lukaskurz <lukaskurz5@gmail.com>
Date: Thu, 16 Sep 2021 18:38:41 +0200
Subject: [PATCH 14/14] Fix foreground service functionality

---
 .../BackgroundLocationService.kt              | 109 ++++++++++--------
 .../LocationUpdatesService.kt                 |   7 +-
 .../android/app/src/main/AndroidManifest.xml  |  11 +-
 3 files changed, 70 insertions(+), 57 deletions(-)

diff --git a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
index b61e751..7024eb3 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/BackgroundLocationService.kt
@@ -50,8 +50,25 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler, PluginRegistry
     private var isAttached = false
     private var receiver: MyReceiver? = null
     private var service: LocationUpdatesService? = null
+
+    /**
+     * Signals whether the LocationUpdatesService is bound
+     */
     private var bound: Boolean = false
 
+    private val serviceConnection = object : ServiceConnection {
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            bound = true
+            val binder = service as LocationUpdatesService.LocalBinder
+            this@BackgroundLocationService.service = binder.service
+            requestLocation()
+        }
+
+        override fun onServiceDisconnected(name: ComponentName) {
+            service = null
+        }
+    }
+
     fun onAttachedToEngine(@NonNull context: Context, @NonNull messenger: BinaryMessenger) {
         this.context = context
         isAttached = true
@@ -79,70 +96,60 @@ class BackgroundLocationService: MethodChannel.MethodCallHandler, PluginRegistry
                     requestPermissions()
                 }
             }
+        } else {
+            stopLocationService()
         }
     }
 
-    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: MethodChannel.Result) {
-        when (call.method) {
-            "stop_location_service" -> {
-                service?.removeLocationUpdates()
-                LocalBroadcastManager.getInstance(context!!).unregisterReceiver(receiver!!)
-
-                if (bound) {
-                    context!!.unbindService(mServiceConnection)
-                    bound = false
-                }
-
-                result.success(0)
-            }
-            "start_location_service" -> {
-                LocalBroadcastManager.getInstance(context!!).registerReceiver(receiver!!,
-                        IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
-                if (!bound) {
-                    val distanceFilter : Double? = call.argument("distance_filter")
-                    val intent = Intent(context, LocationUpdatesService::class.java)
-                    intent.putExtra("distance_filter", distanceFilter)
-                    context!!.bindService(intent, mServiceConnection, Context.BIND_AUTO_CREATE)
-                }
+    private fun startLocationService(distanceFilter: Double?): Int{
+        LocalBroadcastManager.getInstance(context!!).registerReceiver(receiver!!,
+                IntentFilter(LocationUpdatesService.ACTION_BROADCAST))
+        if (!bound) {
+            val intent = Intent(context, LocationUpdatesService::class.java)
+            intent.putExtra("distance_filter", distanceFilter)
+            context!!.bindService(intent, serviceConnection, Context.BIND_AUTO_CREATE)
+        }
 
-                result.success(0)
+        return 0
+    }
 
-            }
-            "set_android_notification" -> {
-                val notificationTitle: String? = call.argument("title")
-                val notificationMessage: String? = call.argument("message")
-                val notificationIcon: String? = call.argument("icon")
+    private fun stopLocationService(): Int {
+        service?.removeLocationUpdates()
+        LocalBroadcastManager.getInstance(context!!).unregisterReceiver(receiver!!)
 
-                if (notificationTitle != null) LocationUpdatesService.NOTIFICATION_TITLE = notificationTitle
-                if (notificationMessage != null) LocationUpdatesService.NOTIFICATION_MESSAGE = notificationMessage
-                if (notificationIcon != null) LocationUpdatesService.NOTIFICATION_ICON = notificationIcon
+        if (bound) {
+            context!!.unbindService(serviceConnection)
+            bound = false
+        }
 
-                if (service != null) {
-                    service?.updateNotification()
-                }
+        return 0
+    }
 
-                result.success(0)
-            }
-            "set_configuration" -> {
-                val timeInterval: Long? = call.argument<String>("interval")?.toLongOrNull()
-                if (timeInterval != null) LocationUpdatesService.UPDATE_INTERVAL_IN_MILLISECONDS = timeInterval
+    private fun setAndroidNotification(title: String?, message: String?, icon: String?):Int{
+        if (title != null) LocationUpdatesService.NOTIFICATION_TITLE = title
+        if (message != null) LocationUpdatesService.NOTIFICATION_MESSAGE = message
+        if (icon != null) LocationUpdatesService.NOTIFICATION_ICON = icon
 
-                result.success(0)
-            }
-            else -> result.notImplemented()
+        if (service != null) {
+            service?.updateNotification()
         }
+
+        return 0
     }
 
-    private val mServiceConnection = object : ServiceConnection {
-        override fun onServiceConnected(name: ComponentName, service: IBinder) {
-            bound = true
-            val binder = service as LocationUpdatesService.LocalBinder
-            this@BackgroundLocationService.service = binder.service
-            requestLocation()
-        }
+    private fun setConfiguration(timeInterval: Long?):Int {
+        if (timeInterval != null) LocationUpdatesService.UPDATE_INTERVAL_IN_MILLISECONDS = timeInterval
 
-        override fun onServiceDisconnected(name: ComponentName) {
-            service = null
+        return 0
+    }
+
+    override fun onMethodCall(@NonNull call: MethodCall, @NonNull result: MethodChannel.Result) {
+        when (call.method) {
+            "stop_location_service" -> result.success(stopLocationService())
+            "start_location_service" -> result.success(startLocationService(call.argument("distance_filter")))
+            "set_android_notification" -> result.success(setAndroidNotification(call.argument("title"),call.argument("message"),call.argument("icon")))
+            "set_configuration" -> result.success(setConfiguration(call.argument<String>("interval")?.toLongOrNull()))
+            else -> result.notImplemented()
         }
     }
 
diff --git a/android/src/main/kotlin/com/almoullim/background_location/LocationUpdatesService.kt b/android/src/main/kotlin/com/almoullim/background_location/LocationUpdatesService.kt
index 404d8f7..7639109 100644
--- a/android/src/main/kotlin/com/almoullim/background_location/LocationUpdatesService.kt
+++ b/android/src/main/kotlin/com/almoullim/background_location/LocationUpdatesService.kt
@@ -14,7 +14,7 @@ import com.google.android.gms.location.*
 
 class LocationUpdatesService : Service() {
 
-    override fun onBind(intent: Intent?): IBinder? {
+    override fun onBind(intent: Intent?): IBinder {
         val distanceFilter = intent?.getDoubleExtra("distance_filter", 0.0)
         if (distanceFilter != null) {
             createLocationRequest(distanceFilter)
@@ -116,6 +116,8 @@ class LocationUpdatesService : Service() {
         val filter = IntentFilter()
         filter.addAction(STOP_SERVICE)
         registerReceiver(broadcastReceiver, filter)
+
+        updateNotification() // to start the foreground service
     }
 
 
@@ -134,7 +136,7 @@ class LocationUpdatesService : Service() {
             isStarted = true
             startForeground(NOTIFICATION_ID, notification.build())
         } else {
-            var notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
             notificationManager.notify(NOTIFICATION_ID, notification.build())
         }
     }
@@ -151,7 +153,6 @@ class LocationUpdatesService : Service() {
                     .addOnCompleteListener { task ->
                         if (task.isSuccessful && task.result != null) {
                             mLocation = task.result
-                        } else {
                         }
                     }
         } catch (unlikely: SecurityException) {
diff --git a/example/android/app/src/main/AndroidManifest.xml b/example/android/app/src/main/AndroidManifest.xml
index 8626ffd..21759b7 100644
--- a/example/android/app/src/main/AndroidManifest.xml
+++ b/example/android/app/src/main/AndroidManifest.xml
@@ -11,18 +11,18 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
+
     <application
+        android:allowBackup="false"
         android:label="background_location_example"
         android:icon="@mipmap/ic_launcher">
-        <meta-data
-            android:name="flutterEmbedding"
-            android:value="2" />
         <activity
             android:name=".MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
+            android:exported="true"
             android:windowSoftInputMode="adjustResize">
             <!-- This keeps the window background of the activity showing
                  until Flutter renders its first frame. It can be removed if
@@ -40,5 +40,10 @@
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
         </activity>
+
+        <service android:name="com.almoullim.background_location.LocationUpdatesService" android:foregroundServiceType="location" />
+        <meta-data
+            android:name="flutterEmbedding"
+            android:value="2" />
     </application>
 </manifest>