mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix scheduled send in note to self with no linked devices.

main
Cody Henthorne 2023-02-06 09:48:21 -05:00 zatwierdzone przez Alex Hart
rodzic 3b40b10a77
commit 67fb9d09d4
1 zmienionych plików z 12 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
Wyświetl plik

@ -206,7 +206,8 @@ public class MessageSender {
recipient, recipient,
SendType.SIGNAL, SendType.SIGNAL,
messageId, messageId,
jobDependencyIds); jobDependencyIds,
false);
} }
onMessageSent(); onMessageSent();
@ -238,7 +239,7 @@ public class MessageSender {
SignalLocalMetrics.GroupMessageSend.cancel(metricId); SignalLocalMetrics.GroupMessageSend.cancel(metricId);
} }
sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList()); sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList(), message.getScheduledDate() > 0);
onMessageSent(); onMessageSent();
threadTable.update(allocatedThreadId, true); threadTable.update(allocatedThreadId, true);
@ -275,7 +276,7 @@ public class MessageSender {
attachmentDatabase.updateMessageId(attachmentIds, messageId, message.getStoryType().isStory()); attachmentDatabase.updateMessageId(attachmentIds, messageId, message.getStoryType().isStory());
sendMessageInternal(context, recipient, SendType.SIGNAL, messageId, jobIds); sendMessageInternal(context, recipient, SendType.SIGNAL, messageId, jobIds, false);
onMessageSent(); onMessageSent();
threadTable.update(allocatedThreadId, true); threadTable.update(allocatedThreadId, true);
@ -503,7 +504,7 @@ public class MessageSender {
sendType = SendType.SIGNAL; sendType = SendType.SIGNAL;
} }
sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList()); sendMessageInternal(context, recipient, sendType, messageId, Collections.emptyList(), false);
onMessageSent(); onMessageSent();
} }
@ -519,9 +520,14 @@ public class MessageSender {
return outgoingMessage; 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); sendLocalMediaSelf(context, messageId);
} else if (recipient.isPushGroup()) { } else if (recipient.isPushGroup()) {
sendGroupPush(context, recipient, messageId, Collections.emptySet(), uploadJobIds); sendGroupPush(context, recipient, messageId, Collections.emptySet(), uploadJobIds);