react-native-notify-kit 9.3.0 → 9.5.0

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

@@ -31,6 +31,7 @@ import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Trace;
 import android.service.notification.StatusBarNotification;
 import androidx.annotation.NonNull;
 import androidx.concurrent.futures.CallbackToFutureAdapter;
@@ -103,198 +104,204 @@ class NotificationManager {
      */
     Callable<NotificationCompat.Builder> builderCallable =
         () -> {
-          Boolean hasCustomSound = false;
-          NotificationCompat.Builder builder =
-              new NotificationCompat.Builder(getApplicationContext(), androidModel.getChannelId());
-
-          // must always keep at top
-          builder.setExtras(notificationModel.getData());
-
-          builder.setDeleteIntent(
-              ReceiverService.createIntent(
-                  ReceiverService.DELETE_INTENT,
-                  new String[] {"notification"},
-                  notificationModel.toBundle()));
-          // Resolve the effective pressAction bundle for the content intent.
-          // Three cases:
-          //   1. pressAction is null (absent from bundle, e.g. trigger rehydrated from Room DB
-          //      after app kill): synthesize default { id:'default', launchActivity:'default' }
-          //      so tapping the notification opens the app (defense-in-depth for paths that
-          //      bypass the TS validator).
-          //   2. pressAction has the opt-out sentinel id: user explicitly passed
-          //      pressAction: null in JS — pass null to createIntent so no launch intent
-          //      is created (non-tappable notification).
-          //   3. pressAction is a normal bundle: pass through unchanged.
-          // Resolve the effective pressAction bundle for the content intent.
-          // Three cases:
-          //   1. pressAction is null (absent from bundle, e.g. trigger rehydrated from Room DB
-          //      after app kill): synthesize default { id:'default', launchActivity:'default' }
-          //      so tapping the notification opens the app (defense-in-depth for paths that
-          //      bypass the TS validator).
-          //   2. pressAction has the opt-out sentinel id: user explicitly passed
-          //      pressAction: null in JS — pass null to createIntent so no launch intent
-          //      is created (non-tappable notification).
-          //   3. pressAction is a normal bundle: pass through unchanged.
-          //
-          // pressActionForIntent  → used for creating the launch intent (or null for opt-out)
-          // pressActionForExtras  → used in the receiver intent extras (event payload);
-          //                         null for cases 1 & 2 to avoid leaking synthesized defaults
-          //                         or the sentinel id into the JS event.
-          Bundle pressActionForIntent = androidModel.getPressAction();
-          Bundle pressActionForExtras = pressActionForIntent;
-          if (pressActionForIntent == null) {
-            // Case 1: absent — synthesize default for launch, null for extras
-            pressActionForIntent = new Bundle();
-            pressActionForIntent.putString("id", "default");
-            pressActionForIntent.putString("launchActivity", "default");
-            // pressActionForExtras stays null: the original notification didn't have
-            // pressAction, so the event shouldn't either.
-          } else if (NotificationPendingIntent.PRESS_ACTION_OPT_OUT_ID.equals(
-              pressActionForIntent.getString("id"))) {
-            // Case 2: explicit opt-out sentinel — no launch intent, no sentinel in extras
-            pressActionForIntent = null;
-            pressActionForExtras = null;
-          }
-          // Case 3: normal pressAction — both variables point to the original bundle
-
-          int targetSdkVersion =
-              ContextHolder.getApplicationContext().getApplicationInfo().targetSdkVersion;
-          if (targetSdkVersion >= Build.VERSION_CODES.S
-              && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-            builder.setContentIntent(
-                NotificationPendingIntent.createIntent(
-                    notificationModel.getHashCode(),
-                    pressActionForIntent,
-                    TYPE_PRESS,
-                    new String[] {"notification", "pressAction"},
-                    notificationModel.toBundle(),
-                    pressActionForExtras));
-          } else {
-            builder.setContentIntent(
+          Trace.beginSection("notifee:buildNotification");
+          try {
+            Boolean hasCustomSound = false;
+            NotificationCompat.Builder builder =
+                new NotificationCompat.Builder(
+                    getApplicationContext(), androidModel.getChannelId());
+
+            // must always keep at top
+            builder.setExtras(notificationModel.getData());
+
+            builder.setDeleteIntent(
                 ReceiverService.createIntent(
-                    ReceiverService.PRESS_INTENT,
-                    new String[] {"notification", "pressAction"},
-                    notificationModel.toBundle(),
-                    pressActionForIntent));
-          }
+                    ReceiverService.DELETE_INTENT,
+                    new String[] {"notification"},
+                    notificationModel.toBundle()));
+            // Resolve the effective pressAction bundle for the content intent.
+            // Three cases:
+            //   1. pressAction is null (absent from bundle, e.g. trigger rehydrated from Room DB
+            //      after app kill): synthesize default { id:'default', launchActivity:'default' }
+            //      so tapping the notification opens the app (defense-in-depth for paths that
+            //      bypass the TS validator).
+            //   2. pressAction has the opt-out sentinel id: user explicitly passed
+            //      pressAction: null in JS — pass null to createIntent so no launch intent
+            //      is created (non-tappable notification).
+            //   3. pressAction is a normal bundle: pass through unchanged.
+            // Resolve the effective pressAction bundle for the content intent.
+            // Three cases:
+            //   1. pressAction is null (absent from bundle, e.g. trigger rehydrated from Room DB
+            //      after app kill): synthesize default { id:'default', launchActivity:'default' }
+            //      so tapping the notification opens the app (defense-in-depth for paths that
+            //      bypass the TS validator).
+            //   2. pressAction has the opt-out sentinel id: user explicitly passed
+            //      pressAction: null in JS — pass null to createIntent so no launch intent
+            //      is created (non-tappable notification).
+            //   3. pressAction is a normal bundle: pass through unchanged.
+            //
+            // pressActionForIntent  → used for creating the launch intent (or null for opt-out)
+            // pressActionForExtras  → used in the receiver intent extras (event payload);
+            //                         null for cases 1 & 2 to avoid leaking synthesized defaults
+            //                         or the sentinel id into the JS event.
+            Bundle pressActionForIntent = androidModel.getPressAction();
+            Bundle pressActionForExtras = pressActionForIntent;
+            if (pressActionForIntent == null) {
+              // Case 1: absent — synthesize default for launch, null for extras
+              pressActionForIntent = new Bundle();
+              pressActionForIntent.putString("id", "default");
+              pressActionForIntent.putString("launchActivity", "default");
+              // pressActionForExtras stays null: the original notification didn't have
+              // pressAction, so the event shouldn't either.
+            } else if (NotificationPendingIntent.PRESS_ACTION_OPT_OUT_ID.equals(
+                pressActionForIntent.getString("id"))) {
+              // Case 2: explicit opt-out sentinel — no launch intent, no sentinel in extras
+              pressActionForIntent = null;
+              pressActionForExtras = null;
+            }
+            // Case 3: normal pressAction — both variables point to the original bundle
+
+            int targetSdkVersion =
+                ContextHolder.getApplicationContext().getApplicationInfo().targetSdkVersion;
+            if (targetSdkVersion >= Build.VERSION_CODES.S
+                && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+              builder.setContentIntent(
+                  NotificationPendingIntent.createIntent(
+                      notificationModel.getHashCode(),
+                      pressActionForIntent,
+                      TYPE_PRESS,
+                      new String[] {"notification", "pressAction"},
+                      notificationModel.toBundle(),
+                      pressActionForExtras));
+            } else {
+              builder.setContentIntent(
+                  ReceiverService.createIntent(
+                      ReceiverService.PRESS_INTENT,
+                      new String[] {"notification", "pressAction"},
+                      notificationModel.toBundle(),
+                      pressActionForIntent));
+            }
 
-          if (notificationModel.getTitle() != null) {
-            builder.setContentTitle(TextUtils.fromHtml(notificationModel.getTitle()));
-          }
+            if (notificationModel.getTitle() != null) {
+              builder.setContentTitle(TextUtils.fromHtml(notificationModel.getTitle()));
+            }
 
-          if (notificationModel.getSubTitle() != null) {
-            builder.setSubText(TextUtils.fromHtml(notificationModel.getSubTitle()));
-          }
+            if (notificationModel.getSubTitle() != null) {
+              builder.setSubText(TextUtils.fromHtml(notificationModel.getSubTitle()));
+            }
 
-          if (notificationModel.getBody() != null) {
-            builder.setContentText(TextUtils.fromHtml(notificationModel.getBody()));
-          }
+            if (notificationModel.getBody() != null) {
+              builder.setContentText(TextUtils.fromHtml(notificationModel.getBody()));
+            }
 
-          if (androidModel.getBadgeIconType() != null) {
-            builder.setBadgeIconType(androidModel.getBadgeIconType());
-          }
+            if (androidModel.getBadgeIconType() != null) {
+              builder.setBadgeIconType(androidModel.getBadgeIconType());
+            }
 
-          if (androidModel.getCategory() != null) {
-            builder.setCategory(androidModel.getCategory());
-          }
+            if (androidModel.getCategory() != null) {
+              builder.setCategory(androidModel.getCategory());
+            }
 
-          if (androidModel.getColor() != null) {
-            builder.setColor(androidModel.getColor());
-          }
+            if (androidModel.getColor() != null) {
+              builder.setColor(androidModel.getColor());
+            }
 
-          builder.setColorized(androidModel.getColorized());
+            builder.setColorized(androidModel.getColorized());
 
-          if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            builder.setChronometerCountDown(androidModel.getChronometerCountDown());
-          }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+              builder.setChronometerCountDown(androidModel.getChronometerCountDown());
+            }
 
