update permission observer callback's object

* No longer pass a `OSPermissionStateChanges` object with a `to` and `from`
* Instead, we wanted to pass a single boolean to represent the current permission
* However, the observable infrastructure set up does not allow us to pass bools
* Let's for now pass a `OSPermissionState` object representing the current state with 1 property on it called `permission`
* Updated SDK minimally to support this case, unused codes could be cleaned up...

Author: nan-li

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -117,12 +117,12 @@ + (void) setOneSignalAppId:(NSString*)onesignalAppId {
     // [OneSignal setAppId:onesignalAppId];
 }
 
-- (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
-    NSLog(@"onOSPermissionChanged: %@", stateChanges);
+- (void)onOSPermissionChanged:(OSPermissionState*)state {
+    NSLog(@"Dev App onOSPermissionChanged: %@", state);
 }
 
 - (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges *)stateChanges {
-    NSLog(@"onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
+    NSLog(@"Dev App onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
     ViewController* mainController = (ViewController*) self.window.rootViewController;
     mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.optedIn;
 }

iOS_SDK/OneSignalDevApp/OneSignalDevAppClip/AppDelegate.m

@@ -112,8 +112,8 @@ + (void) setOneSignalAppId:(NSString*)onesignalAppId {
     [OneSignal initialize:onesignalAppId withLaunchOptions:nil];
 }
 
-- (void) onOSPermissionChanged:(OSPermissionStateChanges*)stateChanges {
-    NSLog(@"onOSPermissionChanged: %@", stateChanges);
+- (void) onOSPermissionChanged:(OSPermissionState*)state {
+    NSLog(@"onOSPermissionChanged: %@", state);
 }
 
 // TODO: Add push sub observer

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -143,6 +143,7 @@ + (OneSignalNotificationSettings *)osNotificationSettings {
     return _osNotificationSettings;
 }
 
+// static property def to add developer's OSPermissionStateChanges observers to.
 static ObservablePermissionStateChangesType* _permissionStateChangesObserver;
 + (ObservablePermissionStateChangesType*)permissionStateChangesObserver {
     if (!_permissionStateChangesObserver)
@@ -421,11 +422,11 @@ + (void)setSubscriptionErrorStatus:(int)errorType {
     [self sendNotificationTypesUpdateToDelegate];
 }
 
-// onOSPermissionChanged should only fire if something changed.
+// onOSPermissionChanged should only fire if the reachable property changed.
 + (void)addPermissionObserver:(NSObject<OSPermissionObserver>*)observer {
     [self.permissionStateChangesObserver addObserver:observer];
 
-    if ([self.currentPermissionState compare:self.lastPermissionState])
+    if (self.currentPermissionState.reachable != self.lastPermissionState.reachable)
         [OSPermissionChangedInternalObserver fireChangesObserver:self.currentPermissionState];
 }
 

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.h

@@ -49,13 +49,9 @@ typedef NS_ENUM(NSInteger, OSNotificationPermission) {
 // Permission Classes
 @interface OSPermissionState : NSObject
 // TODO: Decide: remove/change properties after addition of canRequestPermission and permission boolean
-@property (readonly, nonatomic) BOOL reachable;
-@property (readonly, nonatomic) BOOL hasPrompted;
-@property (readonly, nonatomic) BOOL provisional;
-@property (readonly, nonatomic) BOOL providesAppNotificationSettings;
-@property (readonly, nonatomic) OSNotificationPermission status;
+@property (readonly, nonatomic) BOOL permission;
 - (NSDictionary * _Nonnull)jsonRepresentation;
-- (instancetype _Nonnull )initWithStatus:(OSNotificationPermission)status reachable:(BOOL)reachable hasPrompted:(BOOL)hasPrompted provisional:(BOOL)provisional providesAppNotificationSettings:(BOOL)providesAppNotificationSettings;
+- (instancetype _Nonnull )initWithPermission:(BOOL)permission;
 @end
 
 @protocol OSPermissionStateObserver<NSObject>
@@ -87,24 +83,15 @@ typedef OSObservable<NSObject<OSPermissionStateObserver>*, OSPermissionState*> O
 - (instancetype _Nonnull )initAsTo;
 - (instancetype _Nonnull )initAsFrom;
 
-- (BOOL)compare:(OSPermissionStateInternal * _Nonnull)from;
 - (OSPermissionState * _Nonnull)getExternalState;
-
-@end
-
-@interface OSPermissionStateChanges : NSObject
-
-@property (readonly, nonnull) OSPermissionState* to;
-@property (readonly, nonnull) OSPermissionState* from;
 - (NSDictionary * _Nonnull)jsonRepresentation;
-- (instancetype _Nonnull)initAsTo:(OSPermissionState * _Nonnull)to from:(OSPermissionState * _Nonnull)from;
 @end
 
 @protocol OSPermissionObserver <NSObject>
-- (void)onOSPermissionChanged:(OSPermissionStateChanges * _Nonnull)stateChanges;
+- (void)onOSPermissionChanged:(OSPermissionState * _Nonnull)state;
 @end
 
-typedef OSObservable<NSObject<OSPermissionObserver>*, OSPermissionStateChanges*> ObservablePermissionStateChangesType;
+typedef OSObservable<NSObject<OSPermissionObserver>*, OSPermissionState*> ObservablePermissionStateChangesType;
 
 
 @interface OSPermissionChangedInternalObserver : NSObject<OSPermissionStateObserver>

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSPermission.m

@@ -159,15 +159,8 @@ - (OSNotificationPermission)status {
     return OSNotificationPermissionNotDetermined;
 }
 
-- (BOOL)compare:(OSPermissionStateInternal*)from {
-    return self.accepted != from.accepted ||
-           self.ephemeral != from.ephemeral ||
-           self.answeredPrompt != from.answeredPrompt ||
-           self.hasPrompted != from.hasPrompted;
-}
-
 - (OSPermissionState *)getExternalState {
-    return [[OSPermissionState alloc] initWithStatus:self.status reachable:self.reachable hasPrompted:self.hasPrompted provisional:self.provisional providesAppNotificationSettings:self.providesAppNotificationSettings];
+    return [[OSPermissionState alloc] initWithPermission:self.reachable];
 }
 
 - (NSString*)description {
@@ -181,40 +174,18 @@ - (NSString*)description {
 
 @implementation OSPermissionState
 
-- (instancetype)initWithStatus:(OSNotificationPermission)status reachable:(BOOL)reachable hasPrompted:(BOOL)hasPrompted provisional:(BOOL)provisional providesAppNotificationSettings:(BOOL)providesAppNotificationSettings {
-    _status = status;
-    _reachable = reachable;
-    _hasPrompted = hasPrompted;
-    _providesAppNotificationSettings = providesAppNotificationSettings;
-    _provisional = provisional;
+- (instancetype)initWithPermission:(BOOL)permission {
+    _permission = permission;
     return self;
 }
 
-- (NSString*)statusAsString {
-    switch(self.status) {
-        case OSNotificationPermissionNotDetermined:
-            return @"NotDetermined";
-        case OSNotificationPermissionAuthorized:
-            return @"Authorized";
-        case OSNotificationPermissionDenied:
-            return @"Denied";
-        case OSNotificationPermissionProvisional:
-            return @"Provisional";
-        case OSNotificationPermissionEphemeral:
-            return @"Ephemeral";
-    }
-    return @"NotDetermined";
-}
-
 - (NSString*)description {
-    static NSString* format = @"<OSPermissionState: hasPrompted: %d, status: %@, provisional: %d>";
-    return [NSString stringWithFormat:format, self.hasPrompted, self.statusAsString, self.provisional];
+    static NSString* format = @"<OSPermissionState: permission: %d>";
+    return [NSString stringWithFormat:format, self.permission];
 }
 
 - (NSDictionary*)jsonRepresentation {
-    return @{@"hasPrompted": @(self.hasPrompted),
-             @"status": @(self.status),
-             @"provisional" : @(self.provisional)};
+    return @{@"permission": @(self.permission)};
 }
 
 @end
@@ -227,9 +198,12 @@ - (void)onChanged:(OSPermissionStateInternal*)state {
 + (void)fireChangesObserver:(OSPermissionStateInternal*)state  {
     OSPermissionState *externalToState = [state getExternalState];
     OSPermissionState *externalFromState = [OSNotificationsManager.lastPermissionState getExternalState];
-    OSPermissionStateChanges* stateChanges = [[OSPermissionStateChanges alloc] initAsTo:externalToState from:externalFromState];
 
-    BOOL hasReceiver = [OSNotificationsManager.permissionStateChangesObserver notifyChange:stateChanges];
+    if (externalToState.permission == externalFromState.permission) {
+        return;
+    }
+    
+    BOOL hasReceiver = [OSNotificationsManager.permissionStateChangesObserver notifyChange:externalToState];
     if (hasReceiver) {
         OSNotificationsManager.lastPermissionState = [state copy];
         [OSNotificationsManager.lastPermissionState persistAsFrom];
@@ -242,22 +216,3 @@ + (void)fireChangesObserver:(OSPermissionStateInternal*)state  {
 }
 
 @end
-
-@implementation OSPermissionStateChanges
-
-- (NSString*)description {
-    static NSString* format = @"<OSPermissionStateChanges:\nfrom: %@,\nto:   %@\n>";
-    return [NSString stringWithFormat:format, _from, _to];
-}
-
-- (NSDictionary*)jsonRepresentation {
-    return @{@"from": [_from jsonRepresentation], @"to": [_to jsonRepresentation]};
-}
-
-- (instancetype)initAsTo:(OSPermissionState *)to from:(OSPermissionState *)from {
-    _to = to;
-    _from = from;
-    return self;
-}
-
-@end

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -121,15 +121,6 @@ + (DelayedConsentInitializationParameters *)delayedInitParameters {
 // Set when the app is launched
 static NSDate *sessionLaunchTime;
 
-// static property def to add developer's OSPermissionStateChanges observers to.
-static ObservablePermissionStateChangesType* _permissionStateChangesObserver;
-+ (ObservablePermissionStateChangesType*)permissionStateChangesObserver {
-    if (!_permissionStateChangesObserver)
-        _permissionStateChangesObserver = [[OSObservable alloc] initWithChangeSelector:@selector(onOSPermissionChanged:)];
-    return _permissionStateChangesObserver;
-}
-
-
 /*
  Indicates if the iOS params request has started
  Set to true when the method is called and set false if the request's failure callback is triggered
@@ -198,9 +189,7 @@ + (void)clearStatics {
 
     [OSNotificationsManager clearStatics];
     registeredWithApple = false;
-    
-    _permissionStateChangesObserver = nil;
-    
+        
     _downloadedParameters = false;
     _didCallDownloadParameters = false;