Fix Deliver Quietly (#433)

* Fix Deliver Quietly

• Our SDK was not detecting the 'deliver quietly' option of iOS 12 in some conditions
• This fix adds a notificationTypes check so that our backend does not assume the device has notifications disabled

* Update Notification Types Correctly

• Since we do not evaluate the raw integer value of notificationTypes anywhere (it is used as a bitmask) this commit changes the way we increment notificationTypes when deliver quietly/provisional settings are enabled.

* Add Regression Test

• Adds a test to ensure the SDK will correctly detect if 'Deliver Quietly' is enabled

Author: Nightsd01

iOS_SDK/OneSignalSDK/Source/OneSignalNotificationSettingsIOS10.m

@@ -80,9 +80,13 @@ - (void)getNotificationPermissionState:(void (^)(OSPermissionState *subscription
                                      + (settings.alertSetting == UNNotificationSettingEnabled ? 4 : 0)
                                      + (settings.lockScreenSetting == UNNotificationSettingEnabled ? 8 : 0);
 
-            if ([OneSignalHelper isIOSVersionGreaterOrEqual:12.0])
-                if (status.notificationTypes == 0 && settings.authorizationStatus == provisionalStatus)
-                    status.notificationTypes = PROVISIONAL_UNAUTHORIZATIONOPTION;
+            // check if using provisional notifications
+            if ([OneSignalHelper isIOSVersionGreaterOrEqual:12.0] && settings.authorizationStatus == provisionalStatus)
+                status.notificationTypes += PROVISIONAL_UNAUTHORIZATIONOPTION;
+            
+            // also check if 'deliver quietly' is enabled.
+            if ([OneSignalHelper isIOSVersionGreaterOrEqual:10.0] && settings.notificationCenterSetting == UNNotificationSettingEnabled)
+                status.notificationTypes += 16;
 
             self.useCachedStatus = true;
             completionHandler(status);

iOS_SDK/OneSignalSDK/UnitTests/Shadows/UNUserNotificationCenterOverrider.m

@@ -133,11 +133,13 @@ + (void)mockInteralGetNotificationSettingsWithCompletionHandler:(void(^)(id sett
         id retSettings = [UNNotificationSettings alloc];
         [retSettings setValue:authorizationStatus forKeyPath:@"authorizationStatus"];
 
-        if (notifTypesOverride >= 7) {
+        if (notifTypesOverride >= 7 && notifTypesOverride != 16) {
             [retSettings setValue:[NSNumber numberWithInt:UNNotificationSettingEnabled] forKeyPath:@"badgeSetting"];
             [retSettings setValue:[NSNumber numberWithInt:UNNotificationSettingEnabled] forKeyPath:@"soundSetting"];
             [retSettings setValue:[NSNumber numberWithInt:UNNotificationSettingEnabled] forKeyPath:@"alertSetting"];
             [retSettings setValue:[NSNumber numberWithInt:UNNotificationSettingEnabled] forKeyPath:@"lockScreenSetting"];
+        } else if (notifTypesOverride == 16) {
+            [retSettings setValue:[NSNumber numberWithInt:UNNotificationSettingEnabled] forKey:@"notificationCenterSetting"];
         }
 
         //if (getNotificationSettingsWithCompletionHandlerStackCount > 1)

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -566,6 +566,33 @@ - (void)testTestPermissionChangeObserverWithNativeiOS10PromptCall {
                           @"<OSSubscriptionStateChanges:\nfrom: <OSPermissionState: hasPrompted: 1, status: Denied, provisional: 0>,\nto:   <OSPermissionState: hasPrompted: 1, status: Authorized, provisional: 0>\n>");
 }
 
+- (void)testDeliverQuietly {
+    [OneSignalUNUserNotificationCenter setUseiOS10_2_workaround:false];
+    
+    [UnitTestCommonMethods setCurrentNotificationPermissionAsUnanswered];
+    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"
+            handleNotificationAction:nil
+                            settings:@{kOSSettingsKeyAutoPrompt: @false}];
+    
+    OSPermissionStateTestObserver* observer = [OSPermissionStateTestObserver new];
+    [OneSignal addPermissionObserver:observer];
+    
+    [self backgroundApp];
+    
+    //answer the prompt to allow notification
+    [UnitTestCommonMethods answerNotificationPrompt:true];
+    
+    // user notification center will return only `notificationCenterSetting` enabled
+    // this mimics enabling 'Deliver Quietly'
+    [UNUserNotificationCenterOverrider setNotifTypesOverride:(1 << 4)];
+    [UnitTestCommonMethods runBackgroundThreads];
+    
+    let permissionState = OneSignal.getPermissionSubscriptionState.permissionStatus;
+    
+    // OneSignal should detect that deliver quietly is enabled and set the 5th bit to true
+    XCTAssertTrue((permissionState.notificationTypes >> 4) & 1);
+}
+
 - (void)testPermissionChangeObserverWithDecline {
     [UnitTestCommonMethods setCurrentNotificationPermissionAsUnanswered];
     [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"