[iOS] update requestPermission

zinwalin · Oct 30, 2019 · 0f630d5 · 0f630d5
1 parent 28bb7af
commit 0f630d5
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 23 deletions.
diff --git a/example/ios/Runner/Runner.entitlements b/example/ios/Runner/Runner.entitlements
@@ -0,0 +1,8 @@
+<?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>com.apple.security.application-groups</key>
+	<array/>
+</dict>
+</plist>
diff --git a/ios/Classes/strategies/NotificationPermissionStrategy.m b/ios/Classes/strategies/NotificationPermissionStrategy.m
@@ -23,30 +23,30 @@ - (void)requestPermission:(PermissionGroup)permission completionHandler:(Permiss
     completionHandler(status);
     return;
   }
-
-  if(@available(iOS 10.0, *)) {
-    UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
-
-    UNAuthorizationOptions authorizationOptions = 0;
-    authorizationOptions += UNAuthorizationOptionSound;
-    authorizationOptions += UNAuthorizationOptionAlert;
-    authorizationOptions += UNAuthorizationOptionBadge;
-    [center requestAuthorizationWithOptions:(authorizationOptions) completionHandler:^(BOOL granted, NSError * _Nullable error) {
-      if (!granted || error != nil) {
-        completionHandler(PermissionStatusDenied);
-        return;
-      }
-      completionHandler(PermissionStatusGranted);
-    }];
-  } else {
-    UIUserNotificationType notificationTypes = 0;
-    notificationTypes |= UIUserNotificationTypeSound;
-    notificationTypes |= UIUserNotificationTypeAlert;
-    notificationTypes |= UIUserNotificationTypeBadge;
-    UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:notificationTypes categories:nil];
-    [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
+  dispatch_async(dispatch_get_main_queue(), ^{
+    if(@available(iOS 10.0, *)) {
+      UNUserNotificationCenter *center = [UNUserNotificationCenter currentNotificationCenter];
+      UNAuthorizationOptions authorizationOptions = 0;
+      authorizationOptions += UNAuthorizationOptionSound;
+      authorizationOptions += UNAuthorizationOptionAlert;
+      authorizationOptions += UNAuthorizationOptionBadge;
+      [center requestAuthorizationWithOptions:(authorizationOptions) completionHandler:^(BOOL granted, NSError * _Nullable error) {
+        if (!granted || error != nil) {
+          completionHandler(PermissionStatusDenied);
+          return;
+        }
+      }];
+    } else {
+      UIUserNotificationType notificationTypes = 0;
+      notificationTypes |= UIUserNotificationTypeSound;
+      notificationTypes |= UIUserNotificationTypeAlert;
+      notificationTypes |= UIUserNotificationTypeBadge;
+      UIUserNotificationSettings *settings = [UIUserNotificationSettings settingsForTypes:notificationTypes categories:nil];
+      [[UIApplication sharedApplication] registerUserNotificationSettings:settings];
+    }
+    [[UIApplication sharedApplication] registerForRemoteNotifications];
     completionHandler(PermissionStatusGranted);
-  }
+  });
 }
 
 + (PermissionStatus)permissionStatus {