Merge pull request #344 from Iterable/bug/mob-1795-crash

[MOB-1795] - Check notificationsEnabled synchronously

Author: tapashmajumder

swift-sdk/Internal/IterableAPIInternal.swift

@@ -101,22 +101,12 @@ final class IterableAPIInternal: NSObject, PushTrackerProtocol, AuthProvider {
             return
         }
 
-        // check notificationsEnabled then call register with enabled/not-not enabled
-        notificationStateProvider.notificationsEnabled.onSuccess { enabled in
-            self.register(token: token,
-                          appName: appName,
-                          pushServicePlatform: self.config.pushPlatform,
-                          notificationsEnabled: enabled,
-                          onSuccess: onSuccess,
-                          onFailure: onFailure)
-        }.onError { _ in
-            self.register(token: token,
-                          appName: appName,
-                          pushServicePlatform: self.config.pushPlatform,
-                          notificationsEnabled: false,
-                          onSuccess: onSuccess,
-                          onFailure: onFailure)
-        }
+        self.register(token: token,
+                      appName: appName,
+                      pushServicePlatform: self.config.pushPlatform,
+                      notificationsEnabled: notificationStateProvider.notificationsEnabled,
+                      onSuccess: onSuccess,
+                      onFailure: onFailure)
     }
 
     @discardableResult private func register(token: Data,

swift-sdk/Internal/IterableAppIntegrationInternal.swift

@@ -9,33 +9,35 @@ import UserNotifications
 
 // Returns whether notifications are enabled
 protocol NotificationStateProviderProtocol {
-    var notificationsEnabled: Promise<Bool, Error> { get }
+    var notificationsEnabled: Bool { get }
 
     func registerForRemoteNotifications()
 }
 
 struct SystemNotificationStateProvider: NotificationStateProviderProtocol {
-    var notificationsEnabled: Promise<Bool, Error> {
-        let result = Promise<Bool, Error>()
-        
+    var notificationsEnabled: Bool {
         if #available(iOS 10.0, *) {
-            UNUserNotificationCenter.current().getNotificationSettings { settings in
-                if settings.authorizationStatus == .authorized {
-                    result.resolve(with: true)
-                } else {
-                    result.resolve(with: false)
+            var notificationSettings: UNNotificationSettings?
+            let semasphore = DispatchSemaphore(value: 0)
+            
+            DispatchQueue.global().async {
+                UNUserNotificationCenter.current().getNotificationSettings { setttings in
+                    notificationSettings = setttings
+                    semasphore.signal()
                 }
             }
+            
+            semasphore.wait()
+            guard let authorizationStatus = notificationSettings?.authorizationStatus else { return false }
+            return authorizationStatus == .authorized
         } else {
             // Fallback on earlier versions
             if let currentSettings = UIApplication.shared.currentUserNotificationSettings, currentSettings.types != [] {
-                result.resolve(with: true)
+                return true
             } else {
-                result.resolve(with: false)
+                return false
             }
         }
-        
-        return result
     }
 
     func registerForRemoteNotifications() {

tests/swift-sdk-swift-tests/Mocks.swift

@@ -11,12 +11,8 @@ import XCTest
 
 // Note: This is used only by swift tests. So can't put this in Common
 class MockNotificationStateProvider: NotificationStateProviderProtocol {
-    var notificationsEnabled: Promise<Bool, Error> {
-        let promise = Promise<Bool, Error>()
-        DispatchQueue.main.async {
-            promise.resolve(with: self.enabled)
-        }
-        return promise
+    var notificationsEnabled: Bool {
+        return enabled
     }
 
     func registerForRemoteNotifications() {