Fixing unit tests and subscription observer logic

Author: emawby

iOS_SDK/OneSignalSDK/Source/OSSubscription.m

@@ -64,7 +64,7 @@ - (instancetype)initAsFrom {
     _accpeted = [standardUserDefaults getSavedBoolForKey:OSUD_PERMISSION_ACCEPTED_FROM defaultValue:false];
     _userId = [standardUserDefaults getSavedStringForKey:OSUD_PLAYER_ID_FROM defaultValue:nil];
     _pushToken = [standardUserDefaults getSavedStringForKey:OSUD_PUSH_TOKEN_FROM defaultValue:nil];
-    _isPushDisabled = [standardUserDefaults keyExists:OSUD_USER_SUBSCRIPTION_FROM];
+    _isPushDisabled = ![standardUserDefaults getSavedBoolForKey:OSUD_USER_SUBSCRIPTION_FROM defaultValue:NO];
 
     return self;
 }
@@ -146,7 +146,7 @@ - (BOOL)isSubscribed {
 }
 
 - (NSString*)description {
-    static NSString* format = @"<OSSubscriptionState: userId: %@, pushToken: %@, userSubscriptionSetting: %d, subscribed: %d>";
+    static NSString* format = @"<OSSubscriptionState: userId: %@, pushToken: %@, isPushDisabled: %d, isSubscribed: %d>";
     return [NSString stringWithFormat:format, self.userId, self.pushToken, self.isPushDisabled, self.isSubscribed];
 }
 

iOS_SDK/OneSignalSDK/UnitTests/UnitTests.m

@@ -438,7 +438,9 @@ - (void)testSubscriptionChangeObserverFireAfterAppRestart {
     [UnitTestCommonMethods initOneSignal_andThreadWait];
     OSSubscriptionStateTestObserver* observer = [OSSubscriptionStateTestObserver new];
     [OneSignal addSubscriptionObserver:observer];
-
+    [UnitTestCommonMethods runBackgroundThreads];
+    XCTAssertEqual(observer->last.to.isSubscribed, true);
+    
     // User kills app, turns off notifications, then opnes it agian.
     [UnitTestCommonMethods clearStateForAppRestart:self];
     [UnitTestCommonMethods setCurrentNotificationPermission:false];
@@ -449,7 +451,7 @@ - (void)testSubscriptionChangeObserverFireAfterAppRestart {
     [OneSignal addSubscriptionObserver:observer];
     [UnitTestCommonMethods runBackgroundThreads];
 
-    XCTAssertEqual(observer->last.from.isSubscribed, true);
+
     XCTAssertEqual(observer->last.to.isSubscribed, false);
 }
 
@@ -574,7 +576,8 @@ - (void)testPermissionAndSubscriptionChangeObserverRemove {
     [UnitTestCommonMethods runBackgroundThreads];
 
     XCTAssertNil(permissionObserver->last);
-    XCTAssertNil(subscriptionObserver->last);
+    XCTAssertTrue([[OneSignal getDeviceState] isSubscribed]);
+    XCTAssertFalse(subscriptionObserver->last.to.isSubscribed);
 }
 
 - (void)testSubscriptionChangeObserverBasic {
@@ -1815,11 +1818,11 @@ - (void)testPushNotificationToken {
     XCTAssertNil(observer->last.to.userId);
     XCTAssertFalse(observer->last.to.isSubscribed);
 
-    [OneSignal disablePush:false];
+    [OneSignal disablePush:true]; //This should not result in a a change in state because we are waiting on privacy
     [UnitTestCommonMethods runBackgroundThreads];
 
-    XCTAssertFalse(observer->last.from.isPushDisabled);
-    XCTAssertFalse(observer->last.to.isPushDisabled);
+    XCTAssertTrue(observer->last.from.isPushDisabled); //Initial from is that push is disabled
+    XCTAssertFalse(observer->last.to.isPushDisabled); //Default value after adding an observer is that push is not disabled
     // Device registered with OneSignal so now make pushToken available.
     XCTAssertNil(observer->last.to.pushToken);