Fixes to declined on first init, updates from settings, and session count

* Fixed registration issue where the app already prompted the user in a previous app version before OneSignal was added and they declined.
* Fixed issue where changes to notification permissions from Settings would not update when coming back to the app.
* Fixed sessions not tracking when the app is resumed.
   - Only cold starts were being tracked.
* Some of the above issues may have not existed in a released version.

Author: jkasten2

iOS_SDK/OneSignal/OneSignal.m

@@ -82,6 +82,15 @@
 /* Omit no app_id error logging, for use with wrapper SDKs. */
 NSString* const kOSSettingsKeyInOmitNoAppIdLogging = @"kOSSettingsKeyInOmitNoAppIdLogging";
 
+
+@interface OSSubcscriptionStatus : NSObject
+ @property BOOL anwseredPrompt;
+ @property BOOL accepted;
+@end
+
+@implementation OSSubcscriptionStatus
+@end
+
 @implementation OneSignal
 
 NSString* const ONESIGNAL_VERSION = @"020305";
@@ -171,7 +180,6 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
        [OneSignalLocation getLocation:false];
 
     if (self) {
-        UIApplication* sharedApp = [UIApplication sharedApplication];
         NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
 
         httpClient = [[OneSignalHTTPClient alloc] init];
@@ -247,10 +255,14 @@ + (id)initWithLaunchOptions:(NSDictionary*)launchOptions appId:(NSString*)appId
 
         if (mUserId != nil)
             [self registerUser];
-        else // Fall back in case Apple does not responds in time.
-            [self performSelector:@selector(registerUser) withObject:nil afterDelay:30.0f];
-        
-        [OneSignalTracker onFocus:NO];
+        else {
+            [self userAnsweredNotificationPrompt:^(OSSubcscriptionStatus *status) {
+                if (status.anwseredPrompt)
+                    [self registerUser];
+                else
+                    [self performSelector:@selector(registerUser) withObject:nil afterDelay:30.0f];
+            }];
+        }
     }
 
     /*
@@ -655,8 +667,8 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
         // iOS 8 - We get a token right away but give the user 30 sec to respond to the system prompt.
         // Also check notification types so there is no waiting if user has already answered the system prompt.
         // The goal is to only have 1 server call.
-        [self userAnsweredNotificationPrompt:^(BOOL anwsered) {
-            if (anwsered)
+        [self userAnsweredNotificationPrompt:^(OSSubcscriptionStatus *status) {
+            if (status.anwseredPrompt)
                 [OneSignal registerUser];
             else {
                 [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(registerUser) object:nil];
@@ -677,9 +689,12 @@ + (void)updateDeviceToken:(NSString*)deviceToken onSuccess:(OSResultSuccessBlock
     NSMutableURLRequest* request;
     request = [httpClient requestWithMethod:@"PUT" path:[NSString stringWithFormat:@"players/%@", mUserId]];
 
+    int notificationTypes = [self getNotificationTypes];
+    
     NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
                              app_id, @"app_id",
                              deviceToken, @"identifier",
+                             [NSNumber numberWithInt:notificationTypes], @"notification_types",
                              nil];
 
     [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message:@"Calling OneSignal PUT updated pushToken!"];
@@ -718,12 +733,12 @@ +(BOOL)shouldRegisterNow {
     if (waitingForOneSReg)
         return false;
 
-    //Figure out if should pass or not
+    // Figure out if should pass or not
     NSTimeInterval now = [[NSDate date] timeIntervalSince1970];
     NSTimeInterval lastTimeClosed = [[NSUserDefaults standardUserDefaults] doubleForKey:@"GT_LAST_CLOSED_TIME"];
     if (!lastTimeClosed) {
         [self updateLastSessionDateTime];
-        return YES;
+        return true;
     }
 
     if ([self isHighPriorityCall])
@@ -881,10 +896,14 @@ +(NSString*) getUsableDeviceToken {
 }
 
 // Updates the server with the new user's notification setting or subscription status changes
-+ (void) sendNotificationTypesUpdate {
-    
++ (BOOL) sendNotificationTypesUpdate {
     // User changed notification settings for the app.
     if ([self getNotificationTypes] != -1 && mUserId && mLastNotificationTypes != [self getNotificationTypes]) {
+        if (mDeviceToken == nil) {
+            [self registerForAPNsToken];
+            return true;
+        }
+        
         mLastNotificationTypes = [self getNotificationTypes];
         NSMutableURLRequest* request = [httpClient requestWithMethod:@"PUT" path:[NSString stringWithFormat:@"players/%@", mUserId]];
         NSDictionary* dataDic = [NSDictionary dictionaryWithObjectsAndKeys:
@@ -900,8 +919,11 @@ + (void) sendNotificationTypesUpdate {
             idsAvailableBlockWhenReady(mUserId, [self getUsableDeviceToken]);
             idsAvailableBlockWhenReady = nil;
         }
+        
+        return true;
     }
 
+    return false;
 }
 
 + (void)sendPurchases:(NSArray*)purchases {
@@ -1127,12 +1149,10 @@ + (int) getNotificationTypes {
     if (!mSubscriptionSet)
         return -2;
 
-    if (mDeviceToken) {
-        if ([OneSignalHelper canGetNotificationTypes])
-            return [[UIApplication sharedApplication] currentUserNotificationSettings].types;
-        else
-            return NOTIFICATION_TYPE_ALL;
-    }
+    if ([OneSignalHelper canGetNotificationTypes])
+        return [[UIApplication sharedApplication] currentUserNotificationSettings].types;
+    else if (mDeviceToken)
+        return NOTIFICATION_TYPE_ALL;
 
     return 0;
 }
@@ -1142,21 +1162,34 @@ + (void)setSubscriptionStatus:(int)errorType {
     [self sendNotificationTypesUpdate];
 }
 
-+ (void)userAnsweredNotificationPrompt:(void (^)(BOOL anwsered))completionHandler {
++ (void)userAnsweredNotificationPrompt:(void (^)(OSSubcscriptionStatus *anwsered))completionHandler {
    if ([OneSignalHelper isiOS10Plus]) {
        Class unUserNotifClass = NSClassFromString(@"UNUserNotificationCenter");
        [[unUserNotifClass currentNotificationCenter] getNotificationSettingsWithCompletionHandler:^(id settings) {
            // Trigger callback on the main thread.
            // Prevents any possiblitity creating thread locks by callling currentUserNotification from this block.
            dispatch_async(dispatch_get_main_queue(), ^{
                [OneSignal onesignal_Log:ONE_S_LL_VERBOSE message: [NSString stringWithFormat:@"getNotificationSettingsWithCompletionHandler Called: %@", settings]];
-               completionHandler([settings authorizationStatus] != 0);
+               OSSubcscriptionStatus *status = [OSSubcscriptionStatus alloc];
+               status.anwseredPrompt = [settings authorizationStatus] != 0;
+               status.accepted = [settings authorizationStatus] == 2;
+               completionHandler(status);
            });
         }];
     }
     else {
         NSUserDefaults* userDefaults = [NSUserDefaults standardUserDefaults];
-        completionHandler([userDefaults boolForKey:@"OS_NOTIFICATION_PROMPT_ANSWERED"]);
+        OSSubcscriptionStatus *status = [OSSubcscriptionStatus alloc];
+        status.anwseredPrompt = [userDefaults boolForKey:@"OS_NOTIFICATION_PROMPT_ANSWERED"];
+        
+        if ([OneSignalHelper canGetNotificationTypes]) {
+            status.accepted = [[UIApplication sharedApplication] currentUserNotificationSettings].types > 0;
+            completionHandler(status);
+        }
+        else {
+            status.accepted = mDeviceToken != nil;
+            completionHandler(status);
+        }
     }
 }
 

iOS_SDK/OneSignalTracker.m

@@ -35,8 +35,8 @@
 @interface OneSignal ()
 
 + (void)registerUser;
-+ (void) sendNotificationTypesUpdate;
-+ (BOOL) clearBadgeCount:(BOOL)fromNotifOpened;
++ (BOOL)sendNotificationTypesUpdate;
++ (BOOL)clearBadgeCount:(BOOL)fromNotifOpened;
 + (NSString*)mUserId;
 
 @end
@@ -61,8 +61,8 @@ + (void) endBackgroundFocusTask {
 
 + (void)onFocus:(BOOL)toBackground {
 
-    //Prevent the onFocus to be called twice when app being terminated
-    // (Both WillResignActive and willTerminate
+    // Prevent the onFocus to be called twice when app being terminated
+    //    - Both WillResignActive and willTerminate
     if (lastOnFocusWasToBackground == toBackground)
         return;
     lastOnFocusWasToBackground = toBackground;
@@ -73,13 +73,7 @@ + (void)onFocus:(BOOL)toBackground {
     NSTimeInterval timeToPingWith = 0.0;
 
 
-    if (!toBackground) {
-        lastOpenedTime = now;
-        [OneSignal sendNotificationTypesUpdate];
-        wasBadgeSet = [OneSignal clearBadgeCount:false];
-    }
-    else {
-
+    if (toBackground) {
         [[NSUserDefaults standardUserDefaults] setDouble:now forKey:@"GT_LAST_CLOSED_TIME"];
         [[NSUserDefaults standardUserDefaults] synchronize];
 
@@ -96,7 +90,15 @@ + (void)onFocus:(BOOL)toBackground {
         }
 
         timeToPingWith = totalTimeActive;
+    }
+    else {
+        lastOpenedTime = now;
+        BOOL firedUpdate = [OneSignal sendNotificationTypesUpdate];
 
+        // on_session tracking when resumming app.
+        if (!firedUpdate)
+            [OneSignal registerUser];
+        wasBadgeSet = [OneSignal clearBadgeCount:false];
     }
 
     if (![OneSignal mUserId])