Merge pull request #8 from gogovan/fix/required-perm

fix requesting permissions may request requested permissions

Author: luiges90

lib/flutter_force_permission.dart

@@ -48,12 +48,9 @@ class FlutterForcePermission {
     var needShow = false;
     for (final permConfig in config.permissionItemConfigs) {
       for (final perm in permConfig.permissions) {
-        if (!(permissionStatuses[perm]?.requested ?? true)) {
-          needShow = true;
-          break;
-        }
         if (permissionStatuses[perm]?.status != PermissionStatus.granted &&
-            permConfig.required) {
+            (permConfig.required ||
+                !(permissionStatuses[perm]?.requested ?? true))) {
           needShow = true;
           break;
         }

lib/src/views/disclosure_page.dart

@@ -45,27 +45,14 @@ class DisclosurePage extends StatefulWidget {
   State<DisclosurePage> createState() => _DisclosurePageState();
 }
 
-@immutable
-class _PermissionItem {
-  const _PermissionItem(this.permission, this.itemText);
-
-  final Permission permission;
-  final PermissionItemText itemText;
-
-  @override
-  bool operator ==(Object other) =>
-      identical(this, other) ||
-      other is _PermissionItem &&
-          runtimeType == other.runtimeType &&
-          permission == other.permission &&
-          itemText == other.itemText;
-
-  @override
-  int get hashCode => permission.hashCode ^ itemText.hashCode;
-
-  @override
-  String toString() =>
-      '_PermissionItem{permission: $permission, itemText: $itemText}';
+class _DisplayItem {
+  _DisplayItem({
+    required this.config,
+    required this.isService,
+  });
+
+  final PermissionItemConfig config;
+  final bool isService;
 }
 
 class _DisclosurePageState extends State<DisclosurePage>
@@ -94,6 +81,37 @@ class _DisclosurePageState extends State<DisclosurePage>
     super.dispose();
   }
 
+  List<_DisplayItem> _getRequestingPermissions() =>
+      widget.permissionConfig.permissionItemConfigs.expand((e) {
+        var denied = false;
+        var requested = false;
+        var serviceDisabled = false;
+        for (final Permission p in e.permissions) {
+          if (widget.permissionStatuses[p]?.status !=
+              PermissionStatus.granted) {
+            denied = true;
+          }
+          if (widget.permissionStatuses[p]?.requested ?? true) {
+            requested = true;
+          }
+          if (widget.permissionStatuses[p]?.serviceStatus ==
+              ServiceStatus.disabled) {
+            serviceDisabled = true;
+          }
+        }
+        final serviceText = e.serviceItemText;
+
+        final List<_DisplayItem> result = [];
+        if (serviceDisabled && serviceText != null && e.required) {
+          result.add(_DisplayItem(config: e, isService: true));
+        }
+        if (denied && (!requested || e.required)) {
+          result.add(_DisplayItem(config: e, isService: false));
+        }
+
+        return result;
+      }).toList();
+
   @override
   Widget build(BuildContext context) {
     final titleWidget = Column(
@@ -107,37 +125,7 @@ class _DisclosurePageState extends State<DisclosurePage>
       ],
     );
 
-    final permissionItems =
-        widget.permissionConfig.permissionItemConfigs.expand((e) {
-      var denied = false;
-      var requested = false;
-      var serviceDisabled = false;
-      for (final Permission p in e.permissions) {
-        if (widget.permissionStatuses[p]?.status != PermissionStatus.granted) {
-          denied = true;
-        }
-        if (widget.permissionStatuses[p]?.requested ?? true) {
-          requested = true;
-        }
-        if (widget.permissionStatuses[p]?.serviceStatus ==
-            ServiceStatus.disabled) {
-          serviceDisabled = true;
-        }
-      }
-      final itemText = e.itemText;
-      final serviceText = e.serviceItemText;
-      final permission = e.permissions.first;
-
-      final List<_PermissionItem> result = [];
-      if (serviceDisabled && serviceText != null) {
-        result.add(_PermissionItem(permission, serviceText));
-      }
-      if (denied && !requested) {
-        result.add(_PermissionItem(permission, itemText));
-      }
-
-      return result;
-    }).toList();
+    final permissionItems = _getRequestingPermissions();
 
     return Scaffold(
       body: Column(
@@ -152,7 +140,10 @@ class _DisclosurePageState extends State<DisclosurePage>
                   return titleWidget;
                 } else {
                   final item = permissionItems[index - 1];
-                  var icon = item.itemText.icon;
+                  final config = item.isService
+                      ? item.config.serviceItemText
+                      : item.config.itemText;
+                  var icon = config?.icon;
                   icon ??= Icon(
                     Icons.perm_device_info_sharp,
                     color: Theme.of(context).primaryColor,
@@ -170,7 +161,7 @@ class _DisclosurePageState extends State<DisclosurePage>
                             children: [
                               Flexible(
                                 child: Text(
-                                  item.itemText.header,
+                                  config?.header ?? '',
                                   style: Theme.of(context).textTheme.subtitle1,
                                   softWrap: true,
                                   overflow: TextOverflow.ellipsis,
@@ -179,7 +170,7 @@ class _DisclosurePageState extends State<DisclosurePage>
                               ),
                               Flexible(
                                 child: Text(
-                                  item.itemText.rationaleText,
+                                  config?.rationaleText ?? '',
                                   style: Theme.of(context).textTheme.bodyText2,
                                   softWrap: true,
                                   overflow: TextOverflow.ellipsis,
@@ -215,53 +206,56 @@ class _DisclosurePageState extends State<DisclosurePage>
 
     // Request permissions one by one because in some cases requesting
     // multiple permissions does not ask the user as expected.
-    for (final PermissionItemConfig permConfig
-        in widget.permissionConfig.permissionItemConfigs) {
-      for (final Permission perm in permConfig.permissions) {
-        if (permConfig.required && perm is PermissionWithService) {
-          final text = permConfig.serviceItemText;
-          if (text != null) {
-            var serviceStatus = await widget._service.serviceStatus(perm);
-            while (serviceStatus == ServiceStatus.disabled) {
-              if (perm == Permission.phone) {
-                await _showRequiredPermDialog(text, _showPhoneSettings);
-              } else if (perm == Permission.location ||
-                  perm == Permission.locationAlways ||
-                  perm == Permission.locationWhenInUse) {
-                await _showRequiredPermDialog(text, _showLocationSettings);
-              } else {
-                if (kDebugMode) {
-                  print(
-                    '[flutter-force-permission] WARN: Unsupported Permission with service $perm found.',
-                  );
+    for (final _DisplayItem item in _getRequestingPermissions()) {
+      if (item.isService) {
+        final text = item.config.serviceItemText;
+        if (text != null) {
+          for (final Permission perm in item.config.permissions) {
+            if (perm is PermissionWithService) {
+              var serviceStatus = await widget._service.serviceStatus(perm);
+              while (serviceStatus == ServiceStatus.disabled) {
+                if (perm == Permission.phone) {
+                  await _showRequiredPermDialog(text, _showPhoneSettings);
+                } else if (perm == Permission.location ||
+                    perm == Permission.locationAlways ||
+                    perm == Permission.locationWhenInUse) {
+                  await _showRequiredPermDialog(text, _showLocationSettings);
+                } else {
+                  if (kDebugMode) {
+                    print(
+                      '[flutter-force-permission] WARN: Unsupported Permission with service $perm found.',
+                    );
+                  }
+                  break;
                 }
-                break;
+                // ignore: avoid-ignoring-return-values, not needed.
+                await widget._resumed.stream.firstWhere((element) => element);
+                serviceStatus = await widget._service.serviceStatus(perm);
               }
+            }
+          }
+        }
+      } else {
+        for (final Permission perm in item.config.permissions) {
+          // ignore: avoid-ignoring-return-values, not needed.
+          await widget._service.request(perm);
+
+          if (item.config.required) {
+            var permStatus = await widget._service.status(perm);
+            while (permStatus != PermissionStatus.granted) {
+              await _showRequiredPermDialog(
+                item.config.itemText,
+                _showAppSettings,
+              );
               // ignore: avoid-ignoring-return-values, not needed.
               await widget._resumed.stream.firstWhere((element) => element);
-              serviceStatus = await widget._service.serviceStatus(perm);
+              permStatus = await widget._service.status(perm);
             }
           }
-        }
 
-        // ignore: avoid-ignoring-return-values, not needed.
-        await widget._service.request(perm);
-
-        if (permConfig.required) {
-          var permStatus = await widget._service.status(perm);
-          while (permStatus != PermissionStatus.granted) {
-            await _showRequiredPermDialog(
-              permConfig.itemText,
-              _showAppSettings,
-            );
-            // ignore: avoid-ignoring-return-values, not needed.
-            await widget._resumed.stream.firstWhere((element) => element);
-            permStatus = await widget._service.status(perm);
-          }
+          // ignore: avoid-ignoring-return-values, not needed.
+          await prefs.setBool(getRequestedPrefKey(perm), true);
         }
-
-        // ignore: avoid-ignoring-return-values, not needed.
-        await prefs.setBool(getRequestedPrefKey(perm), true);
       }
     }