cleaning up otification result and action types

Author: fhboswell

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

@@ -14,7 +14,7 @@
 
 abstract class FlutterRegistrarResponder {
    Context context;
-   MethodChannel channel;
+   protected MethodChannel channel;
    BinaryMessenger messenger;
 
    /**
@@ -69,7 +69,7 @@ private void runOnMainThread(final Runnable runnable) {
    }
 
    void invokeMethodOnUiThread(final String methodName, final HashMap map) {
-      final MethodChannel channel = this.channel;
+      //final MethodChannel channel = this.channel;
       runOnMainThread(new Runnable() {
          @Override
          public void run() {

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

@@ -37,7 +37,7 @@
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
 public class OneSignalNotifications extends FlutterRegistrarResponder implements MethodCallHandler, INotificationClickHandler, INotificationWillShowInForegroundHandler, IPermissionChangedHandler {
-    private MethodChannel channel;
+    // private MethodChannel channel;
 
     private boolean hasSetNotificationWillShowInForegroundHandler = false;
     private final HashMap<String, INotificationReceivedEvent> notificationReceivedEventCache = new HashMap<>();
@@ -128,12 +128,23 @@ private void completeNotification(MethodCall call, final Result reply) {
     @Override
     public void notificationClicked(INotificationClickResult result) {
         try {
-            invokeMethodOnUiThread("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickedResultToMap(result));
+            invokeMethodOnUiThread("OneSignal#handleOpenedNotification", OneSignalSerializer.convertNotificationClickResultToMap(result));
         } catch (JSONException e) {
-        e.getStackTrace();
-        // OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
-        //         "Encountered an error attempting to convert OSNotificationOpenResult object to hash map: " + e.getMessage());
+            e.getStackTrace();
+            android.util.Log.w("TestHenryTest ", e.toString());
+        }
+    }
+
+    private JSONObject getJsonFromMap(Map<String, Object> map) throws JSONException {
+        JSONObject jsonData = new JSONObject();
+        for (String key : map.keySet()) {
+            Object value = map.get(key);
+            if (value instanceof Map<?, ?>) {
+                value = getJsonFromMap((Map<String, Object>) value);
+            }
+            jsonData.put(key, value);
         }
+        return jsonData;
     }
 
     @Override
@@ -148,12 +159,9 @@ public void notificationWillShowInForeground(INotificationReceivedEvent notifica
 
         try {
             HashMap<String, Object>  receivedMap = OneSignalSerializer.convertNotificationToMap(notification);
-            
             invokeMethodOnUiThread("OneSignal#handleNotificationWillShowInForeground", receivedMap);
         } catch (JSONException e) {
             e.getStackTrace();
-            // OneSignal.onesignalLog(OneSignal.LOG_LEVEL.ERROR,
-            //         "Encountered an error attempting to convert OSNotificationReceivedEvent object to hash map: " + e.getMessage());
         }
     }
 

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

@@ -21,7 +21,7 @@
 import io.flutter.plugin.common.PluginRegistry;
 import io.flutter.plugin.common.PluginRegistry.Registrar;
 
-public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler {
+public class OneSignalPushSubscription extends FlutterRegistrarResponder implements MethodCallHandler, ISubscriptionChangedHandler {
     private MethodChannel channel;
 
     static void registerWith(BinaryMessenger messenger) {
@@ -59,18 +59,16 @@ private void optOut(MethodCall call, Result reply) {
     }
 
     public void lifecycleInit() {
-        OneSignal.getUser().getPushSubscription().addChangeHandler(new ISubscriptionChangedHandler() {
-            @Override
-            public void onSubscriptionChanged(ISubscription subscription) { 
-                if (!(subscription instanceof IPushSubscription)){
-                    return;
-                  }
-                  IPushSubscription pushSubscription = (IPushSubscription) subscription;
-                  invokeMethodOnUiThread("OneSignal#onSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
-            }
+        OneSignal.getUser().getPushSubscription().addChangeHandler(this);
+    }  
 
-        });
+    @Override
+    public void onSubscriptionChanged(ISubscription subscription) { 
+    if (!(subscription instanceof IPushSubscription)){
+        return;
+        }
+        IPushSubscription pushSubscription = (IPushSubscription) subscription;
+        invokeMethodOnUiThread("OneSignal#onSubscriptionChanged", OneSignalSerializer.convertOnSubscriptionChanged(pushSubscription));
     }
 
-    
 } 

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

@@ -9,9 +9,10 @@
 import com.onesignal.inAppMessages.IInAppMessageClickResult;
 
 import com.onesignal.notifications.INotification;
+
+import com.onesignal.notifications.INotificationAction;
  import com.onesignal.notifications.INotificationClickResult;
  import com.onesignal.notifications.INotificationReceivedEvent;
- import com.onesignal.notifications.INotificationReceivedEvent;
 
 import org.json.JSONArray;
 import org.json.JSONException;
@@ -36,7 +37,6 @@ static HashMap<String, Object> convertNotificationToMap(INotification notificati
             hash.put("groupedNotifications", notification.getGroupedNotifications());
         }
 
-
         hash.put("notificationId", notification.getNotificationId());
         hash.put("title", notification.getTitle());
 
@@ -76,14 +76,29 @@ static HashMap<String, Object> convertNotificationToMap(INotification notificati
         return hash;
     }
 
-    static HashMap<String, Object> convertNotificationClickedResultToMap(INotificationClickResult openResult) throws JSONException {
+    static HashMap<String, Object> convertNotificationClickResultToMap(INotificationClickResult openResult) throws JSONException {
+        HashMap<String, Object> hash = new HashMap<>();
+
+        hash.put("notification", convertNotificationToMap(openResult.getNotification()));
+        hash.put("action", convertNotificationActionToMap(openResult.getAction()));
+
+        return hash;
+    }
+
+    
+    private static HashMap<String, Object> convertNotificationActionToMap(INotificationAction action) {
         HashMap<String, Object> hash = new HashMap<>();
 
-        hash.put("actionId", openResult.getAction().getActionId());
-        hash.put("type", openResult.getAction().getType());
-        hash.put("title", openResult.getNotification().getTitle());
-        hash.put("message", openResult.getNotification().getBody());
-        hash.put("additionalData", openResult.getNotification().getAdditionalData());
+        hash.put("id", action.getActionId());
+
+        switch (action.getType()) {
+            case Opened:
+                hash.put("type", 0);
+                break;
+            case ActionTaken:
+                hash.put("type", 1);
+        }
+
         return hash;
     }
 

example/lib/main.dart

@@ -32,7 +32,7 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
   Future<void> initPlatformState() async {
     if (!mounted) return;
 
-    OneSignal.Debug.setLogLevel(OSLogLevel.debug);
+    OneSignal.Debug.setLogLevel(OSLogLevel.none);
 
     OneSignal.Debug.setAlertLevel(OSLogLevel.none);
 
@@ -44,7 +44,7 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
     // Outcome Examples
     //oneSignalOutcomeExamples();
     //OneSignal.shared.logout();
-    OneSignal.shared.login("Henry987656778");
+    OneSignal.shared.login("Henry11111111");
 
     // OneSignal.shared.setRequiresUserPrivacyConsent(_requireConsent);
 
@@ -59,7 +59,8 @@ class _MyAppState extends State<MyApp> with OneSignalPushSubscriptionObserver {
 
     OneSignal.Notifications.setNotificationWillShowInForegroundHandler(
         (OSNotificationReceivedEvent event) {
-      print('FOREGROUND HANDLER CALLED WITH: ${event}');
+      print(
+          'FOREGROUND HANDLER CALLED WITH1: ${event.notification.jsonRepresentation()}');
 
       /// Display Notification, send null to not display
       event.complete(null);

lib/src/notification.dart

@@ -9,7 +9,6 @@ import 'dart:convert';
 /// parameters (such as whether the notification was `shown`
 /// to the user, whether it's `silent`, etc.)
 class OSNotification extends JSONStringRepresentable {
-
   /// The OneSignal notification ID for this notification
   late String notificationId;
 
@@ -188,8 +187,7 @@ class OSNotification extends JSONStringRepresentable {
       this.mutableContent = json['mutableContent'] as bool?;
     if (json.containsKey('category'))
       this.category = json['category'] as String?;
-    if (json.containsKey('badge')) 
-      this.badge = json['badge'] as int?;
+    if (json.containsKey('badge')) this.badge = json['badge'] as int?;
     if (json.containsKey('badgeIncrement'))
       this.badgeIncrement = json['badgeIncrement'] as int?;
     if (json.containsKey('subtitle'))
@@ -222,8 +220,7 @@ class OSNotification extends JSONStringRepresentable {
       this.fromProjectNumber = json['fromProjectNumber'] as String?;
     if (json.containsKey("collapseId"))
       this.collapseId = json['collapseId'] as String?;
-    if (json.containsKey("priority")) 
-      this.priority = json['priority'] as int?;
+    if (json.containsKey("priority")) this.priority = json['priority'] as int?;
     if (json.containsKey("androidNotificationId"))
       this.androidNotificationId = json['androidNotificationId'] as int?;
     if (json.containsKey('backgroundImageLayout')) {
@@ -232,24 +229,23 @@ class OSNotification extends JSONStringRepresentable {
     }
     if (json.containsKey('groupedNotifications')) {
       final dynamic jsonGroupedNotifications = json['groupedNotifications'];
-      final jsonList = jsonDecode(jsonGroupedNotifications.toString()) as List<dynamic>;
-      this.groupedNotifications = jsonList.map((dynamic item) =>
-          OSNotification(item as Map<String, dynamic>)).toList();
+      final jsonList =
+          jsonDecode(jsonGroupedNotifications.toString()) as List<dynamic>;
+      this.groupedNotifications = jsonList
+          .map((dynamic item) => OSNotification(item as Map<String, dynamic>))
+          .toList();
     }
-    
+
     // shared parameters
     this.notificationId = json['notificationId'] as String;
 
     if (json.containsKey('templateName'))
       this.templateName = json['templateName'] as String?;
     if (json.containsKey('templateId'))
       this.templateId = json['templateId'] as String?;
-    if (json.containsKey('sound')) 
-      this.sound = json['sound'] as String?;
-    if (json.containsKey('title'))
-      this.title = json['title'] as String?;
-    if (json.containsKey('body')) 
-      this.body = json['body'] as String?;
+    if (json.containsKey('sound')) this.sound = json['sound'] as String?;
+    if (json.containsKey('title')) this.title = json['title'] as String?;
+    if (json.containsKey('body')) this.body = json['body'] as String?;
     if (json.containsKey('launchUrl'))
       this.launchUrl = json['launchUrl'] as String?;
     if (json.containsKey('additionalData'))
@@ -382,25 +378,26 @@ class OSAndroidBackgroundImageLayout extends JSONStringRepresentable {
 }
 
 class OSNotificationReceivedEvent extends JSONStringRepresentable {
-
   late OSNotification notification;
 
   OSNotificationReceivedEvent(Map<String, dynamic> json) {
     notification = OSNotification(json);
   }
 
   void complete(OSNotification? notification) {
-    print('OSNotificationReceivedEvent complete with notification: $notification');
+    print(
+        'OSNotificationReceivedEvent complete with notification: $notification');
     if (notification != null) {
-        OneSignal.Notifications.completeNotification(notification.notificationId, true);
+      OneSignal.Notifications.completeNotification(
+          notification.notificationId, true);
     } else {
-        OneSignal.Notifications.completeNotification(this.notification.notificationId, false);
+      OneSignal.Notifications.completeNotification(
+          this.notification.notificationId, false);
     }
   }
 
   String jsonRepresentation() {
-    return convertToJsonString({
-      'notification': this.notification.jsonRepresentation()
-    });
+    return convertToJsonString(
+        {'notification': this.notification.jsonRepresentation()});
   }
-}
+}