Fixed crash on iOS 7 devices when the device tries to register for push

* This crash was introduced in 2.3.6.
* Added test to prevent regression of this issue.

Author: jkasten2

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -232,10 +232,12 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
         else
             [self enableInAppLaunchURL:@YES];
 
-        // Register this device with Apple's APNS server if enabled auto-prompt or not passed a NO
+        
         BOOL autoPrompt = YES;
         if (settings[kOSSettingsKeyAutoPrompt] && [settings[kOSSettingsKeyAutoPrompt] isKindOfClass:[NSNumber class]])
             autoPrompt = [settings[kOSSettingsKeyAutoPrompt] boolValue];
+        
+        // Register with Apple's APNS server if we registed once before or if auto-prompt hasn't been disabled.
         if (autoPrompt || registeredWithApple)
             [self registerForPushNotifications];
         else
@@ -348,8 +350,11 @@ void onesignal_Log(ONE_S_LOG_LEVEL logLevel, NSString* message) {
 }
 
 
-// iOS 8+, only tries to register for an APNs token if one is true:
+// iOS 8+, only tries to register for an APNs token
 + (BOOL)registerForAPNsToken {
+    if (![OneSignalHelper isIOSVersionGreaterOrEqual:8])
+        return false;
+    
     if (waitingForApnsResponse)
         return true;
 
@@ -358,11 +363,11 @@ + (BOOL)registerForAPNsToken {
 
     // Only try to register for a pushToken if:
     //  - The user accepted notifications
-    //  - Background Modes > Remote Notifications are enabled in Xcode
+    //  - "Background Modes" > "Remote Notifications" are enabled in Xcode
     if (![self accpetedNotificationPermission] && !backgroundModesEnabled)
         return false;
 
-    // Don't attempt to register again if the was non-recoverable error.
+    // Don't attempt to register again if there was a non-recoverable error.
     if (mSubscriptionStatus < -9)
         return false;
 
@@ -383,19 +388,17 @@ + (void)registerForPushNotifications {
     //     BOOL granted, NSError * _Nullable error) {
     // }];
 
-    // For iOS 8 devices
-    if ([[UIApplication sharedApplication] respondsToSelector:@selector(registerUserNotificationSettings:)]) {
-        // ClassFromString to work around pre Xcode 6 link errors when building an app using the OneSignal framework.
-        Class uiUserNotificationSettings = NSClassFromString(@"UIUserNotificationSettings");
-        NSUInteger notificationTypes = NOTIFICATION_TYPE_ALL;
-        
-        NSSet* categories = [[[UIApplication sharedApplication] currentUserNotificationSettings] categories];
+    UIApplication* shardApp = [UIApplication sharedApplication];
+    
+    if ([OneSignalHelper isIOSVersionGreaterOrEqual:8]) {
+        // Get all current Categories so we don't remove any of the app developer's.
+        NSSet* categories = [[shardApp currentUserNotificationSettings] categories];
 
-        [[UIApplication sharedApplication] registerUserNotificationSettings:[uiUserNotificationSettings settingsForTypes:notificationTypes categories:categories]];
+        [shardApp registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:NOTIFICATION_TYPE_ALL categories:categories]];
         [self registerForAPNsToken];
     }
     else { // For iOS 6 & 7 devices
-        [[UIApplication sharedApplication] registerForRemoteNotificationTypes:UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert];
+        [shardApp registerForRemoteNotificationTypes:UIRemoteNotificationTypeBadge | UIRemoteNotificationTypeSound | UIRemoteNotificationTypeAlert];
         if (!registeredWithApple) {
             waitingForApnsResponse = true;
             [[NSUserDefaults standardUserDefaults] setObject:@YES forKey:@"GT_REGISTERED_WITH_APPLE"];
@@ -641,7 +644,7 @@ + (void)setNotificationDisplayOptions:(NSNumber*)option {
 
     // Special Case: If iOS version < 10 && Option passed is 2, default to inAppAlerts.
     NSInteger op = option.integerValue;
-    if (![OneSignalHelper isiOS10Plus] && OSNotificationDisplayTypeNotification == op)
+    if (![OneSignalHelper isIOSVersionGreaterOrEqual:10] && OSNotificationDisplayTypeNotification == op)
         op = OSNotificationDisplayTypeInAppAlert;
 
     [[NSUserDefaults standardUserDefaults] setObject:@(op) forKey:@"ONESIGNAL_ALERT_OPTION"];
@@ -1218,7 +1221,8 @@ + (void)setSubscriptionErrorStatus:(int)errorType {
 }
 
 + (void)userAnsweredNotificationPrompt:(void (^)(OSSubcscriptionStatus *anwsered))completionHandler {
-   if ([OneSignalHelper isiOS10Plus]) {
+    
+    if ([OneSignalHelper isIOSVersionGreaterOrEqual:10]) {
        Class unUserNotifClass = NSClassFromString(@"UNUserNotificationCenter");
        [[unUserNotifClass currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(id settings) {
            // Trigger callback on the main thread.
@@ -1232,27 +1236,33 @@ + (void)userAnsweredNotificationPrompt:(void (^)(OSSubcscriptionStatus *anwsered
            });
         }];
     }
-    else {
+    else { // Pre-iOS 10
         NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
         OSSubcscriptionStatus *status = [OSSubcscriptionStatus alloc];
         status.anwseredPrompt = [userDefaults boolForKey:@"OS_NOTIFICATION_PROMPT_ANSWERED"];
 
-        if ([OneSignalHelper canGetNotificationTypes]) {
+        // iOS 8+
+        if ([OneSignalHelper canGetNotificationTypes])
             status.accepted = [[UIApplication sharedApplication] currentUserNotificationSettings].types > 0;
-            completionHandler(status);
-        }
-        else {
+        else { // iOS 7
             status.accepted = mDeviceToken != nil;
-            completionHandler(status);
+            
+            // No other iOS 7 event will trigger an awnsered event so do so here.
+            if (!status.anwseredPrompt && status.accepted) {
+                [userDefaults setBool:true forKey:@"OS_NOTIFICATION_PROMPT_ANSWERED"];
+                [userDefaults synchronize];
+            }
         }
+        
+        completionHandler(status);
     }
 }
 
 // iOS 8.0+ only
 //    User just responed to the iOS native notification permission prompt.
 //    Also extra calls to registerUserNotificationSettings will fire this without prompting again.
 + (void) updateNotificationTypes:(int)notificationTypes {
-   if (![OneSignalHelper isiOS10Plus]) {
+   if (![OneSignalHelper isIOSVersionGreaterOrEqual:10]) {
         NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
         [userDefaults setBool:true forKey:@"OS_NOTIFICATION_PROMPT_ANSWERED"];
         [userDefaults synchronize];

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.h

@@ -47,7 +47,7 @@
 + (void)handleNotificationAction:(OSNotificationActionType)actionType actionID:(NSString*)actionID displayType:(OSNotificationDisplayType)displayType;
 
 // - iOS 10
-+ (BOOL)isiOS10Plus;
++ (BOOL)isIOSVersionGreaterOrEqual:(float)version;
 #if XC8_AVAILABLE
 + (void)registerAsUNNotificationCenterDelegate;
 + (void)clearCachedMedia;

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m

@@ -532,21 +532,20 @@ +(NSNumber*)getNetType {
     return @1;
 }
 
+// Can call currentUserNotificationSettings
 + (BOOL) canGetNotificationTypes {
-    return [[UIApplication sharedApplication] respondsToSelector:@selector(currentUserNotificationSettings)];
+    return [OneSignalHelper isIOSVersionGreaterOrEqual:8];
 }
 
 + (UILocalNotification*)createUILocalNotification:(NSDictionary*)data {
+    UILocalNotification* notification = [[UILocalNotification alloc] init];
 
-    UILocalNotification * notification = [[UILocalNotification alloc] init];
-    
-    id category = [[NSClassFromString(@"UIMutableUserNotificationCategory") alloc] init];
+    UIMutableUserNotificationCategory* category = [[UIMutableUserNotificationCategory alloc] init];
     [category setIdentifier:@"__dynamic__"];
 
-    Class UIMutableUserNotificationActionClass = NSClassFromString(@"UIMutableUserNotificationAction");
     NSMutableArray* actionArray = [[NSMutableArray alloc] init];
     for (NSDictionary* button in [OneSignalHelper getActionButtons:data]) {
-        id action = [[UIMutableUserNotificationActionClass alloc] init];
+        id action = [[UIMutableUserNotificationAction alloc] init];
         [action setTitle:button[@"n"]];
         [action setIdentifier:button[@"i"] ? button[@"i"] : [action title]];
         [action setActivationMode:UIUserNotificationActivationModeForeground];
@@ -561,16 +560,13 @@ + (UILocalNotification*)createUILocalNotification:(NSDictionary*)data {
 
     [category setActions:actionArray forContext:UIUserNotificationActionContextDefault];
 
-    Class uiUserNotificationSettings = NSClassFromString(@"UIUserNotificationSettings");
-    NSUInteger notificationTypes = NOTIFICATION_TYPE_ALL;
-    
     NSSet* currentCategories = [[[UIApplication sharedApplication] currentUserNotificationSettings] categories];
     if (currentCategories)
         currentCategories = [currentCategories setByAddingObject:category];
     else
         currentCategories = [NSSet setWithObject:category];
 
-    [[UIApplication sharedApplication] registerUserNotificationSettings:[uiUserNotificationSettings settingsForTypes:notificationTypes categories:currentCategories]];
+    [[UIApplication sharedApplication] registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:NOTIFICATION_TYPE_ALL categories:currentCategories]];
     notification.category = [category identifier];
     return notification;
 }
@@ -580,6 +576,7 @@ + (UILocalNotification*)prepareUILocalNotification:(NSDictionary*)data :(NSDicti
     UILocalNotification *notification = [self createUILocalNotification:data];
 
     if ([data[@"m"] isKindOfClass:[NSDictionary class]]) {
+        // alertTitle was added in iOS 8.2
         if ([notification respondsToSelector:NSSelectorFromString(@"alertTitle")])
             notification.alertTitle = data[@"m"][@"title"];
         notification.alertBody = data[@"m"][@"body"];
@@ -609,8 +606,8 @@ +(OneSignal*) sharedInstance {
     return singleInstance;
 }
 
-+ (BOOL)isiOS10Plus {
-    return [[[UIDevice currentDevice] systemVersion] floatValue] >= 10.0 ;
++ (BOOL)isIOSVersionGreaterOrEqual:(float)version {
+    return [[[UIDevice currentDevice] systemVersion] floatValue] >= version;
 }
 
 +(NSString*)randomStringWithLength:(int)length {

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -281,19 +281,21 @@ @interface UIApplicationOverrider : NSObject
 @end
 @implementation UIApplicationOverrider
 
+static BOOL calledRegisterForRemoteNotifications;
 static NSInteger didFailRegistarationErrorCode;
 static BOOL shouldFireDeviceToken;
 
 + (void)load {
     injectToProperClass(@selector(overrideRegisterForRemoteNotifications), @selector(registerForRemoteNotifications), @[], [UIApplicationOverrider class], [UIApplication class]);
     injectToProperClass(@selector(override_run), @selector(_run), @[], [UIApplicationOverrider class], [UIApplication class]);
     injectToProperClass(@selector(overrideCurrentUserNotificationSettings), @selector(currentUserNotificationSettings), @[], [UIApplicationOverrider class], [UIApplication class]);
+    injectToProperClass(@selector(overrideRegisterForRemoteNotificationTypes:), @selector(registerForRemoteNotificationTypes:), @[], [UIApplicationOverrider class], [UIApplication class]);
 }
 
 // Keeps UIApplicationMain(...) from looping to continue to the next line.
 - (void) override_run {}
 
-- (void) overrideRegisterForRemoteNotifications {
++ (void) helperCallDidRegisterForRemoteNotificationsWithDeviceToken {
     id app = [UIApplication sharedApplication];
     id appDelegate = [[UIApplication sharedApplication] delegate];
 
@@ -305,13 +307,25 @@ - (void) overrideRegisterForRemoteNotifications {
 
     if (!shouldFireDeviceToken)
         return;
-
+    
 
     char bytes[32];
     memset(bytes, 0, 32);
 
     id deviceToken = [NSData dataWithBytes:bytes length:32];
     [appDelegate application:app didRegisterForRemoteNotificationsWithDeviceToken:deviceToken];
+
+}
+
+// Called on iOS 8+
+- (void) overrideRegisterForRemoteNotifications {
+    calledRegisterForRemoteNotifications = true;
+    [UIApplicationOverrider helperCallDidRegisterForRemoteNotificationsWithDeviceToken];
+}
+
+// iOS 7
+- (void)overrideRegisterForRemoteNotificationTypes:(UIRemoteNotificationType)types {
+   [UIApplicationOverrider helperCallDidRegisterForRemoteNotificationsWithDeviceToken];
 }
 
 
@@ -329,9 +343,12 @@ @implementation OneSignalHelperOverrider
 static NSDictionary* lastHTTPRequset;
 static int networkRequestCount;
 
+static float mockIOSVersion;
+
 + (void)load {
     injectStaticSelector([OneSignalHelperOverrider class], @selector(overrideEnqueueRequest:onSuccess:onFailure:isSynchronous:), [OneSignalHelper class], @selector(enqueueRequest:onSuccess:onFailure:isSynchronous:));
     injectStaticSelector([OneSignalHelperOverrider class], @selector(overrideGetAppName), [OneSignalHelper class], @selector(getAppName));
+    injectStaticSelector([OneSignalHelperOverrider class], @selector(overrideIsIOSVersionGreaterOrEqual:), [OneSignalHelper class], @selector(isIOSVersionGreaterOrEqual:));
 }
 
 + (NSString*) overrideGetAppName {
@@ -354,6 +371,10 @@ + (void)overrideEnqueueRequest:(NSURLRequest*)request onSuccess:(OSResultSuccess
         successBlock(@{@"id": @"1234"});
 }
 
++ (BOOL)overrideIsIOSVersionGreaterOrEqual:(float)version {
+   return mockIOSVersion >= version;
+}
+
 @end
 
 
@@ -405,6 +426,8 @@ @implementation UnitTests
 - (void)setUp {
     [super setUp];
 
+    mockIOSVersion = 10;
+    
     timeOffset = 0;
     networkRequestCount = 0;
     lastUrl = nil;
@@ -426,6 +449,7 @@ - (void)setUp {
     authorizationStatus = [NSNumber numberWithInteger:UNAuthorizationStatusAuthorized];
 
     shouldFireDeviceToken = true;
+    calledRegisterForRemoteNotifications = false;
     didFailRegistarationErrorCode = 0;
     nsbundleDictionary = @{@"UIBackgroundModes": @[@"remote-notification"]};
 
@@ -521,13 +545,14 @@ - (UNNotificationResponse*)createBasiciOSNotificationResponseWithPayload:(NSDict
 }
 
 - (UNNotificationResponse*)createBasiciOSNotificationResponse {
-  id userInfo = @{@"custom": @{
-                              @"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb"
-                          }};
+  id userInfo = @{@"custom":
+                      @{@"i": @"b2f7f966-d8cc-11e4-bed1-df8f05be55bb"}
+                  };
 
   return [self createBasiciOSNotificationResponseWithPayload:userInfo];
 }
 
+// Helper used to simpify tests below.
 - (void)initOneSignal {
     [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"];
 
@@ -556,6 +581,29 @@ - (void)testBasicInitTest {
     XCTAssertEqual(networkRequestCount, 1);
 }
 
+- (void)testRegisterationOniOS7 {
+    mockIOSVersion = 7;
+    
+    [self initOneSignal];
+    [self runBackgroundThreads];
+    
+    XCTAssertEqualObjects(lastHTTPRequset[@"app_id"], @"b2f7f966-d8cc-11e4-bed1-df8f05be55ba");
+    XCTAssertEqualObjects(lastHTTPRequset[@"identifier"], @"0000000000000000000000000000000000000000000000000000000000000000");
+    XCTAssertEqualObjects(lastHTTPRequset[@"notification_types"], @7);
+    XCTAssertEqualObjects(lastHTTPRequset[@"device_model"], @"x86_64");
+    XCTAssertEqualObjects(lastHTTPRequset[@"device_type"], @0);
+    XCTAssertEqualObjects(lastHTTPRequset[@"language"], @"en-US");
+    
+    // 2nd init call should not fire another on_session call.
+    lastHTTPRequset = nil;
+    [OneSignal initWithLaunchOptions:nil appId:@"b2f7f966-d8cc-11e4-bed1-df8f05be55ba"];
+    XCTAssertNil(lastHTTPRequset);
+    
+    XCTAssertEqual(networkRequestCount, 1);
+    // Make sure calledRegisterForRemoteNotifications didn't fire as this isn't available on iOS 7
+    XCTAssertFalse(calledRegisterForRemoteNotifications);
+}
+
 // Seen a few rare crash reports where [NSLocale preferredLanguages] resturns an empty array
 - (void)testInitWithEmptyPreferredLanguages {
     preferredLanguagesArray = @[];