empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Cody Henthorne 2023-02-06 09:48:21 -05:00 • committed by Alex Hart
parent 3b40b10a77
commit 67fb9d09d4
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
View file

@ -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);