react-native-notify-kit 10.9.0 → 10.10.0

package/android/src/main/java/app/notifee/core/NotificationPendingIntent.java

@@ -29,6 +29,14 @@ import java.util.UUID;
 public class NotificationPendingIntent {
   public static final String EVENT_TYPE_INTENT_KEY = "notifee_event_type";
   public static final String NOTIFICATION_ID_INTENT_KEY = "notification_id";
+
+  /**
+   * Random id shared by the Intents of one PendingIntent, or issued for a full-screen Intent, so a
+   * launch Intent can be matched with the interactions recorded by {@link
+   * InitialNotificationLedger}.
+   */
+  static final String PENDING_INTENT_ID_INTENT_KEY = "notifee_pending_intent_id";
+
   private static final String TAG = "NotificationPendingIntent";
 
   /**
@@ -74,6 +82,12 @@ public class NotificationPendingIntent {
     setIntentExtras(launchActivityIntent, eventType, notificationId, extraKeys, extraBundles);
     setIntentExtras(receiverIntent, eventType, notificationId, extraKeys, extraBundles);
 
+    String pendingIntentId = UUID.randomUUID().toString();
+    if (launchActivityIntent != null) {
+      launchActivityIntent.putExtra(PENDING_INTENT_ID_INTENT_KEY, pendingIntentId);
+    }
+    receiverIntent.putExtra(PENDING_INTENT_ID_INTENT_KEY, pendingIntentId);
+
     // Create pending intent with activities
     int uniqueInt = UUID.randomUUID().hashCode();
     Intent[] intents;

package/android/src/main/java/app/notifee/core/NotificationReceiverHandler.java

@@ -19,6 +19,7 @@ package app.notifee.core;
 
 import static app.notifee.core.NotificationPendingIntent.EVENT_TYPE_INTENT_KEY;
 import static app.notifee.core.NotificationPendingIntent.NOTIFICATION_ID_INTENT_KEY;
+import static app.notifee.core.NotificationPendingIntent.PENDING_INTENT_ID_INTENT_KEY;
 import static app.notifee.core.event.NotificationEvent.TYPE_ACTION_PRESS;
 import static app.notifee.core.event.NotificationEvent.TYPE_PRESS;
 
@@ -98,7 +99,11 @@ public class NotificationReceiverHandler {
     }
 
     InitialNotificationEvent initialNotificationEvent =
-        new InitialNotificationEvent(notificationModel, extras);
+        new InitialNotificationEvent(
+            notificationModel,
+            extras,
+            InitialNotificationLedger.recordTap(
+                intent.getStringExtra(PENDING_INTENT_ID_INTENT_KEY)));
     EventBus.postSticky(initialNotificationEvent);
 
     // Send event
@@ -127,7 +132,11 @@ public class NotificationReceiverHandler {
     EventBus.post(new NotificationEvent(TYPE_PRESS, notificationModel, extras));
 
     InitialNotificationEvent initialNotificationEvent =
-        new InitialNotificationEvent(notificationModel, extras);
+        new InitialNotificationEvent(
+            notificationModel,
+            extras,
+            InitialNotificationLedger.recordTap(
+                intent.getStringExtra(PENDING_INTENT_ID_INTENT_KEY)));
     EventBus.postSticky(initialNotificationEvent);
 
     if (pressActionBundle == null) {

package/android/src/main/java/app/notifee/core/event/InitialNotificationEvent.java

@@ -26,10 +26,21 @@ public class InitialNotificationEvent {
 
   private NotificationModel notificationModel;
   private Bundle extras;
+  private long tapSequence;
 
   public InitialNotificationEvent(NotificationModel notificationModel, Bundle extras) {
+    this(notificationModel, extras, 0);
+  }
+
+  /**
+   * @param tapSequence sequence number recorded for the tap that produced this event, or 0 when the
+   *     tap is not tracked.
+   */
+  public InitialNotificationEvent(
+      NotificationModel notificationModel, Bundle extras, long tapSequence) {
     this.notificationModel = notificationModel;
     this.extras = extras;
+    this.tapSequence = tapSequence;
   }
 
   public NotificationModel getNotificationModel() {
@@ -40,6 +51,10 @@ public class InitialNotificationEvent {
     return extras;
   }
 
+  public long getTapSequence() {
+    return tapSequence;
+  }
+
   public Map<String, Object> toMap() {
     Map<String, Object> initialNotificationEventMap = new HashMap<>();
     initialNotificationEventMap.put("notificationModel", notificationModel.toBundle());

package/android/src/main/kotlin/io/invertase/notifee/NotifeeApiModule.kt

@@ -233,6 +233,29 @@ class NotifeeApiModule(reactContext: ReactApplicationContext) :
             }
     }
 
+    override fun shouldShowRequestPermissionRationale(promise: Promise) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
+            promise.resolve(false)
+            return
+        }
+
+        try {
+            val activity = getReactApplicationContext().getCurrentActivity()
+            if (activity == null) {
+                promise.reject(
+                    "ERR_NO_ACTIVITY",
+                    "A current Activity is required to query notification permission rationale.",
+                )
+                return
+            }
+            promise.resolve(
+                activity.shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS),
+            )
+        } catch (e: Exception) {
+            promise.reject(e)
+        }
+    }
+
     override fun requestPermission(permissions: ReadableMap, promise: Promise) {
         // permissions parameter is ignored on Android — only used by iOS
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {