Notifications Manager - push token and sub ID from cache

* The `OSNotificationsManager` needs push token and push subscription ID, when it may not be passed to it, if it already exists.
* Get these two values from the cache when they are accessed and they are nil.
* Previously, When the app starts up, the _pushToken would always be `nil` and return a negative number incorrectly.

* Also fix a bug where we send a nil pushToken to the user module, it will translate as "", and register as a change when it really isn't

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -178,12 +178,26 @@ + (OSPermissionStateInternal*)lastPermissionState {
     return _lastPermissionState;
 }
 
+// TODO: pushToken, pushSubscriptionId needs to be available... is this the right setup
 static NSString *_pushToken;
++ (NSString*)pushToken {
+    if (!_pushToken) {
+        _pushToken = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PUSH_TOKEN_TO defaultValue:nil];
+    }
+    return _pushToken;
+}
 
 static NSString *_pushSubscriptionId;
++ (NSString*)pushSubscriptionId {
+    if (!_pushSubscriptionId) {
+        _pushSubscriptionId = [OneSignalUserDefaults.initShared getSavedStringForKey:OSUD_PLAYER_ID_TO defaultValue:nil];
+    }
+    return _pushSubscriptionId;
+}
 + (void)setPushSubscriptionId:(NSString *)pushSubscriptionId {
     _pushSubscriptionId = pushSubscriptionId;
 }
+
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wundeclared-selector"
 + (void)start {
@@ -377,6 +391,9 @@ + (void)didRegisterForRemoteNotifications:(UIApplication *)app
     self.waitingForApnsResponse = false;
 
     _pushToken = parsedDeviceToken;
+    
+    // Cache push token
+    [OneSignalUserDefaults.initShared saveStringForKey:OSUD_PUSH_TOKEN_TO withValue:_pushToken];
 
     [self sendPushTokenToDelegate];
 }
@@ -399,7 +416,8 @@ + (void)handleDidFailRegisterForRemoteNotification:(NSError*)err {
 }
 
 + (void)sendPushTokenToDelegate {
-    if (self.delegate && [self.delegate respondsToSelector:@selector(setPushToken:)]) {
+    // TODO: Keep this as a check on _pushToken instead of self.pushToken?
+    if (_pushToken != nil && self.delegate && [self.delegate respondsToSelector:@selector(setPushToken:)]) {
         [self.delegate setPushToken:_pushToken];
     }
 }
@@ -469,7 +487,8 @@ + (int)getNotificationTypes {
     if (mSubscriptionStatus < -9)
         return mSubscriptionStatus;
 
-    if (OSNotificationsManager.waitingForApnsResponse && !_pushToken)
+    // This was previously nil if just accessing _pushToken
+    if (OSNotificationsManager.waitingForApnsResponse && !self.pushToken)
         return ERROR_PUSH_DELEGATE_NEVER_FIRED;
 
     OSPermissionStateInternal* permissionStatus = [OSNotificationsManager.osNotificationSettings getNotificationPermissionState];

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift

@@ -100,9 +100,6 @@ class OSSubscriptionModel: OSModel {
                 return
             }
 
-            // Cache the push token as it persists across users on the device?
-            OneSignalUserDefaults.initShared().saveString(forKey: OSUD_PUSH_TOKEN_TO, withValue: address)
-
             updateNotificationTypes()
 
             firePushSubscriptionChanged(.address(oldValue))