-          if (androidModel.getGroup() != null) {
-            builder.setGroup(androidModel.getGroup());
-          }
+            if (androidModel.getGroup() != null) {
+              builder.setGroup(androidModel.getGroup());
+            }
 
-          builder.setGroupAlertBehavior(androidModel.getGroupAlertBehaviour());
-          builder.setGroupSummary(androidModel.getGroupSummary());
+            builder.setGroupAlertBehavior(androidModel.getGroupAlertBehaviour());
+            builder.setGroupSummary(androidModel.getGroupSummary());
 
-          if (androidModel.getInputHistory() != null) {
-            builder.setRemoteInputHistory(androidModel.getInputHistory());
-          }
+            if (androidModel.getInputHistory() != null) {
+              builder.setRemoteInputHistory(androidModel.getInputHistory());
+            }
 
-          if (androidModel.getLights() != null) {
-            ArrayList<Integer> lights = androidModel.getLights();
-            builder.setLights(lights.get(0), lights.get(1), lights.get(2));
-          }
+            if (androidModel.getLights() != null) {
+              ArrayList<Integer> lights = androidModel.getLights();
+              builder.setLights(lights.get(0), lights.get(1), lights.get(2));
+            }
 
-          builder.setLocalOnly(androidModel.getLocalOnly());
+            builder.setLocalOnly(androidModel.getLocalOnly());
 
