fix: Added callbacks for message retrieval.

mathrunet · Aug 25, 2023 · 0c914dd · 0c914dd
1 parent 4de29a9
commit 0c914dd
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 6 deletions.
diff --git a/packages/masamune_notification_firebase/lib/adapter/push_notification_masamune_adapter.dart b/packages/masamune_notification_firebase/lib/adapter/push_notification_masamune_adapter.dart
@@ -22,6 +22,7 @@ class PushNotificationMasamuneAdapter extends MasamuneAdapter {
     this.macosOptions,
     this.linuxOptions,
     this.loggerAdapters = const [],
+    this.onLink,
   }) : _options = options;
 
   /// You can retrieve the [PushNotificationMasamuneAdapter] first given by [MasamuneAdapterScope].
@@ -186,6 +187,11 @@ class PushNotificationMasamuneAdapter extends MasamuneAdapter {
   /// [pushNotification]が設定されている場合、[onMaybeBoot]を実行した際合わせてトピックの購読を行う際のトピックリストを指定します。
   final List<String> subscribeOnBoot;
 
+  /// Callback when the URL is launched.
+  ///
+  /// URLが起動されたときのコールバック。
+  final FutureOr<void> Function(Uri link)? onLink;
+
   @override
   void onInitScope(MasamuneAdapter adapter) {
     super.onInitScope(adapter);

diff --git a/packages/masamune_notification_firebase/lib/src/push_notification.dart b/packages/masamune_notification_firebase/lib/src/push_notification.dart
@@ -79,6 +79,8 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
     return FirebaseMessaging.instance;
   }
 
+  static const String _linkKey = "@link";
+
   @override
   void dispose() {
     super.dispose();
@@ -131,7 +133,6 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
     }
     _completer = Completer();
     try {
-      final adapter = primaryAdapter;
       await FirebaseCore.initialize(options: adapter.options);
       await _messaging.setAutoInitEnabled(true);
       _onMessageSubscription = FirebaseMessaging.onMessage.listen(_onMessage);
@@ -197,6 +198,7 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
     String? channel,
     DynamicMap? data,
     required String target,
+    Uri? link,
   }) async {
     await listen();
     final f = adapter.functions ?? Functions();
@@ -206,7 +208,10 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
         text: text,
         target: target,
         channel: adapter.androidNotificationChannelId,
-        data: data,
+        data: {
+          if (data != null) ...data,
+          if (link != null) _linkKey: link.path,
+        },
       ),
     );
     _sendLog(PushNotificationLoggerEvent.send, parameters: {
@@ -261,6 +266,12 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
       target: message.from ?? "",
       whenAppOpened: false,
     );
+    if (adapter.onLink != null && data.containsKey(_linkKey)) {
+      final uri = data.get(_linkKey, "").toUri();
+      if (uri != null) {
+        await adapter.onLink?.call(uri);
+      }
+    }
     _sendLog(PushNotificationLoggerEvent.receive, parameters: {
       PushNotificationLoggerEvent.titleKey: message.notification?.title ?? "",
       PushNotificationLoggerEvent.bodyKey: message.notification?.body ?? "",
@@ -278,6 +289,12 @@ class PushNotification extends MasamuneControllerBase<PushNotificationValue,
       target: message.from ?? "",
       whenAppOpened: true,
     );
+    if (adapter.onLink != null && data.containsKey(_linkKey)) {
+      final uri = data.get(_linkKey, "").toUri();
+      if (uri != null) {
+        await adapter.onLink?.call(uri);
+      }
+    }
     _sendLog(PushNotificationLoggerEvent.receive, parameters: {
       PushNotificationLoggerEvent.titleKey: message.notification?.title ?? "",
       PushNotificationLoggerEvent.bodyKey: message.notification?.body ?? "",

diff --git a/packages/masamune_notification_firebase/pubspec.lock b/packages/masamune_notification_firebase/pubspec.lock
@@ -387,7 +387,7 @@ packages:
       path: "../katana_form"
       relative: true
     source: path
-    version: "2.7.5"
+    version: "2.7.6"
   katana_functions:
     dependency: "direct overridden"
     description:
@@ -471,14 +471,14 @@ packages:
       path: "../katana_router"
       relative: true
     source: path
-    version: "2.0.33"
+    version: "2.0.34"
   katana_router_annotation:
     dependency: "direct overridden"
     description:
       path: "../katana_router_annotation"
       relative: true
     source: path
-    version: "2.0.18"
+    version: "2.0.19"
   katana_scoped:
     dependency: "direct overridden"
     description:
@@ -543,7 +543,7 @@ packages:
       path: "../masamune"
       relative: true
     source: path
-    version: "2.4.40"
+    version: "2.4.41"
   masamune_annotation:
     dependency: "direct overridden"
     description: