Update push subscription observer event name

Author: emawby

android/src/main/java/com/onesignal/flutter/OneSignalPushSubscription.java

@@ -23,7 +23,7 @@
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, ISubscriptionChangedHandler {
+public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, IPushSubscriptionObserver {
 
     static void registerWith(BinaryMessenger messenger) {
         OneSignalPushSubscription controller = new OneSignalPushSubscription();
@@ -60,16 +60,12 @@ private void optOut(MethodCall call, Result reply) {
     }
 
     private void lifecycleInit() {
-        OneSignal.getUser().getPushSubscription().addChangeHandler(this);
+        OneSignal.getUser().getPushSubscription().addObserver(this);
     }  
 
     @Override
-    public void onSubscriptionChanged(ISubscription subscription) { 
-    if (!(subscription instanceof IPushSubscription)){
-        return;
-    }
-        IPushSubscription pushSubscription = (IPushSubscription) subscription;
-        invokeMethodOnUiThread("OneSignal#pushSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
+    public void onPushSubscriptionChange(PushSubscriptionChangedState changeState) { 
+        invokeMethodOnUiThread("OneSignal#onPushSubscriptionChange", OneSignalSerializer.convertOnPushSubscriptionChange(changeState));
     }
 
 } 

android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java

@@ -158,7 +158,7 @@ static HashMap<String, Object> convertInAppMessageToMap(IInAppMessage message) {
         return hash;
     }
 
-    static HashMap<String, Object> convertOnSubscriptionChanged(IPushSubscription state) {
+    static HashMap<String, Object> convertPushSubscriptionState(PushSubscriptionState state) {
         HashMap<String, Object> hash = new HashMap<>();
 
 
@@ -169,6 +169,16 @@ static HashMap<String, Object> convertOnSubscriptionChanged(IPushSubscription st
         return hash;
     }
 
+    static HashMap<String, Object> convertOnPushSubscriptionChange(PushSubscriptionChangedState changedState) {
+        HashMap<String, Object> hash = new HashMap<>();
+        
+
+        hash.put("current", convertPushSubscriptionState(changedState.getCurrent()));
+        hash.put("previous", convertPushSubscriptionState(changedState.getPrevious()));
+
+        return hash;
+    }
+
 
     static HashMap<String, Object> convertJSONObjectToHashMap(JSONObject object) throws JSONException {
         HashMap<String, Object> hash = new HashMap<>();

example/lib/main.dart

@@ -39,7 +39,7 @@ class _MyAppState extends State<MyApp>
   Future<void> initPlatformState() async {
     if (!mounted) return;
 
-    OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
+    OneSignal.Debug.setLogLevel(OSLogLevel.none);
 
     OneSignal.Debug.setAlertLevel(OSLogLevel.none);
     OneSignal.shared.consentRequired(_requireConsent);
@@ -82,11 +82,11 @@ class _MyAppState extends State<MyApp>
     print("Has permission " + state.toString());
   }
 
-  void onOSPushSubscriptionChangedWithState(OSPushSubscriptionState state) {
+  void onOSPushSubscriptionChange(OSPushSubscriptionChangedState state) {
     print(OneSignal.User.pushSubscription.optedIn);
     print(OneSignal.User.pushSubscription.id);
     print(OneSignal.User.pushSubscription.token);
-    print(state.jsonRepresentation());
+    print(state.current.jsonRepresentation());
   }
 
   void onClickInAppMessage(OSInAppMessageClickEvent event) {
@@ -244,7 +244,7 @@ class _MyAppState extends State<MyApp>
     OneSignal.InAppMessages.removeTriggers(keys);
 
     // Toggle pausing (displaying or not) of IAMs
-    OneSignal.InAppMessages.paused(false);
+    OneSignal.InAppMessages.paused(true);
     var arePaused = await OneSignal.InAppMessages.arePaused();
     print('Notifications paused ${arePaused}');
   }

ios/Classes/OSFlutterPushSubscription.m

@@ -74,8 +74,8 @@ - (void)lifecycleInit:(FlutterMethodCall *)call withResult:(FlutterResult)result
     result(nil);
 }
 
-- (void)onOSPushSubscriptionChangedWithStateChanges:(OSPushSubscriptionStateChanges*)stateChanges {
-    [self.channel invokeMethod:@"OneSignal#pushSubscriptionChanged" arguments:stateChanges.to.jsonRepresentation];
+- (void)onPushSubscriptionDidChangeWithState:(OSPushSubscriptionChangedState *)state {
+    [self.channel invokeMethod:@"OneSignal#onPushSubscriptionChange" arguments:state.jsonRepresentation];
 }
 
 @end

lib/src/pushsubscription.dart

@@ -67,27 +67,26 @@ class OneSignalPushSubscription {
 
   // Private function that gets called by ObjC/Java
   Future<Null> _handleMethod(MethodCall call) async {
-    if (call.method == 'OneSignal#pushSubscriptionChanged') {
-      this._onSubscriptionChangedHandler(
-          OSPushSubscriptionState(call.arguments.cast<String, dynamic>()));
+    if (call.method == 'OneSignal#onPushSubscriptionChange') {
+      this._onPushSubscriptionChange(OSPushSubscriptionChangedState(
+          call.arguments.cast<String, dynamic>()));
     }
     return null;
   }
 
-  void _onSubscriptionChangedHandler(
-      OSPushSubscriptionState stateChanges) async {
-    print(stateChanges.jsonRepresentation());
-    this._id = stateChanges.id;
-    this._token = stateChanges.token;
-    this._optedIn = stateChanges.optedIn;
+  void _onPushSubscriptionChange(
+      OSPushSubscriptionChangedState stateChanges) async {
+    this._id = stateChanges.current.id;
+    this._token = stateChanges.current.token;
+    this._optedIn = stateChanges.current.optedIn;
 
     for (var observer in _observers) {
-      observer.onOSPushSubscriptionChangedWithState(stateChanges);
+      observer.onOSPushSubscriptionChange(stateChanges);
     }
   }
 }
 
 class OneSignalPushSubscriptionObserver {
-  void onOSPushSubscriptionChangedWithState(
-      OSPushSubscriptionState stateChanges) {}
+  void onOSPushSubscriptionChange(
+      OSPushSubscriptionChangedState stateChanges) {}
 }

lib/src/subscription.dart

@@ -24,21 +24,23 @@ class OSPushSubscriptionState extends JSONStringRepresentable {
 /// An instance of this class describes a change in the user's OneSignal
 /// push notification subscription state, ie. the user subscribed to
 /// push notifications with your app.
-class OSPushSubscriptionStateChanges extends JSONStringRepresentable {
-  late OSPushSubscriptionState from;
-  late OSPushSubscriptionState to;
-
-  OSPushSubscriptionStateChanges(Map<String, dynamic> json) {
-    if (json.containsKey('from'))
-      this.from = OSPushSubscriptionState(json['from'].cast<String, dynamic>());
-    if (json.containsKey('to'))
-      this.to = OSPushSubscriptionState(json['to'].cast<String, dynamic>());
+class OSPushSubscriptionChangedState extends JSONStringRepresentable {
+  late OSPushSubscriptionState current;
+  late OSPushSubscriptionState previous;
+
+  OSPushSubscriptionChangedState(Map<String, dynamic> json) {
+    if (json.containsKey('current'))
+      this.current =
+          OSPushSubscriptionState(json['current'].cast<String, dynamic>());
+    if (json.containsKey('previous'))
+      this.previous =
+          OSPushSubscriptionState(json['previous'].cast<String, dynamic>());
   }
 
   String jsonRepresentation() {
     return convertToJsonString(<String, dynamic>{
-      'from': from.jsonRepresentation(),
-      'to': to.jsonRepresentation()
+      'current': current.jsonRepresentation(),
+      'previous': previous.jsonRepresentation()
     });
   }
 }