Push Subscription Observer - API update

* Rename OSPushSubscriptionStateChanges to OSPushSubscriptionChangedState
* Rename event from onOSPushSubscriptionChanged to onPushSubscriptionDidChange
* Use current and previous instead of to and from
* No other logic changes, only naming

Author: nan-li

iOS_SDK/OneSignalDevApp/OneSignalDevApp/AppDelegate.m

@@ -117,10 +117,10 @@ - (void)onNotificationPermissionDidChange:(BOOL)permission {
     NSLog(@"Dev App onNotificationPermissionDidChange: %d", permission);
 }
 
-- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges *)stateChanges {
-    NSLog(@"Dev App onOSPushSubscriptionChangedWithStateChanges: %@", stateChanges);
+- (void)onPushSubscriptionDidChangeWithState:(OSPushSubscriptionChangedState *)state {
+    NSLog(@"Dev App onPushSubscriptionDidChange: %@", state);
     ViewController* mainController = (ViewController*) self.window.rootViewController;
-    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) stateChanges.to.optedIn;
+    mainController.subscriptionSegmentedControl.selectedSegmentIndex = (NSInteger) state.current.optedIn;
 }
 
 #pragma mark OSInAppMessageDelegate

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OSSubscriptionModel.swift

@@ -33,7 +33,7 @@ import OneSignalNotifications
 // MARK: - Push Subscription Specific
 
 @objc public protocol OSPushSubscriptionObserver { // TODO: weak reference?
-    @objc func onOSPushSubscriptionChanged(stateChanges: OSPushSubscriptionStateChanges)
+    @objc func onPushSubscriptionDidChange(state: OSPushSubscriptionChangedState)
 }
 
 @objc
@@ -68,21 +68,21 @@ public class OSPushSubscriptionState: NSObject {
 }
 
 @objc
-public class OSPushSubscriptionStateChanges: NSObject {
-    @objc public let to: OSPushSubscriptionState
-    @objc public let from: OSPushSubscriptionState
+public class OSPushSubscriptionChangedState: NSObject {
+    @objc public let current: OSPushSubscriptionState
+    @objc public let previous: OSPushSubscriptionState
 
     @objc public override var description: String {
-        return "<OSPushSubscriptionStateChanges:\nfrom: \(self.from),\nto:   \(self.to)\n>"
+        return "<OSPushSubscriptionChangedState:\nprevious: \(self.previous),\ncurrent:   \(self.current)\n>"
     }
 
-    init(to: OSPushSubscriptionState, from: OSPushSubscriptionState) {
-        self.to = to
-        self.from = from
+    init(current: OSPushSubscriptionState, previous: OSPushSubscriptionState) {
+        self.current = current
+        self.previous = previous
     }
 
     @objc public func jsonRepresentation() -> NSDictionary {
-        return ["from": from.jsonRepresentation(), "to": to.jsonRepresentation()]
+        return ["from": previous.jsonRepresentation(), "to": current.jsonRepresentation()]
     }
 }
 
@@ -368,7 +368,7 @@ extension OSSubscriptionModel {
             return
         }
 
-        let stateChanges = OSPushSubscriptionStateChanges(to: newSubscriptionState, from: prevSubscriptionState)
+        let stateChanges = OSPushSubscriptionChangedState(current: newSubscriptionState, previous: prevSubscriptionState)
 
         // TODO: Don't fire observer until server is udated
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "firePushSubscriptionChanged from \(prevSubscriptionState.jsonRepresentation()) to \(newSubscriptionState.jsonRepresentation())")

iOS_SDK/OneSignalSDK/OneSignalUser/Source/OneSignalUserManagerImpl.swift

@@ -133,12 +133,12 @@ public class OneSignalUserManagerImpl: NSObject, OneSignalUserManager {
     @objc public var requiresUserAuth = false
 
     // Push Subscription
-    private var _pushSubscriptionStateChangesObserver: OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>?
-    var pushSubscriptionStateChangesObserver: OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges> {
+    private var _pushSubscriptionStateChangesObserver: OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionChangedState>?
+    var pushSubscriptionStateChangesObserver: OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionChangedState> {
         if let observer = _pushSubscriptionStateChangesObserver {
             return observer
         }
-        let pushSubscriptionStateChangesObserver = OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionStateChanges>(change: #selector(OSPushSubscriptionObserver.onOSPushSubscriptionChanged(stateChanges:)))
+        let pushSubscriptionStateChangesObserver = OSObservable<OSPushSubscriptionObserver, OSPushSubscriptionChangedState>(change: #selector(OSPushSubscriptionObserver.onPushSubscriptionDidChange(state:)))
         _pushSubscriptionStateChangesObserver = pushSubscriptionStateChangesObserver
 
         return pushSubscriptionStateChangesObserver

iOS_SDK/OneSignalSDK/Source/OSMessagingController.m

@@ -1008,22 +1008,22 @@ - (void)onApplicationDidBecomeActive {
 }
 
 #pragma mark OSPushSubscriptionObserver Methods
-- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges * _Nonnull)stateChanges {
+- (void)onPushSubscriptionDidChangeWithState:(OSPushSubscriptionChangedState * _Nonnull)state {
     // Don't pull IAMs if the new subscription ID is nil
-    if (stateChanges.to.id == nil) {
-        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onOSPushSubscriptionChangedWithStateChanges: changed to nil subscription id"];
+    if (state.current.id == nil) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onPushSubscriptionDidChange: changed to nil subscription id"];
         return;
     }
     // Don't pull IAMs if the subscription ID has not changed
-    if (stateChanges.from.id != nil &&
-        [stateChanges.to.id isEqualToString:stateChanges.from.id]) {
-        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onOSPushSubscriptionChangedWithStateChanges: changed to the same subscription id"];
+    if (state.previous.id != nil &&
+        [state.current.id isEqualToString:state.previous.id]) {
+        [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onPushSubscriptionDidChange: changed to the same subscription id"];
         return;
     }
 
     // Pull new IAMs when the subscription id changes to a new valid subscription id
-    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onOSPushSubscriptionChangedWithStateChanges: changed to new valid subscription id"];
-    [self getInAppMessagesFromServer:stateChanges.to.id];
+    [OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:@"OSMessagingController onPushSubscriptionDidChange: changed to new valid subscription id"];
+    [self getInAppMessagesFromServer:state.current.id];
 }
 
 - (void)dealloc {

iOS_SDK/OneSignalSDK/Source/OneSignalLiveActivityController.m

@@ -86,8 +86,8 @@ + (void)initialize {
     [OneSignalUserManagerImpl.sharedInstance addObserver:shared];
 }
 
-- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges * _Nonnull)stateChanges {
-    if(stateChanges.to.id){
+- (void)onPushSubscriptionDidChangeWithState:(OSPushSubscriptionChangedState * _Nonnull)state {
+    if(state.current.id){
         subscriptionId = OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId;
         [OneSignalLiveActivityController executePendingLiveActivityUpdates];
     }