diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java index 4340df17b6..f80a1c1118 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java @@ -9,12 +9,15 @@ import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Job; +import org.thoughtcrime.securesms.jobmanager.JobManager; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.util.TextSecurePreferences; +import org.thoughtcrime.securesms.util.Util; +import org.whispersystems.libsignal.util.guava.Preconditions; import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; @@ -32,16 +35,18 @@ public class SendReadReceiptJob extends BaseJob { private static final String TAG = SendReadReceiptJob.class.getSimpleName(); + private static final int MAX_TIMESTAMPS = 500; + private static final String KEY_THREAD = "thread"; private static final String KEY_ADDRESS = "address"; private static final String KEY_RECIPIENT = "recipient"; private static final String KEY_MESSAGE_IDS = "message_ids"; private static final String KEY_TIMESTAMP = "timestamp"; - private long threadId; - private RecipientId recipientId; - private List messageIds; - private long timestamp; + private final long threadId; + private final RecipientId recipientId; + private final List messageIds; + private final long timestamp; public SendReadReceiptJob(long threadId, @NonNull RecipientId recipientId, List messageIds) { this(new Job.Parameters.Builder() @@ -51,7 +56,7 @@ public class SendReadReceiptJob extends BaseJob { .build(), threadId, recipientId, - messageIds, + ensureSize(messageIds, MAX_TIMESTAMPS), System.currentTimeMillis()); } @@ -69,6 +74,23 @@ public class SendReadReceiptJob extends BaseJob { this.timestamp = timestamp; } + /** + * Enqueues all the necessary jobs for read receipts, ensuring that they're all within the + * maximum size. + */ + public static void enqueue(long threadId, @NonNull RecipientId recipientId, List messageIds) { + JobManager jobManager = ApplicationDependencies.getJobManager(); + List> messageIdChunks = Util.chunk(messageIds, MAX_TIMESTAMPS); + + if (messageIdChunks.size() > 1) { + Log.w(TAG, "Large receipt count! Had to break into multiple chunks. Total count: " + messageIds.size()); + } + + for (List chunk : messageIdChunks) { + jobManager.add(new SendReadReceiptJob(threadId, recipientId, chunk)); + } + } + @Override public @NonNull Data serialize() { long[] ids = new long[messageIds.size()]; @@ -128,6 +150,13 @@ public class SendReadReceiptJob extends BaseJob { Log.w(TAG, "Failed to send read receipts to: " + recipientId); } + private static List ensureSize(@NonNull List list, int maxSize) { + if (list.size() > maxSize) { + throw new IllegalArgumentException("Too large! Size: " + list.size() + ", maxSize: " + maxSize); + } + return list; + } + public static final class Factory implements Job.Factory { private final Application application; diff --git a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java index 93173db162..2007c519ab 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java +++ b/app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java @@ -99,7 +99,7 @@ public class MarkReadReceiver extends BroadcastReceiver { Stream.of(idMapForThread).forEach(entry -> { List timestamps = Stream.of(entry.getValue()).map(SyncMessageId::getTimetamp).toList(); - ApplicationDependencies.getJobManager().add(new SendReadReceiptJob(threadToInfoEntry.getKey(), entry.getKey(), timestamps)); + SendReadReceiptJob.enqueue(threadToInfoEntry.getKey(), entry.getKey(), timestamps); }); }); }