kopia lustrzana https://github.com/ryukoposting/Signal-Android
Only put message in the media queue if it has an attachment.
rodzic
3d6ffe25f0
commit
302e653d2f
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Ładowanie…
Reference in New Issue