feat: Allow attaching arbitrary data to the notification

packages/moxplatform_android/android/src/main/java/me/polynom/moxplatform_android/Api.java

@@ -387,6 +387,17 @@ public class Api {
       this.messages = setterArg;
     }
 
+    /** Additional data to include. */
+    private @Nullable Map<String, String> extra;
+
+    public @Nullable Map<String, String> getExtra() {
+      return extra;
+    }
+
+    public void setExtra(@Nullable Map<String, String> setterArg) {
+      this.extra = setterArg;
+    }
+
     /** Constructor is non-public to enforce null safety; use Builder. */
     MessagingNotification() {}
 
@@ -427,6 +438,13 @@ public class Api {
         return this;
       }
 
+      private @Nullable Map<String, String> extra;
+
+      public @NonNull Builder setExtra(@Nullable Map<String, String> setterArg) {
+        this.extra = setterArg;
+        return this;
+      }
+
       public @NonNull MessagingNotification build() {
         MessagingNotification pigeonReturn = new MessagingNotification();
         pigeonReturn.setTitle(title);
@@ -434,18 +452,20 @@ public class Api {
         pigeonReturn.setChannelId(channelId);
         pigeonReturn.setJid(jid);
         pigeonReturn.setMessages(messages);
+        pigeonReturn.setExtra(extra);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(5);
+      ArrayList<Object> toListResult = new ArrayList<Object>(6);
       toListResult.add(title);
       toListResult.add(id);
       toListResult.add(channelId);
       toListResult.add(jid);
       toListResult.add(messages);
+      toListResult.add(extra);
       return toListResult;
     }
 
@@ -461,6 +481,8 @@ public class Api {
       pigeonResult.setJid((String) jid);
       Object messages = list.get(4);
       pigeonResult.setMessages((List<NotificationMessage>) messages);
+      Object extra = list.get(5);
+      pigeonResult.setExtra((Map<String, String>) extra);
       return pigeonResult;
     }
   }
@@ -660,6 +682,17 @@ public class Api {
       this.payload = setterArg;
     }
 
+    /** Extra data. Only set when type == NotificationType.reply. */
+    private @Nullable Map<String, String> extra;
+
+    public @Nullable Map<String, String> getExtra() {
+      return extra;
+    }
+
+    public void setExtra(@Nullable Map<String, String> setterArg) {
+      this.extra = setterArg;
+    }
+
     /** Constructor is non-public to enforce null safety; use Builder. */
     NotificationEvent() {}
 
@@ -686,21 +719,30 @@ public class Api {
         return this;
       }
 
+      private @Nullable Map<String, String> extra;
+
+      public @NonNull Builder setExtra(@Nullable Map<String, String> setterArg) {
+        this.extra = setterArg;
+        return this;
+      }
+
       public @NonNull NotificationEvent build() {
         NotificationEvent pigeonReturn = new NotificationEvent();
         pigeonReturn.setJid(jid);
         pigeonReturn.setType(type);
         pigeonReturn.setPayload(payload);
+        pigeonReturn.setExtra(extra);
         return pigeonReturn;
       }
     }
 
     @NonNull
     ArrayList<Object> toList() {
-      ArrayList<Object> toListResult = new ArrayList<Object>(3);
+      ArrayList<Object> toListResult = new ArrayList<Object>(4);
       toListResult.add(jid);
       toListResult.add(type == null ? null : type.index);
       toListResult.add(payload);
+      toListResult.add(extra);
       return toListResult;
     }
 
@@ -712,6 +754,8 @@ public class Api {
       pigeonResult.setType(type == null ? null : NotificationEventType.values()[(int) type]);
       Object payload = list.get(2);
       pigeonResult.setPayload((String) payload);
+      Object extra = list.get(3);
+      pigeonResult.setExtra((Map<String, String>) extra);
       return pigeonResult;
     }
   }

packages/moxplatform_android/android/src/main/java/me/polynom/moxplatform_android/NotificationReceiver.kt

@@ -148,11 +148,19 @@ class NotificationReceiver : BroadcastReceiver() {
     }
 
     private fun handleTap(context: Context, intent: Intent) {
+        val extras = mutableMapOf<String?, String?>()
+        intent.extras?.keySet()!!.forEach {
+            if (it.startsWith("payload_")) {
+                extras[it.substring(8)] = intent.extras!!.getString(it)
+            }
+        }
+
         MoxplatformAndroidPlugin.notificationSink?.success(
             NotificationEvent().apply {
                 jid = intent.getStringExtra(NOTIFICATION_EXTRA_JID_KEY)!!
                 type = Api.NotificationEventType.OPEN
                 payload = null
+                extra = extras
             }.toList()
         )
 

packages/moxplatform_android/android/src/main/java/me/polynom/moxplatform_android/Notifications.kt

@@ -6,6 +6,7 @@ import android.content.Context
 import android.content.Intent
 import android.graphics.BitmapFactory
 import android.graphics.Color
+import android.util.Log
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.app.Person
@@ -117,6 +118,10 @@ fun showMessagingNotification(context: Context, notification: Api.MessagingNotif
         action = TAP_ACTION
         putExtra(NOTIFICATION_EXTRA_JID_KEY, notification.jid)
         putExtra(NOTIFICATION_EXTRA_ID_KEY, notification.id)
+
+        notification.extra?.forEach {
+            putExtra("payload_${it.key}", it.value)
+        }
     }
     val tapPendingIntent = PendingIntent.getBroadcast(
         context,