-          if (androidModel.getNumber() != null) {
-            builder.setNumber(androidModel.getNumber());
-          }
+            if (androidModel.getNumber() != null) {
+              builder.setNumber(androidModel.getNumber());
+            }
 
-          if (androidModel.getSound() != null) {
-            Uri soundUri = ResourceUtils.getSoundUri(androidModel.getSound());
-            if (soundUri != null) {
-              hasCustomSound = true;
-              builder.setSound(soundUri);
-            } else {
-              Logger.w(
-                  TAG,
-                  "Unable to retrieve sound for notification, sound was specified as: "
-                      + androidModel.getSound());
+            if (androidModel.getSound() != null) {
+              Uri soundUri = ResourceUtils.getSoundUri(androidModel.getSound());
+              if (soundUri != null) {
+                hasCustomSound = true;
+                builder.setSound(soundUri);
+              } else {
+                Logger.w(
+                    TAG,
+                    "Unable to retrieve sound for notification, sound was specified as: "
+                        + androidModel.getSound());
+              }
             }
-          }
 
-          builder.setDefaults(androidModel.getDefaults(hasCustomSound));
-          builder.setOngoing(androidModel.getOngoing());
-          builder.setOnlyAlertOnce(androidModel.getOnlyAlertOnce());
-          builder.setPriority(androidModel.getPriority());
+            builder.setDefaults(androidModel.getDefaults(hasCustomSound));
+            builder.setOngoing(androidModel.getOngoing());
+            builder.setOnlyAlertOnce(androidModel.getOnlyAlertOnce());
+            builder.setPriority(androidModel.getPriority());
 
-          NotificationAndroidModel.AndroidProgress progress = androidModel.getProgress();
-          if (progress != null) {
-            builder.setProgress(
-                progress.getMax(), progress.getCurrent(), progress.getIndeterminate());
-          }
+            NotificationAndroidModel.AndroidProgress progress = androidModel.getProgress();
+            if (progress != null) {
+              builder.setProgress(
+                  progress.getMax(), progress.getCurrent(), progress.getIndeterminate());
+            }
 
-          if (androidModel.getShortcutId() != null) {
-            builder.setShortcutId(androidModel.getShortcutId());
-          }
+            if (androidModel.getShortcutId() != null) {
+              builder.setShortcutId(androidModel.getShortcutId());
+            }
 
-          builder.setShowWhen(androidModel.getShowTimestamp());
+            builder.setShowWhen(androidModel.getShowTimestamp());
 
-          Integer smallIconId = androidModel.getSmallIcon();
-          if (smallIconId != null) {
-            Integer smallIconLevel = androidModel.getSmallIconLevel();
-            if (smallIconLevel != null) {
-              builder.setSmallIcon(smallIconId, smallIconLevel);
-            } else {
-              builder.setSmallIcon(smallIconId);
+            Integer smallIconId = androidModel.getSmallIcon();
+            if (smallIconId != null) {
+              Integer smallIconLevel = androidModel.getSmallIconLevel();
+              if (smallIconLevel != null) {
+                builder.setSmallIcon(smallIconId, smallIconLevel);
+              } else {
+                builder.setSmallIcon(smallIconId);
+              }
             }
-          }
 
-          if (androidModel.getSortKey() != null) {
-            builder.setSortKey(androidModel.getSortKey());
-          }
+            if (androidModel.getSortKey() != null) {
+              builder.setSortKey(androidModel.getSortKey());
+            }
 
-          if (androidModel.getTicker() != null) {
-            builder.setTicker(androidModel.getTicker());
-          }
+            if (androidModel.getTicker() != null) {
+              builder.setTicker(androidModel.getTicker());
+            }
 
-          if (androidModel.getTimeoutAfter() != null) {
-            builder.setTimeoutAfter(androidModel.getTimeoutAfter());
-          }
+            if (androidModel.getTimeoutAfter() != null) {
+              builder.setTimeoutAfter(androidModel.getTimeoutAfter());
+            }
 
-          builder.setUsesChronometer(androidModel.getShowChronometer());
+            builder.setUsesChronometer(androidModel.getShowChronometer());
 
-          long[] vibrationPattern = androidModel.getVibrationPattern();
-          if (vibrationPattern.length > 0) builder.setVibrate(vibrationPattern);
+            long[] vibrationPattern = androidModel.getVibrationPattern();
+            if (vibrationPattern.length > 0) builder.setVibrate(vibrationPattern);
 
-          builder.setVisibility(androidModel.getVisibility());
+            builder.setVisibility(androidModel.getVisibility());
 
-          long timestamp = androidModel.getTimestamp();
-          if (timestamp > -1) builder.setWhen(timestamp);
+            long timestamp = androidModel.getTimestamp();
+            if (timestamp > -1) builder.setWhen(timestamp);
 
-          builder.setAutoCancel(androidModel.getAutoCancel());
+            builder.setAutoCancel(androidModel.getAutoCancel());
 
-          return builder;
+            return builder;
+          } finally {
+            Trace.endSection();
+          }
         };
 
     /*
@@ -536,15 +543,13 @@ class NotificationManager {
             task -> {
               if (notificationType == NOTIFICATION_TYPE_TRIGGER
                   || notificationType == NOTIFICATION_TYPE_ALL) {
-                return new ExtendedListenableFuture<Void>(
-                        NotifeeAlarmManager.cancelAllNotifications())
-                    .addOnCompleteListener(
-                        (e, result) -> {
-                          if (e == null) {
-                            WorkDataRepository.getInstance(getApplicationContext()).deleteAll();
-                          }
-                        },
-                        LISTENING_CACHED_THREAD_POOL);
+                // Chain the Room delete onto the alarm-manager cancel so the outer
+                // future — and therefore the JS Promise — only completes after Room
+                // has drained. Fixes upstream invertase/notifee#549.
+                return Futures.transformAsync(
+                    NotifeeAlarmManager.cancelAllNotifications(),
+                    ignored -> WorkDataRepository.getInstance(getApplicationContext()).deleteAll(),
+                    LISTENING_CACHED_THREAD_POOL);
               }
               return Futures.immediateFuture(null);
             },
@@ -576,7 +581,8 @@ class NotificationManager {
                           Logger.e(
                               TAG,
                               "cancelAllNotificationsWithIds -> Failed to parse id as integer  "
-                                  + id);
+                                  + id,
+                              e);
                         }
 
                         if (integerId != null) {
@@ -605,9 +611,11 @@ class NotificationManager {
                 }))
         .continueWith(
             task -> {
-              // delete all from database
+              // Chain the Room delete so the outer future — and therefore the JS
+              // Promise — only completes after Room has drained. Fixes upstream
+              // invertase/notifee#549 for the per-id cancel path.
               if (notificationType != NOTIFICATION_TYPE_DISPLAYED) {
-                WorkDataRepository.getInstance(getApplicationContext()).deleteByIds(ids);
+                return WorkDataRepository.getInstance(getApplicationContext()).deleteByIds(ids);
               }
               return Futures.immediateFuture(null);
             },
@@ -619,103 +627,139 @@ class NotificationManager {
     return new ExtendedListenableFuture<>(notificationBundleToBuilder(notificationModel))
         .continueWith(
             (taskResult) -> {
-              NotificationCompat.Builder builder = taskResult;
+              Trace.beginSection("notifee:displayNotification");
+              try {
+                NotificationCompat.Builder builder = taskResult;
+
+                // Add the following extras for `getDisplayedNotifications()`
+                Bundle extrasBundle = new Bundle();
+                extrasBundle.putBundle(EXTRA_NOTIFEE_NOTIFICATION, notificationModel.toBundle());
+                if (triggerBundle != null) {
+                  extrasBundle.putBundle(EXTRA_NOTIFEE_TRIGGER, triggerBundle);
+                }
+                builder.addExtras(extrasBundle);
 
-              // Add the following extras for `getDisplayedNotifications()`
-              Bundle extrasBundle = new Bundle();
-              extrasBundle.putBundle(EXTRA_NOTIFEE_NOTIFICATION, notificationModel.toBundle());
-              if (triggerBundle != null) {
-                extrasBundle.putBundle(EXTRA_NOTIFEE_TRIGGER, triggerBundle);
-              }
-              builder.addExtras(extrasBundle);
+                NotificationAndroidModel androidBundle = notificationModel.getAndroid();
 
-              // build notification
-              Notification notification = Objects.requireNonNull(builder).build();
+                // Set foreground service behavior before building (only for FGS notifications).
+                // IMMEDIATE eliminates the 10-second display delay on Android 12+.
+                if (androidBundle.getAsForegroundService()) {
+                  builder.setForegroundServiceBehavior(
+                      androidBundle.getForegroundServiceBehavior());
+                }
 
-              int hashCode = notificationModel.getHashCode();
+                // build notification
+                Notification notification = Objects.requireNonNull(builder).build();
 
-              NotificationAndroidModel androidBundle = notificationModel.getAndroid();
-              if (androidBundle.getLoopSound()) {
-                notification.flags |= Notification.FLAG_INSISTENT;
-              }
+                int hashCode = notificationModel.getHashCode();
+                if (androidBundle.getLoopSound()) {
+                  notification.flags |= Notification.FLAG_INSISTENT;
+                }
 
-              if (androidBundle.getFlags() != null && androidBundle.getFlags().length > 0) {
-                for (int flag : androidBundle.getFlags()) {
-                  notification.flags |= flag;
+                if (androidBundle.getFlags() != null && androidBundle.getFlags().length > 0) {
+                  for (int flag : androidBundle.getFlags()) {
+                    notification.flags |= flag;
+                  }
                 }
-              }
 
-              if (androidBundle.getLightUpScreen()) {
-                PowerManagerUtils.lightUpScreenIfNeeded(ContextHolder.getApplicationContext());
-              }
+                if (androidBundle.getLightUpScreen()) {
+                  PowerManagerUtils.lightUpScreenIfNeeded(ContextHolder.getApplicationContext());
+                }
 
-              if (androidBundle.getAsForegroundService()) {
-                ForegroundService.start(hashCode, notification, notificationModel.toBundle());
-              } else {
-                NotificationManagerCompat.from(getApplicationContext())
-                    .notify(androidBundle.getTag(), hashCode, notification);
-              }
+                if (androidBundle.getAsForegroundService()) {
+                  Trace.beginSection("notifee:startForegroundService");
+                  try {
+                    ForegroundService.start(hashCode, notification, notificationModel.toBundle());
+                  } finally {
+                    Trace.endSection();
+                  }
+                } else {
+                  NotificationManagerCompat.from(getApplicationContext())
+                      .notify(androidBundle.getTag(), hashCode, notification);
+                }
 
-              EventBus.post(
-                  new NotificationEvent(NotificationEvent.TYPE_DELIVERED, notificationModel));
+                EventBus.post(
+                    new NotificationEvent(NotificationEvent.TYPE_DELIVERED, notificationModel));
 
-              return Futures.immediateFuture(null);
+                return Futures.immediateFuture(null);
+              } finally {
+                Trace.endSection();
+              }
             },
             CACHED_THREAD_POOL);
   }
 
   static ListenableFuture<Void> createTriggerNotification(
       NotificationModel notificationModel, Bundle triggerBundle) {
-    return LISTENING_CACHED_THREAD_POOL.submit(
-        () -> {
-          int triggerType = ObjectUtils.getInt(triggerBundle.get("type"));
-          switch (triggerType) {
-            case 0:
-              createTimestampTriggerNotification(notificationModel, triggerBundle);
-              break;
-            case 1:
-              createIntervalTriggerNotification(notificationModel, triggerBundle);
-              break;
-          }
+    int triggerType = ObjectUtils.getInt(triggerBundle.get("type"));
+    ListenableFuture<Void> scheduleFuture;
+    switch (triggerType) {
+      case 0:
+        scheduleFuture = createTimestampTriggerNotification(notificationModel, triggerBundle);
+        break;
+      case 1:
+        scheduleFuture = createIntervalTriggerNotification(notificationModel, triggerBundle);
+        break;
+      default:
+        scheduleFuture = Futures.immediateFuture(null);
+        break;
+    }
 
+    return Futures.transform(
+        scheduleFuture,
+        unused -> {
           EventBus.post(
               new NotificationEvent(
                   NotificationEvent.TYPE_TRIGGER_NOTIFICATION_CREATED, notificationModel));
-
           return null;
-        });
+        },
+        LISTENING_CACHED_THREAD_POOL);
   }
 
-  static void createIntervalTriggerNotification(
+  // Returns a future that completes only after the Room insert has persisted AND
+  // WorkManager has enqueued the periodic work. Chaining Room-first guarantees the
+  // worker reads the row on its first fire even if the process is killed between
+  // the JS Promise resolving and WorkManager scheduling. Fixes upstream
+  // invertase/notifee#549 for the interval-trigger path.
+  static ListenableFuture<Void> createIntervalTriggerNotification(
       NotificationModel notificationModel, Bundle triggerBundle) {
     IntervalTriggerModel trigger = IntervalTriggerModel.fromBundle(triggerBundle);
     String uniqueWorkName = "trigger:" + notificationModel.getId();
-    WorkManager workManager = WorkManager.getInstance(getApplicationContext());
-
-    Data.Builder workDataBuilder =
-        new Data.Builder()
-            .putString(Worker.KEY_WORK_TYPE, Worker.WORK_TYPE_NOTIFICATION_TRIGGER)
-            .putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_PERIODIC)
-            .putString("id", notificationModel.getId());
-
-    WorkDataRepository.getInstance(getApplicationContext())
-        .insertTriggerNotification(notificationModel, triggerBundle, false);
-
-    long interval = trigger.getInterval();
-
-    PeriodicWorkRequest.Builder workRequestBuilder;
-    workRequestBuilder =
-        new PeriodicWorkRequest.Builder(Worker.class, interval, trigger.getTimeUnit())
-            .setInitialDelay(interval, trigger.getTimeUnit());
-
-    workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
-    workRequestBuilder.addTag(uniqueWorkName);
-    workRequestBuilder.setInputData(workDataBuilder.build());
-    workManager.enqueueUniquePeriodicWork(
-        uniqueWorkName, ExistingPeriodicWorkPolicy.UPDATE, workRequestBuilder.build());
+    Context context = getApplicationContext();
+
+    ListenableFuture<Void> insertFuture =
+        WorkDataRepository.insertTriggerNotification(
+            context, notificationModel, triggerBundle, false);
+
+    return Futures.transform(
+        insertFuture,
+        unused -> {
+          WorkManager workManager = WorkManager.getInstance(context);
+          Data.Builder workDataBuilder =
+              new Data.Builder()
+                  .putString(Worker.KEY_WORK_TYPE, Worker.WORK_TYPE_NOTIFICATION_TRIGGER)
+                  .putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_PERIODIC)
+                  .putString("id", notificationModel.getId());
+
+          long interval = trigger.getInterval();
+          PeriodicWorkRequest.Builder workRequestBuilder =
+              new PeriodicWorkRequest.Builder(Worker.class, interval, trigger.getTimeUnit())
+                  .setInitialDelay(interval, trigger.getTimeUnit());
+          workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
+          workRequestBuilder.addTag(uniqueWorkName);
+          workRequestBuilder.setInputData(workDataBuilder.build());
+          workManager.enqueueUniquePeriodicWork(
+              uniqueWorkName, ExistingPeriodicWorkPolicy.UPDATE, workRequestBuilder.build());
+          return null;
+        },
+        LISTENING_CACHED_THREAD_POOL);
   }
 
-  static void createTimestampTriggerNotification(
+  // Returns a future that completes only after the Room insert has persisted AND
+  // the AlarmManager / WorkManager schedule call has run. Same rationale as the
+  // interval path above. Fixes upstream invertase/notifee#549 for the timestamp
+  // trigger path (AlarmManager by default since 9.1.12).
+  static ListenableFuture<Void> createTimestampTriggerNotification(
       NotificationModel notificationModel, Bundle triggerBundle) {
     TimestampTriggerModel trigger = TimestampTriggerModel.fromBundle(triggerBundle);
 
@@ -724,52 +768,56 @@ class NotificationManager {
     long delay = trigger.getDelay();
     int interval = trigger.getInterval();
 
-    // Save in DB
     Data.Builder workDataBuilder =
         new Data.Builder()
             .putString(Worker.KEY_WORK_TYPE, Worker.WORK_TYPE_NOTIFICATION_TRIGGER)
             .putString("id", notificationModel.getId());
 
     Boolean withAlarmManager = trigger.getWithAlarmManager();
+    Context context = getApplicationContext();
+
+    ListenableFuture<Void> insertFuture =
+        WorkDataRepository.insertTriggerNotification(
+            context, notificationModel, triggerBundle, withAlarmManager);
+
+    return Futures.transform(
+        insertFuture,
+        unused -> {
+          if (withAlarmManager) {
+            NotifeeAlarmManager.scheduleTimestampTriggerNotification(notificationModel, trigger);
+            return null;
+          }
 
-    WorkDataRepository.getInstance(getApplicationContext())
-        .insertTriggerNotification(notificationModel, triggerBundle, withAlarmManager);
-
-    // Schedule notification with alarm manager
-    if (withAlarmManager) {
-      NotifeeAlarmManager.scheduleTimestampTriggerNotification(notificationModel, trigger);
-      return;
-    }
-
-    // Continue to schedule trigger notification with WorkManager
-    WorkManager workManager = WorkManager.getInstance(getApplicationContext());
-
-    // WorkManager - One time trigger
-    if (interval == -1) {
-      OneTimeWorkRequest.Builder workRequestBuilder = new OneTimeWorkRequest.Builder(Worker.class);
-      workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
-      workRequestBuilder.addTag(uniqueWorkName);
-      workDataBuilder.putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_ONE_TIME);
-      workRequestBuilder.setInputData(workDataBuilder.build());
-      workRequestBuilder.setInitialDelay(delay, TimeUnit.SECONDS);
-      workManager.enqueueUniqueWork(
-          uniqueWorkName, ExistingWorkPolicy.REPLACE, workRequestBuilder.build());
-    } else {
-      // WorkManager - repeat trigger
-      PeriodicWorkRequest.Builder workRequestBuilder;
-
-      workRequestBuilder =
-          new PeriodicWorkRequest.Builder(
-              Worker.class, trigger.getInterval(), trigger.getTimeUnit());
-
-      workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
-      workRequestBuilder.addTag(uniqueWorkName);
-      workRequestBuilder.setInitialDelay(delay, TimeUnit.SECONDS);
-      workDataBuilder.putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_PERIODIC);
-      workRequestBuilder.setInputData(workDataBuilder.build());
-      workManager.enqueueUniquePeriodicWork(
-          uniqueWorkName, ExistingPeriodicWorkPolicy.UPDATE, workRequestBuilder.build());
-    }
+          WorkManager workManager = WorkManager.getInstance(context);
+
+          // WorkManager - One time trigger
+          if (interval == -1) {
+            OneTimeWorkRequest.Builder workRequestBuilder =
+                new OneTimeWorkRequest.Builder(Worker.class);
+            workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
+            workRequestBuilder.addTag(uniqueWorkName);
+            workDataBuilder.putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_ONE_TIME);
+            workRequestBuilder.setInputData(workDataBuilder.build());
+            workRequestBuilder.setInitialDelay(delay, TimeUnit.SECONDS);
+            workManager.enqueueUniqueWork(
+                uniqueWorkName, ExistingWorkPolicy.REPLACE, workRequestBuilder.build());
+          } else {
+            // WorkManager - repeat trigger
+            PeriodicWorkRequest.Builder workRequestBuilder =
+                new PeriodicWorkRequest.Builder(
+                    Worker.class, trigger.getInterval(), trigger.getTimeUnit());
+
+            workRequestBuilder.addTag(Worker.WORK_TYPE_NOTIFICATION_TRIGGER);
+            workRequestBuilder.addTag(uniqueWorkName);
+            workRequestBuilder.setInitialDelay(delay, TimeUnit.SECONDS);
+            workDataBuilder.putString(Worker.KEY_WORK_REQUEST, Worker.WORK_REQUEST_PERIODIC);
+            workRequestBuilder.setInputData(workDataBuilder.build());
+            workManager.enqueueUniquePeriodicWork(
+                uniqueWorkName, ExistingPeriodicWorkPolicy.UPDATE, workRequestBuilder.build());
+          }
+          return null;
+        },
+        LISTENING_CACHED_THREAD_POOL);
   }
 
   static ListenableFuture<List<Bundle>> getDisplayedNotifications() {
@@ -957,17 +1005,51 @@ class NotificationManager {
                 new ExtendedListenableFuture<>(result)
                     .addOnCompleteListener(
                         (e2, _unused) -> {
-                          completer.set(Result.success());
                           if (e2 != null) {
                             Logger.e(TAG, "Failed to display notification", e2);
+                            completer.set(Result.success());
+                            return;
+                          }
+                          String workerRequestType = data.getString(Worker.KEY_WORK_REQUEST);
+                          if (workerRequestType != null
+                              && workerRequestType.equals(Worker.WORK_REQUEST_ONE_TIME)) {
+                            // DO NOT reorder — completer.set must only run after the
+                            // delete future completes, otherwise WorkManager may start
+                            // a new work instance that reads the stale row. Previously
+                            // completer.set fired before the delete was enqueued, leaving
+                            // a zombie row that reboot recovery would resurrect as a
+                            // ghost alarm. See #549 audit Part B, Caller #5.
+                            //
+                            // Note: CallbackToFutureAdapter.Completer.set() returns
+                            // false on double-set, it does NOT throw. This is an
+                            // androidx contract. Do not refactor under the assumption
+                            // that double-set is dangerous.
+                            Futures.addCallback(
+                                WorkDataRepository.getInstance(getApplicationContext())
+                                    .deleteById(id),
+                                new FutureCallback<Void>() {
+                                  @Override
+                                  public void onSuccess(Void unused) {
+                                    completer.set(Result.success());
+                                  }
+
+                                  @Override
+                                  public void onFailure(@NonNull Throwable t) {
+                                    // Notification was already displayed; a failed
+                                    // delete leaves an orphan row that the next
+                                    // cancelAll or app restart will clean up. Still
+                                    // report success so WorkManager doesn't retry
+                                    // the already-displayed notification.
+                                    Logger.e(
+                                        TAG,
+                                        "Failed to delete one-time trigger row after" + " display",
+                                        new Exception(t));
+                                    completer.set(Result.success());
+                                  }
+                                },
+                                LISTENING_CACHED_THREAD_POOL);
                           } else {
-                            String workerRequestType = data.getString(Worker.KEY_WORK_REQUEST);
-                            if (workerRequestType != null
-                                && workerRequestType.equals(Worker.WORK_REQUEST_ONE_TIME)) {
-                              // delete database entry if work is a one-time request
-                              WorkDataRepository.getInstance(getApplicationContext())
-                                  .deleteById(id);
-                            }
+                            completer.set(Result.success());
                           }
                         },
                         LISTENING_CACHED_THREAD_POOL);