From 67fb9d09d4bd6053f73ee8c8efb1324b31d06aec Mon Sep 17 00:00:00 2001
From: Cody Henthorne <cody@signal.org>
Date: Mon, 6 Feb 2023 09:48:21 -0500
Subject: [PATCH] Fix scheduled send in note to self with no linked devices.

---
 .../securesms/sms/MessageSender.java           | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
index e1a42c406..aa94dbad3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -206,7 +206,8 @@ public class MessageSender {
                           recipient,
                           SendType.SIGNAL,
                           messageId,
-                          jobDependencyIds);
+                          jobDependencyIds,
+                          false);
     }
 
     onMessageSent();
@@ -238,7 +239,7 @@ public class MessageSender {
         SignalLocalMetrics.GroupMessageSend.cancel(metricId);
       }
 
-      sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList());
+      sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList(), message.getScheduledDate() > 0);
       onMessageSent();
       threadTable.update(allocatedThreadId, true);
 
@@ -275,7 +276,7 @@ public class MessageSender {
 
       attachmentDatabase.updateMessageId(attachmentIds, messageId, message.getStoryType().isStory());
 
-      sendMessageInternal(context, recipient, SendType.SIGNAL, messageId, jobIds);
+      sendMessageInternal(context, recipient, SendType.SIGNAL, messageId, jobIds, false);
       onMessageSent();
       threadTable.update(allocatedThreadId, true);
 
@@ -503,7 +504,7 @@ public class MessageSender {
       sendType = SendType.SIGNAL;
     }
 
-    sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList());
+    sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList(), false);
 
     onMessageSent();
   }
@@ -519,9 +520,14 @@ public class MessageSender {
     return outgoingMessage;
   }
 
-  private static void sendMessageInternal(Context context, Recipient recipient, SendType sendType, long messageId, @NonNull Collection<String> uploadJobIds)
+  private static void sendMessageInternal(Context context,
+                                          Recipient recipient,
+                                          SendType sendType,
+                                          long messageId,
+                                          @NonNull Collection<String> uploadJobIds,
+                                          boolean isScheduledSend)
   {
-    if (isLocalSelfSend(context, recipient, sendType)) {
+    if (isLocalSelfSend(context, recipient, sendType) && !isScheduledSend) {
       sendLocalMediaSelf(context, messageId);
     } else if (recipient.isPushGroup()) {
       sendGroupPush(context, recipient, messageId, Collections.emptySet(), uploadJobIds);