Fixed issue where kOSSettingsKeyInFocusDisplayOption was ignored

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -393,7 +393,7 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         NSNumber *IFDSetting = settings[kOSSettingsKeyInFocusDisplayOption];
         BOOL inFocusDisplayPassed = IFDSetting && IFDSetting.integerValue > -1 && IFDSetting.integerValue < 3;
 
-        if (inAppAlertsPassed || inAppAlertsPassed) {
+        if (inAppAlertsPassed || inFocusDisplayPassed) {
             if (!inFocusDisplayPassed)
                 self.inFocusDisplayType = (OSNotificationDisplayType)IAASetting.integerValue;
             else

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -1040,6 +1040,22 @@ - (void)testInitOnSimulator {
 }
 
 
+- (void)testFocusSettingsOnInit {
+    // Test old kOSSettingsKeyInFocusDisplayOption
+    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"
+            handleNotificationAction:nil
+                            settings:@{kOSSettingsKeyInFocusDisplayOption: @(OSNotificationDisplayTypeNone)}];
+    
+    XCTAssertEqual(OneSignal.inFocusDisplayType, OSNotificationDisplayTypeNone);
+    
+    [self clearStateForAppRestart];
+
+    // Test old very old kOSSettingsKeyInAppAlerts
+    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"
+            handleNotificationAction:nil
+                            settings:@{kOSSettingsKeyInAppAlerts: @(false)}];
+    XCTAssertEqual(OneSignal.inFocusDisplayType, OSNotificationDisplayTypeNone);
+}
 
 - (void)testCallingMethodsBeforeInit {
     [self setCurrentNotificationPermission:true];