Merge branch 'develop' of https://github.com/BaseflowIT/flutter-permission-handler into develop

.github/FUNDING.yml

+github: Baseflow
+custom: https://baseflow.com/contact

README.md

+[![pub package](https://img.shields.io/pub/v/permission_handler.svg)](https://pub.dartlang.org/packages/permission_handler) [![Build Status](https://app.bitrise.io/app/fa4f5d4bf452bcfb/status.svg?token=HorGpL_AOw2llYz39CjmdQ&branch=master)](https://app.bitrise.io/app/fa4f5d4bf452bcfb) [![style: effective dart](https://img.shields.io/badge/style-effective_dart-40c4ff.svg)](https://github.com/tenhobi/effective_dart)
+
+On most operating systems, permissions aren't just granted to apps at install time.
+Rather, developers have to ask the user for permissions while the app is running.
+
+This plugin provides a cross-platform (iOS, Android) API to request permissions and check their status.
+You can also open the device's app settings so users can grant a permission.  
+On Android, you can show a rationale for requesting a permission.
+
+## Setup
+
+While the permissions are being requested during runtime, you'll still need to tell the OS which permissions your app might potentially use. That requires adding permission configuration to Android- and iOS-specific files.
+
+<details>
+<summary>Android</summary>
+  
+**Upgrade pre 1.12 Android projects**
+  
+Since version 4.4.0 this plugin is implemented using the Flutter 1.12 Android plugin APIs. Unfortunately this means App developers also need to migrate their Apps to support the new Android infrastructure. You can do so by following the [Upgrading pre 1.12 Android projects](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects) migration guide. Failing to do so might result in unexpected behaviour. Most common known error is the permission_handler not returning after calling the `.request()` method on a permission. 
+
+**AndroidX**
+
+As of version 3.1.0 the <kbd>permission_handler</kbd> plugin switched to the AndroidX version of the Android Support Libraries. This means you need to make sure your Android project is also upgraded to support AndroidX. Detailed instructions can be found [here](https://flutter.dev/docs/development/packages-and-plugins/androidx-compatibility).
+
+The TL;DR version is:
+1. Add the following to your "gradle.properties" file:
+```
+android.useAndroidX=true
+android.enableJetifier=true
+```
+2. Make sure you set the `compileSdkVersion` in your "android/app/build.gradle" file to 28:
+```
+android {
+  compileSdkVersion 28
+  ...
+}
+```
+3. Make sure you replace all the `android.` dependencies to their AndroidX counterparts (a full list can be found here: https://developer.android.com/jetpack/androidx/migrate).
+
+Add permissions to your `AndroidManifest.xml` file.
+There's a `debug`, `main` and `profile` version which are chosen depending on how you start your app.
+In general, it's sufficient to add permission only to the `main` version.
+[Here](https://github.com/Baseflow/flutter-permission-handler/blob/develop/example/android/app/src/main/AndroidManifest.xml)'s an example `AndroidManifest.xml` with a complete list of all possible permissions.
+
+</details>
+
+<details>
+<summary>iOS</summary>
+
+Add permission to your `Info.plist` file.
+[Here](https://github.com/Baseflow/flutter-permission-handler/blob/develop/permission_handler/example/ios/Runner/Info.plist)'s an example `Info.plist` with a complete list of all possible permissions.
+
+> IMPORTANT: ~~You will have to include all permission options when you want to submit your App.~~ This is because the `permission_handler` plugin touches all different SDKs and because the static code analyser (run by Apple upon App submission) detects this and will assert if it cannot find a matching permission option in the `Info.plist`. More information about this can be found [here](https://github.com/BaseflowIT/flutter-permission-handler/issues/26).
+
+The <kbd>permission_handler</kbd> plugin use [macros](https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/permission_handler/ios/Classes/PermissionHandlerEnums.h) to control whether a permission is supported.
+
+You can remove permissions you don't use:
+
+1. Add the following to your `Podfile` file:
+   ```ruby
+   post_install do |installer|
+     installer.pods_project.targets.each do |target|
+       target.build_configurations.each do |config|
+         ... # Here are some configurations automatically generated by flutter
+   
+         # You can remove unused permissions here
+         # for more infomation: https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/permission_handler/ios/Classes/PermissionHandlerEnums.h
+         # e.g. when you don't need camera permission, just add 'PERMISSION_CAMERA=0'
+         config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
+           '$(inherited)',
+  
+           ## dart: PermissionGroup.calendar
+           # 'PERMISSION_EVENTS=0',
+  
+           ## dart: PermissionGroup.reminders
+           # 'PERMISSION_REMINDERS=0',
+  
+           ## dart: PermissionGroup.contacts
+           # 'PERMISSION_CONTACTS=0',
+  
+           ## dart: PermissionGroup.camera
+           # 'PERMISSION_CAMERA=0',
+  
+           ## dart: PermissionGroup.microphone
+           # 'PERMISSION_MICROPHONE=0',
+  
+           ## dart: PermissionGroup.speech
+           # 'PERMISSION_SPEECH_RECOGNIZER=0',
+  
+           ## dart: PermissionGroup.photos
+           # 'PERMISSION_PHOTOS=0',
+  
+           ## dart: [PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse]
+           # 'PERMISSION_LOCATION=0',
+          
+           ## dart: PermissionGroup.notification
+           # 'PERMISSION_NOTIFICATIONS=0',
+  
+           ## dart: PermissionGroup.mediaLibrary
+           # 'PERMISSION_MEDIA_LIBRARY=0',
+  
+           ## dart: PermissionGroup.sensors
+           # 'PERMISSION_SENSORS=0'
+         ]
+  
+       end
+     end
+   end
+   ```
+2. Remove the `#` character in front of the permission you do not want to use. For example if you don't need access to the calendar make sure the code looks like this:
+   ```ruby
+           ## dart: PermissionGroup.calendar
+           'PERMISSION_EVENTS=0',
+   ```
+3. Delete the corresponding permission description in `Info.plist`
+   e.g. when you don't need camera permission, just delete 'NSCameraUsageDescription'
+   The following lists the relationship between `Permission` and `The key of Info.plist`:
+   | Permission                                                                                  | Info.plist                                                                                                    | Macro                        |
+   | ------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------- | ---------------------------- |
+   | PermissionGroup.calendar                                                                    | NSCalendarsUsageDescription                                                                                   | PERMISSION_EVENTS            |
+   | PermissionGroup.reminders                                                                   | NSRemindersUsageDescription                                                                                   | PERMISSION_REMINDERS         |
+   | PermissionGroup.contacts                                                                    | NSContactsUsageDescription                                                                                    | PERMISSION_CONTACTS          |
+   | PermissionGroup.camera                                                                      | NSCameraUsageDescription                                                                                      | PERMISSION_CAMERA            |
+   | PermissionGroup.microphone                                                                  | NSMicrophoneUsageDescription                                                                                  | PERMISSION_MICROPHONE        |
+   | PermissionGroup.speech                                                                      | NSSpeechRecognitionUsageDescription                                                                           | PERMISSION_SPEECH_RECOGNIZER |
+   | PermissionGroup.photos                                                                      | NSPhotoLibraryUsageDescription                                                                                | PERMISSION_PHOTOS            |
+   | PermissionGroup.location, PermissionGroup.locationAlways, PermissionGroup.locationWhenInUse | NSLocationUsageDescription, NSLocationAlwaysAndWhenInUseUsageDescription, NSLocationWhenInUseUsageDescription | PERMISSION_LOCATION          |
+   | PermissionGroup.notification                                                                | PermissionGroupNotification                                                                                   | PERMISSION_NOTIFICATIONS     |
+   | PermissionGroup.mediaLibrary                                                                | NSAppleMusicUsageDescription, kTCCServiceMediaLibrary                                                         | PERMISSION_MEDIA_LIBRARY     |
+   | PermissionGroup.sensors                                                                     | NSMotionUsageDescription                                                                                      | PERMISSION_SENSORS           |
+4. Clean & Rebuild
+
+</details>
+
+
+
+## How to use
+
+There are a number of [`Permission`](https://pub.dev/documentation/permission_handler_platform_interface/latest/permission_handler_platform_interface/Permission-class.html#constants)s.
+You can get a `Permission`'s `status`, which is either `undetermined`, `granted`, `denied`, `restricted` or `permanentlyDenied`.
+
+```dart
+var status = await Permission.camera.status;
+if (status.isUndetermined) {
+  // We didn't ask for permission yet.
+}
+
+// You can can also directly ask the permission about its status.
+if (await Permission.location.isRestricted) {
+  // The OS restricts access, for example because of parental controls.
+}
+```
+
+Call `request()` on a `Permission` to request it.
+If it has already been granted before, nothing happens.  
+`request()` returns the new status of the `Permission`.
+
+```dart
+if (await Permission.contacts.request().isGranted) {
+  // Either the permission was already granted before or the user just granted it.
+}
+
+// You can request multiple permissions at once.
+Map<Permission, PermissionStatus> statuses = await [
+  Permission.location,
+  Permission.storage,
+].request();
+print(statuses[Permission.location]);
+```
+
+Some permissions, for example location or acceleration sensor permissions, have an associated service, which can be `enabled` or `disabled`.
+
+```dart
+if (await Permission.locationWhenInUse.serviceStatus.isEnabled) {
+  // Use location.
+}
+```
+
+You can also open the app settings:
+
+```dart
+if (await Permission.speech.isPermanentlyDenied) {
+  // The user opted to never again see the permission request dialog for this
+  // app. The only way to change the permission's status now is to let the
+  // user manually enable it in the system settings.
+  openAppSettings();
+}
+```
+
+On Android, you can show a rationale for using a permission:
+
+```dart
+bool isShown = await Permission.contacts.shouldShowRequestRationale;
+```
+
+## Issues
+
+Please file any issues, bugs or feature request as an issue on our [GitHub](https://github.com/Baseflow/flutter-permission-handler/issues) page. Commercial support is available if you need help with integration with your app or services. You can contact us at [hello@baseflow.com](mailto:hello@baseflow.com).
+
+## Want to contribute
+
+If you would like to contribute to the plugin (e.g. by improving the documentation, solving a bug or adding a cool new feature), please carefully review our [contribution guide](../CONTRIBUTING.md) and send us your [pull request](https://github.com/Baseflow/flutter-permission-handler/pulls).
+
+## Author
+
+This Permission handler plugin for Flutter is developed by [Baseflow](https://baseflow.com). You can contact us at <hello@baseflow.com>

permission_handler/CHANGELOG.md

+## 5.0.0+hotfix.6
+
+* Solved an issue on iOS where requesting notification permissions always resulted in a "granted" result (see pull-request [#289](https://github.com/Baseflow/flutter-permission-handler/pull/289))
+
+## 5.0.0+hotfix.5
+
+* Remove use of the deprecated pre iOS 8 API causing users compile issues (see issue [#277](https://github.com/Baseflow/flutter-permission-handler/issues/277)).
+
+## 5.0.0+hotfix.4
+
+* Solve issue on Android causing an IllegalStateException ([#267](https://github.com/Baseflow/flutter-permission-handler/issues/267)).
+
+## 5.0.0+hotfix.3
+
+* Includes the changes of 4.4.0+hotfix.4 (which was released to be backwardscompatible).
+
+## 5.0.0+hotfix.2
+
+* Removed some residual usages of the `PermissionStatusUnknown` constants in #ifdef statements that were not found by the compiler.
+
 ## 5.0.0+hotfix.1
 
 * Make sure all enums from `permission_handler_platform_interface: 2.0.0` are exposed through the `permission_handler`.
@@ -6,6 +26,14 @@
 
 * **BREAKING**: Implemented more intuitive API exposed by `permission_handler_platform_interface: 2.0.0` ([#230](https://github.com/Baseflow/flutter-permission-handler/issues/230)).
 
+## 4.4.0+hotfix.4
+
+* Android: solved issue where `permission_handler` is used in a service (see [#251](https://github.com/Baseflow/flutter-permission-handler/issues/251))
+
+## 4.4.0+hotfix.3
+
+IGNORE THIS VERSION, it was released by accident and contains the same code as 4.4.0+hotfix.2
+
 ## 4.4.0+hotfix.2
 
 * Issue #235: Solved a bug which made it impossible to request service status on Android 7;

permission_handler/README.md

@@ -9,30 +9,33 @@ On Android, you can show a rationale for requesting a permission.
 
 ## Setup
 
-While the permissions are being requested during runtime, you'll still need to tell the OS which permissions your app might potentially use.  
-That requires adding permission configuration to Android- and iOS-specific files.
+While the permissions are being requested during runtime, you'll still need to tell the OS which permissions your app might potentially use. That requires adding permission configuration to Android- and iOS-specific files.
 
 <details>
 <summary>Android</summary>
+  
+**Upgrade pre 1.12 Android projects**
+  
+Since version 4.4.0 this plugin is implemented using the Flutter 1.12 Android plugin APIs. Unfortunately this means App developers also need to migrate their Apps to support the new Android infrastructure. You can do so by following the [Upgrading pre 1.12 Android projects](https://github.com/flutter/flutter/wiki/Upgrading-pre-1.12-Android-projects) migration guide. Failing to do so might result in unexpected behaviour. Most common known error is the permission_handler not returning after calling the `.request()` method on a permission. 
+
+**AndroidX**
 
-> The current version of the plugin requires AndroidX.
->
-> As of version 3.1.0 the <kbd>permission_handler</kbd> plugin switched to the AndroidX version of the Android Support Libraries. This means you need to make sure your Android project is also upgraded to support AndroidX. Detailed instructions can be found [here](https://flutter.dev/docs/development/packages-and-plugins/androidx-compatibility).
->
-> The TL;DR version is:
-> 1. Add the following to your "gradle.properties" file:
-> ```
-> android.useAndroidX=true
-> android.enableJetifier=true
-> ```
-> 2. Make sure you set the `compileSdkVersion` in your "android/app/build.gradle" file to 28:
-> ```
-> android {
-  >   compileSdkVersion 28
->   ...
-> }
-> ```
-> 3. Make sure you replace all the `android.` dependencies to their AndroidX counterparts (a full list can be found here: https://developer.android.com/jetpack/androidx/migrate).
+As of version 3.1.0 the <kbd>permission_handler</kbd> plugin switched to the AndroidX version of the Android Support Libraries. This means you need to make sure your Android project is also upgraded to support AndroidX. Detailed instructions can be found [here](https://flutter.dev/docs/development/packages-and-plugins/androidx-compatibility).
+
+The TL;DR version is:
+1. Add the following to your "gradle.properties" file:
+```
+android.useAndroidX=true
+android.enableJetifier=true
+```
+2. Make sure you set the `compileSdkVersion` in your "android/app/build.gradle" file to 28:
+```
+android {
+  compileSdkVersion 28
+  ...
+}
+```
+3. Make sure you replace all the `android.` dependencies to their AndroidX counterparts (a full list can be found here: https://developer.android.com/jetpack/androidx/migrate).
 
 Add permissions to your `AndroidManifest.xml` file.
 There's a `debug`, `main` and `profile` version which are chosen depending on how you start your app.
@@ -45,12 +48,11 @@ In general, it's sufficient to add permission only to the `main` version.
 <summary>iOS</summary>
 
 Add permission to your `Info.plist` file.
-[Here](https://github.com/Baseflow/flutter-permission-handler/blob/develop/example/ios/Runner/Info.plist)'s an example `Info.plist` with a complete list of all possible permissions.
+[Here](https://github.com/Baseflow/flutter-permission-handler/blob/develop/permission_handler/example/ios/Runner/Info.plist)'s an example `Info.plist` with a complete list of all possible permissions.
 
 > IMPORTANT: ~~You will have to include all permission options when you want to submit your App.~~ This is because the `permission_handler` plugin touches all different SDKs and because the static code analyser (run by Apple upon App submission) detects this and will assert if it cannot find a matching permission option in the `Info.plist`. More information about this can be found [here](https://github.com/BaseflowIT/flutter-permission-handler/issues/26).
 
-The <kbd>permission_handler</kbd> plugin use [macros](https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/ios/Classes/PermissionHandlerEnums.h) to control whether a permission is supported.
-By default, all the permissions listed [here](https://github.com/Baseflow/flutter-permission-handler#list-of-available-permissions) are supported.
+The <kbd>permission_handler</kbd> plugin use [macros](https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/permission_handler/ios/Classes/PermissionHandlerEnums.h) to control whether a permission is supported.
 
 You can remove permissions you don't use:
 
@@ -62,7 +64,7 @@ You can remove permissions you don't use:
          ... # Here are some configurations automatically generated by flutter
    
          # You can remove unused permissions here
-         # for more infomation: https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/ios/Classes/PermissionHandlerEnums.h
+         # for more infomation: https://github.com/BaseflowIT/flutter-permission-handler/blob/develop/permission_handler/ios/Classes/PermissionHandlerEnums.h
          # e.g. when you don't need camera permission, just add 'PERMISSION_CAMERA=0'
          config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] ||= [
            '$(inherited)',
@@ -105,7 +107,12 @@ You can remove permissions you don't use:
      end
    end
    ```
-2. Delete the corresponding permission description in `Info.plist`
+2. Remove the `#` character in front of the permission you do not want to use. For example if you don't need access to the calendar make sure the code looks like this:
+   ```ruby
+           ## dart: PermissionGroup.calendar
+           'PERMISSION_EVENTS=0',
+   ```
+3. Delete the corresponding permission description in `Info.plist`
    e.g. when you don't need camera permission, just delete 'NSCameraUsageDescription'
    The following lists the relationship between `Permission` and `The key of Info.plist`:
    | Permission                                                                                  | Info.plist                                                                                                    | Macro                        |
@@ -121,7 +128,7 @@ You can remove permissions you don't use:
    | PermissionGroup.notification                                                                | PermissionGroupNotification                                                                                   | PERMISSION_NOTIFICATIONS     |
    | PermissionGroup.mediaLibrary                                                                | NSAppleMusicUsageDescription, kTCCServiceMediaLibrary                                                         | PERMISSION_MEDIA_LIBRARY     |
    | PermissionGroup.sensors                                                                     | NSMotionUsageDescription                                                                                      | PERMISSION_SENSORS           |
-3. Clean & Rebuild
+4. Clean & Rebuild
 
 </details>
 
@@ -129,7 +136,7 @@ You can remove permissions you don't use:
 
 ## How to use
 
-There are a number of [`Permission`](https://pub.dev/documentation/permission_handler_platform_interface/latest/permission_handler_platform_interface/PermissionGroup-class.html)s.
+There are a number of [`Permission`](https://pub.dev/documentation/permission_handler_platform_interface/latest/permission_handler_platform_interface/Permission-class.html#constants)s.
 You can get a `Permission`'s `status`, which is either `undetermined`, `granted`, `denied`, `restricted` or `permanentlyDenied`.
 
 ```dart

permission_handler/android/src/main/java/com/baseflow/permissionhandler/MethodCallHandlerImpl.java

@@ -5,6 +5,7 @@ import android.content.Context;
 
 import androidx.annotation.NonNull;
 
+import androidx.annotation.Nullable;
 import io.flutter.plugin.common.BinaryMessenger;
 import io.flutter.plugin.common.MethodCall;
 import io.flutter.plugin.common.MethodChannel;
@@ -16,38 +17,45 @@ import java.util.List;
 
 final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
     private final Context applicationContext;
-    private final Activity activity;
     private final AppSettingsManager appSettingsManager;
     private final PermissionManager permissionManager;
     private final ServiceManager serviceManager;
-    private final ActivityRegistry activityRegistry;
-    private final PermissionRegistry permissionRegistry;
-    private final MethodChannel methodChannel;
 
     MethodCallHandlerImpl(
             Context applicationContext,
-            Activity activity,
-            BinaryMessenger messenger,
             AppSettingsManager appSettingsManager,
             PermissionManager permissionManager,
-            ServiceManager serviceManager,
-            ActivityRegistry activityRegistry,
-            PermissionRegistry permissionRegistry) {
+            ServiceManager serviceManager) {
         this.applicationContext = applicationContext;
-        this.activity = activity;
         this.appSettingsManager = appSettingsManager;
         this.permissionManager = permissionManager;
         this.serviceManager = serviceManager;
-        this.activityRegistry = activityRegistry;
-        this.permissionRegistry = permissionRegistry;
+    }
+
+    @Nullable
+    private Activity activity;
+
+    @Nullable
+    private ActivityRegistry activityRegistry;
+
+    @Nullable
+    private PermissionRegistry permissionRegistry;
+
+    public void setActivity(@Nullable Activity activity) {
+      this.activity = activity;
+    }
+
+    public void setActivityRegistry(
+        @Nullable ActivityRegistry activityRegistry) {
+      this.activityRegistry = activityRegistry;
+    }
 
-        methodChannel = new MethodChannel(
-                messenger,
-                "flutter.baseflow.com/permissions/methods");
-        methodChannel.setMethodCallHandler(this);
+    public void setPermissionRegistry(
+        @Nullable PermissionRegistry permissionRegistry) {
+      this.permissionRegistry = permissionRegistry;
     }
 
-    @Override
+  @Override
     public void onMethodCall(@NonNull MethodCall call, @NonNull final Result result)
     {
         switch (call.method) {
@@ -120,8 +128,4 @@ final class MethodCallHandlerImpl implements MethodChannel.MethodCallHandler {
                 break;
         }
     }
-
-    void stopListening() {
-        methodChannel.setMethodCallHandler(null);
-    }
 }

permission_handler/android/src/main/java/com/baseflow/permissionhandler/PermissionHandlerPlugin.java

@@ -2,19 +2,16 @@ package com.baseflow.permissionhandler;
 
 import android.app.Activity;
 import android.content.Context;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-
+import com.baseflow.permissionhandler.PermissionManager.ActivityRegistry;
+import com.baseflow.permissionhandler.PermissionManager.PermissionRegistry;
+import io.flutter.embedding.engine.plugins.FlutterPlugin;
 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.MethodChannel;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
-import io.flutter.embedding.engine.plugins.FlutterPlugin;
-
-import com.baseflow.permissionhandler.PermissionManager.ActivityRegistry;
-import com.baseflow.permissionhandler.PermissionManager.PermissionRegistry;
 
 /**
  * Platform implementation of the permission_handler Flutter plugin.
@@ -26,8 +23,11 @@ import com.baseflow.permissionhandler.PermissionManager.PermissionRegistry;
  * stable {@code io.flutter.plugin.common} package.
  */
 public final class PermissionHandlerPlugin implements FlutterPlugin, ActivityAware {
-    private @Nullable FlutterPluginBinding flutterPluginBinding;
-    private @Nullable MethodCallHandlerImpl methodCallHandler;
+
+    private MethodChannel methodChannel;
+
+    @Nullable
+    private MethodCallHandlerImpl methodCallHandler;
 
     /**
      * Registers a plugin implementation that uses the stable {@code io.flutter.plugin.common}
@@ -37,43 +37,38 @@ public final class PermissionHandlerPlugin implements FlutterPlugin, ActivityAwa
      * won't react to changes in activity or context, unlike {@link PermissionHandlerPlugin}.
      */
     public static void registerWith(Registrar registrar) {
-        final PermissionHandlerPlugin permissionHandlerPlugin = new PermissionHandlerPlugin();
-        permissionHandlerPlugin.startListening(
-                registrar.context(),
+        final PermissionHandlerPlugin plugin = new PermissionHandlerPlugin();
+        plugin.startListening(registrar.context(), registrar.messenger());
+
+        if (registrar.activeContext() instanceof Activity) {
+            plugin.startListeningToActivity(
                 registrar.activity(),
-                registrar.messenger(),
                 registrar::addActivityResultListener,
                 registrar::addRequestPermissionsResultListener
-        );
+            );
+        }
     }
 
     @Override
     public void onAttachedToEngine(@NonNull FlutterPluginBinding binding) {
-        this.flutterPluginBinding = binding;
+        startListening(
+            binding.getApplicationContext(),
+            binding.getBinaryMessenger()
+        );
     }
 
     @Override
     public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
-        this.flutterPluginBinding = null;
+        stopListening();
     }
 
     @Override
     public void onAttachedToActivity(@NonNull ActivityPluginBinding binding) {
-        if(flutterPluginBinding == null) {
-            return;
-        }
-
-        startListening(
-                flutterPluginBinding.getApplicationContext(),
-                binding.getActivity(),
-                flutterPluginBinding.getBinaryMessenger(),
-                binding::addActivityResultListener,
-                binding::addRequestPermissionsResultListener);
-    }
-
-    @Override
-    public void onDetachedFromActivityForConfigChanges() {
-        onDetachedFromActivity();
+        startListeningToActivity(
+            binding.getActivity(),
+            binding::addActivityResultListener,
+            binding::addRequestPermissionsResultListener
+        );
     }
 
     @Override
@@ -83,28 +78,53 @@ public final class PermissionHandlerPlugin implements FlutterPlugin, ActivityAwa
 
     @Override
     public void onDetachedFromActivity() {
-        if (methodCallHandler == null) {
-            return;
-        }
+        stopListeningToActivity();
+    }
+
+    @Override
+    public void onDetachedFromActivityForConfigChanges() {
+        onDetachedFromActivity();
+    }
 
-        methodCallHandler.stopListening();
+
+    private void startListening(Context applicationContext, BinaryMessenger messenger) {
+        methodChannel = new MethodChannel(
+            messenger,
+            "flutter.baseflow.com/permissions/methods");
+
+        methodCallHandler = new MethodCallHandlerImpl(
+            applicationContext,
+            new AppSettingsManager(),
+            new PermissionManager(),
+            new ServiceManager()
+        );
+
+        methodChannel.setMethodCallHandler(methodCallHandler);
+    }
+
+    private void stopListening() {
+        methodChannel.setMethodCallHandler(null);
+        methodChannel = null;
         methodCallHandler = null;
     }
 
-    private void startListening(
-            Context applicationContext,
-            Activity activity,
-            BinaryMessenger messenger,
-            ActivityRegistry activityRegistry,
-            PermissionRegistry permissionRegistry) {
-      methodCallHandler = new MethodCallHandlerImpl(
-              applicationContext,
-              activity,
-              messenger,
-              new AppSettingsManager(),
-              new PermissionManager(),
-              new ServiceManager(),
-              activityRegistry,
-              permissionRegistry);
+    private void startListeningToActivity(
+        Activity activity,
+        ActivityRegistry activityRegistry,
+        PermissionRegistry permissionRegistry
+    ) {
+        if (methodCallHandler != null) {
+            methodCallHandler.setActivity(activity);
+            methodCallHandler.setActivityRegistry(activityRegistry);
+            methodCallHandler.setPermissionRegistry(permissionRegistry);
+        }
+    }
+
+    private void stopListeningToActivity() {
+        if (methodCallHandler != null) {
+            methodCallHandler.setActivity(null);
+            methodCallHandler.setActivityRegistry(null);
+            methodCallHandler.setPermissionRegistry(null);
+        }
     }
 }

permission_handler/android/src/main/java/com/baseflow/permissionhandler/ServiceManager.java

@@ -36,11 +36,12 @@ final class ServiceManager {
         if (permission == PermissionConstants.PERMISSION_GROUP_LOCATION ||
             permission == PermissionConstants.PERMISSION_GROUP_LOCATION_ALWAYS ||
             permission == PermissionConstants.PERMISSION_GROUP_LOCATION_WHEN_IN_USE) {
-                final int serviceStatus = isLocationServiceEnabled(context)
-                        ? PermissionConstants.SERVICE_STATUS_ENABLED
-                        : PermissionConstants.SERVICE_STATUS_DISABLED;
+            final int serviceStatus = isLocationServiceEnabled(context)
+                    ? PermissionConstants.SERVICE_STATUS_ENABLED
+                    : PermissionConstants.SERVICE_STATUS_DISABLED;
 
-                successCallback.onSuccess(serviceStatus);
+            successCallback.onSuccess(serviceStatus);
+            return;
         }
 
         if (permission == PermissionConstants.PERMISSION_GROUP_PHONE) {

permission_handler/example/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings

-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>BuildSystemType</key>
-	<string>Latest</string>
-</dict>
-</plist>

permission_handler/example/ios/Runner/Info.plist

@@ -50,7 +50,7 @@
     <key>NSLocationUsageDescription</key>
     <string>Older devices need location.</string>
     <key>NSLocationAlwaysUsageDescription</key>
-    <string>Can I haz location always?</string>
+    <string>Can I have location always?</string>
 
     <!-- Permission options for the `mediaLibrary` group -->
     <key>NSAppleMusicUsageDescription</key>

permission_handler/ios/Classes/strategies/NotificationPermissionStrategy.m

@@ -37,7 +37,11 @@
           completionHandler(PermissionStatusDenied);
           return;
         }
+
+        [[UIApplication sharedApplication] registerForRemoteNotifications];
+        completionHandler(PermissionStatusGranted);
       }];
+
     } else {
       UIUserNotificationType notificationTypes = 0;
       notificationTypes |= UIUserNotificationTypeSound;
@@ -45,9 +49,10 @@
       notificationTypes |= UIUserNotificationTypeBadge;
       UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:notificationTypes categories:nil];
       [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
+
+      [[UIApplication sharedApplication] registerForRemoteNotifications];
+      completionHandler(PermissionStatusGranted);
     }
-    [[UIApplication sharedApplication] registerForRemoteNotifications];
-    completionHandler(PermissionStatusGranted);
   });
 }
 
@@ -68,8 +73,7 @@
     UIUserNotificationSettings * setting = [[UIApplication sharedApplication] currentUserNotificationSettings];
     if (setting.types == UIUserNotificationTypeNone) permissionStatus = PermissionStatusDenied;
   } else {
-    UIRemoteNotificationType type = [[UIApplication sharedApplication] enabledRemoteNotificationTypes];
-    if (type == UIUserNotificationTypeNone) permissionStatus = PermissionStatusDenied;
+      permissionStatus = PermissionStatusDenied;
   }
   return permissionStatus;
 }

permission_handler/ios/permission_handler.podspec

@@ -3,7 +3,7 @@
 #
 Pod::Spec.new do |s|
   s.name             = 'permission_handler'
-  s.version          = '5.0.0+hotfix.1'
+  s.version          = '5.0.0+hotfix.6'
   s.summary          = 'Permission plugin for Flutter.'
   s.description      = <<-DESC
 Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions.

permission_handler/pubspec.yaml

 name: permission_handler
 description: Permission plugin for Flutter. This plugin provides a cross-platform (iOS, Android) API to request and check permissions.
-version: 5.0.0+hotfix.1
+version: 5.0.0+hotfix.6
 homepage: https://github.com/baseflowit/flutter-permission-handler
 
 flutter: