From 35f87898f2701595d49a438995d1811ec20a00a1 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Tue, 4 Aug 2026 13:00:11 +0000
Subject: [PATCH] Keep the process alive while sending a notification reply.

---
 .../notifications/RemoteReplyReceiver.java    | 75 +++++++++++--------
 1 file changed, 43 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
index 30804a87f5..c6fc39cfac 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/RemoteReplyReceiver.java
@@ -26,6 +26,7 @@ import android.os.Bundle;
 import androidx.core.app.RemoteInput;
 
 import org.signal.core.util.concurrent.SignalExecutors;
+import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.database.MessageTable.MarkedMessageInfo;
 import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.database.model.ParentStoryId;
@@ -46,6 +47,8 @@ import java.util.List;
  */
 public class RemoteReplyReceiver extends BroadcastReceiver {
 
+  private static final String TAG = Log.tag(RemoteReplyReceiver.class);
+
   public static final String REPLY_ACTION         = "org.thoughtcrime.securesms.notifications.WEAR_REPLY";
   public static final String RECIPIENT_EXTRA      = "recipient_extra";
   public static final String REPLY_METHOD         = "reply_method";
@@ -70,43 +73,51 @@ public class RemoteReplyReceiver extends BroadcastReceiver {
     if (replyMethod == null) throw new AssertionError("No reply method specified");
 
     if (responseText != null) {
+      PendingResult finisher = goAsync();
+
       SignalExecutors.BOUNDED.execute(() -> {
-        long threadId;
+        try {
+          long threadId;
 
-        Recipient               recipient     = Recipient.resolved(recipientId);
-        String                  body          = responseText.toString();
-        ParentStoryId           parentStoryId = groupStoryId != Long.MIN_VALUE ? ParentStoryId.deserialize(groupStoryId) : null;
-        MessageUtil.SplitResult splitMessage  = MessageUtil.getSplitMessage(context, body);
-        SlideDeck               slideDeck     = null;
+          Recipient               recipient     = Recipient.resolved(recipientId);
+          String                  body          = responseText.toString();
+          ParentStoryId           parentStoryId = groupStoryId != Long.MIN_VALUE ? ParentStoryId.deserialize(groupStoryId) : null;
+          MessageUtil.SplitResult splitMessage  = MessageUtil.getSplitMessage(context, body);
+          SlideDeck               slideDeck     = null;
 
-        if (splitMessage.getTextSlide().isPresent()) {
-          slideDeck = new SlideDeck();
-          slideDeck.addSlide(splitMessage.getTextSlide().get());
-        }
-
-        switch (replyMethod) {
-          case SecureMessage:
-          case GroupMessage: {
-            OutgoingMessage reply = OutgoingMessage.quickReply(recipient,
-                                                               slideDeck,
-                                                               splitMessage.getBody(),
-                                                               parentStoryId);
-
-            threadId = MessageSender.send(context, reply, -1, MessageSender.SendType.SIGNAL, null, null);
-            break;
+          if (splitMessage.getTextSlide().isPresent()) {
+            slideDeck = new SlideDeck();
+            slideDeck.addSlide(splitMessage.getTextSlide().get());
           }
-          default:
-            throw new AssertionError("Unknown Reply method");
+
+          switch (replyMethod) {
+            case SecureMessage:
+            case GroupMessage: {
+              OutgoingMessage reply = OutgoingMessage.quickReply(recipient,
+                                                                 slideDeck,
+                                                                 splitMessage.getBody(),
+                                                                 parentStoryId);
+
+              threadId = MessageSender.send(context, reply, -1, MessageSender.SendType.SIGNAL, null, null);
+              break;
+            }
+            default:
+              throw new AssertionError("Unknown Reply method");
+          }
+
+          AppDependencies.getMessageNotifier()
+                         .addStickyThread(new ConversationId(threadId, groupStoryId != Long.MIN_VALUE ? groupStoryId : null),
+                                                  intent.getLongExtra(EARLIEST_TIMESTAMP, System.currentTimeMillis()));
+
+          List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setRead(threadId);
+
+          AppDependencies.getMessageNotifier().updateNotification(context);
+          MarkReadReceiver.process(messageIds);
+
+          Log.i(TAG, "Enqueued a reply for thread " + threadId + ".");
+        } finally {
+          finisher.finish();
         }
-
-        AppDependencies.getMessageNotifier()
-                       .addStickyThread(new ConversationId(threadId, groupStoryId != Long.MIN_VALUE ? groupStoryId : null),
-                                                intent.getLongExtra(EARLIEST_TIMESTAMP, System.currentTimeMillis()));
-
-        List<MarkedMessageInfo> messageIds = SignalDatabase.threads().setRead(threadId);
-
-        AppDependencies.getMessageNotifier().updateNotification(context);
-        MarkReadReceiver.process(messageIds);
       });
     }
   }