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

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

fork-5.53.8
Greyson Parrelli 2022-01-03 09:03:12 -05:00
rodzic 3d6ffe25f0
commit 302e653d2f
2 zmienionych plików z 5 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
Wyświetl plik

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

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

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