Merge pull request #10 from gogovan/fix/deny-required-perm

Fix iOS hang after denying required permission and then granted

Author: luiges90

lib/src/views/disclosure_page.dart

@@ -237,18 +237,24 @@ class _DisclosurePageState extends State<DisclosurePage>
         }
       } else {
         for (final Permission perm in item.config.permissions) {
-          // ignore: avoid-ignoring-return-values, not needed.
-          await widget._service.request(perm);
+          // ignore: prefer-moving-to-variable, multiple calls needed to ensure up-to-date data.
+          var permStatus = await widget._service.status(perm);
+          if (permStatus != PermissionStatus.permanentlyDenied) {
+            // ignore: avoid-ignoring-return-values, not needed.
+            await widget._service.request(perm);
+          }
 
           if (item.config.required) {
-            var permStatus = await widget._service.status(perm);
+            // ignore: prefer-moving-to-variable, multiple calls needed to ensure up-to-date data.
+            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);
+              // ignore: prefer-moving-to-variable, multiple calls needed to ensure up-to-date data.
               permStatus = await widget._service.status(perm);
             }
           }

test/widget_test/disclosure_page_test.dart

@@ -30,6 +30,8 @@ void main() {
         .thenAnswer((realInvocation) => Future.value(prefs));
     when(testStub.request(Permission.location))
         .thenAnswer((realInvocation) => Future.value(PermissionStatus.granted));
+    when(testStub.status(Permission.location))
+        .thenAnswer((realInvocation) => Future.value(PermissionStatus.granted));
 
     final config = FlutterForcePermissionConfig(
       title: 'Title',
@@ -228,6 +230,91 @@ void main() {
     await resumed.close();
   });
 
+  // If permissions are permanently denied, permission request will not show.
+  testWidgets('Required permission permanently denied', (tester) async {
+    final testStub = MockTestStub();
+    when(testStub.getSharedPreference())
+        .thenAnswer((realInvocation) => Future.value(prefs));
+    when(testStub.status(Permission.location))
+        .thenAnswer((realInvocation) => Future.value(PermissionStatus.permanentlyDenied));
+    when(testStub.openAppSettings())
+        .thenAnswer((realInvocation) => Future.value());
+
+    final config = FlutterForcePermissionConfig(
+      title: 'Title',
+      confirmText: 'Confirm',
+      permissionItemConfigs: [
+        PermissionItemConfig(
+          permissions: [
+            Permission.location,
+          ],
+          itemText: PermissionItemText(
+            header: 'Foreground location',
+            rationaleText: 'Rationale',
+            forcedPermissionDialogConfig: ForcedPermissionDialogConfig(
+              title: 'Location required',
+              text: 'Location needed for proper operation',
+              buttonText: 'Settings',
+            ),
+          ),
+          required: true,
+        ),
+      ],
+    );
+    final status = <Permission, PermissionServiceStatus>{
+      Permission.location: PermissionServiceStatus(
+        status: PermissionStatus.denied,
+        requested: false,
+        serviceStatus: ServiceStatus.enabled,
+      ),
+    };
+    final StreamController<bool> resumed = StreamController.broadcast()
+      ..add(true);
+
+    await tester.pumpWidget(
+      MaterialApp(
+        home: DisclosurePage.stub(
+          permissionConfig: config,
+          permissionStatuses: status,
+          service: testStub,
+          resumed: resumed,
+        ),
+      ),
+    );
+
+    expect(find.text('Title'), findsOneWidget);
+    expect(find.text('Foreground location'), findsOneWidget);
+    expect(find.text('Rationale'), findsOneWidget);
+    expect(find.text('Confirm'), findsOneWidget);
+
+    await tester.tap(find.text('Confirm'));
+    await tester.pump();
+
+    expect(find.text('Location required'), findsOneWidget);
+    expect(find.text('Location needed for proper operation'), findsOneWidget);
+    expect(find.text('Settings'), findsOneWidget);
+
+    await tester.tap(find.text('Settings'));
+    await tester.pump();
+
+    verify(testStub.openAppSettings());
+
+    resumed.add(true);
+    await tester.pump();
+
+    expect(find.text('Settings'), findsOneWidget);
+    await tester.tap(find.text('Settings'));
+
+    when(testStub.status(Permission.location))
+        .thenAnswer((realInvocation) => Future.value(PermissionStatus.granted));
+    resumed.add(true);
+    await tester.pump();
+
+    expect(find.text('Settings'), findsNothing);
+
+    await resumed.close();
+  });
+
   testWidgets('Required service permission', (tester) async {
     final testStub = MockTestStub();
     when(testStub.getSharedPreference())