Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 21:15:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only put message in the media queue if it has an attachment.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-01-03 09:03:12 -05:00
parent 3d6ffe25f0
commit 302e653d2f
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
View File

@@ -63,8 +63,8 @@ public class PushMediaSendJob extends PushSendJob {
private long messageId;
public PushMediaSendJob(long messageId, @NonNull Recipient recipient) {
this(constructParameters(recipient, true), messageId);
public PushMediaSendJob(long messageId, @NonNull Recipient recipient, boolean hasMedia) {
this(constructParameters(recipient, hasMedia), messageId);
}
private PushMediaSendJob(Job.Parameters parameters, long messageId) {
@@ -83,7 +83,7 @@ public class PushMediaSendJob extends PushSendJob {
OutgoingMediaMessage message = database.getOutgoingMessage(messageId);
Set<String> attachmentUploadIds = enqueueCompressingAndUploadAttachmentsChains(jobManager, message);
jobManager.add(new PushMediaSendJob(messageId, recipient), attachmentUploadIds, recipient.getId().toQueueKey());
jobManager.add(new PushMediaSendJob(messageId, recipient, attachmentUploadIds.size() > 0), attachmentUploadIds, recipient.getId().toQueueKey());
} catch (NoSuchMessageException | MmsException e) {
Log.w(TAG, "Failed to enqueue message.", e);

4
app/src/main/java/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@@ -275,7 +275,7 @@ public class MessageSender {
} else if (isGroupPushSend(recipient)) {
jobManager.add(new PushGroupSendJob(messageId, recipient.getId(), null, true), messageDependsOnIds, recipient.getId().toQueueKey());
} else {
jobManager.add(new PushMediaSendJob(messageId, recipient), messageDependsOnIds, recipient.getId().toQueueKey());
jobManager.add(new PushMediaSendJob(messageId, recipient, true), messageDependsOnIds, recipient.getId().toQueueKey());
}
}
@@ -428,7 +428,7 @@ public class MessageSender {
JobManager jobManager = ApplicationDependencies.getJobManager();
if (uploadJobIds.size() > 0) {
Job mediaSend = new PushMediaSendJob(messageId, recipient);
Job mediaSend = new PushMediaSendJob(messageId, recipient, true);
jobManager.add(mediaSend, uploadJobIds);
} else {
PushMediaSendJob.enqueue(context, jobManager, messageId, recipient);