Break large read receipt messages into chunks.

This commit is contained in:
Greyson Parrelli
2020-11-18 14:19:28 -05:00
committed by GitHub
parent f59e10d82c
commit 95468c85a8
2 changed files with 35 additions and 6 deletions

View File

@@ -9,12 +9,15 @@ import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobmanager.Data; import org.thoughtcrime.securesms.jobmanager.Data;
import org.thoughtcrime.securesms.jobmanager.Job; import org.thoughtcrime.securesms.jobmanager.Job;
import org.thoughtcrime.securesms.jobmanager.JobManager;
import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint; import org.thoughtcrime.securesms.jobmanager.impl.NetworkConstraint;
import org.thoughtcrime.securesms.logging.Log; import org.thoughtcrime.securesms.logging.Log;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId; import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil; import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.util.TextSecurePreferences; 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.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; 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 String TAG = SendReadReceiptJob.class.getSimpleName();
private static final int MAX_TIMESTAMPS = 500;
private static final String KEY_THREAD = "thread"; private static final String KEY_THREAD = "thread";
private static final String KEY_ADDRESS = "address"; private static final String KEY_ADDRESS = "address";
private static final String KEY_RECIPIENT = "recipient"; private static final String KEY_RECIPIENT = "recipient";
private static final String KEY_MESSAGE_IDS = "message_ids"; private static final String KEY_MESSAGE_IDS = "message_ids";
private static final String KEY_TIMESTAMP = "timestamp"; private static final String KEY_TIMESTAMP = "timestamp";
private long threadId; private final long threadId;
private RecipientId recipientId; private final RecipientId recipientId;
private List<Long> messageIds; private final List<Long> messageIds;
private long timestamp; private final long timestamp;
public SendReadReceiptJob(long threadId, @NonNull RecipientId recipientId, List<Long> messageIds) { public SendReadReceiptJob(long threadId, @NonNull RecipientId recipientId, List<Long> messageIds) {
this(new Job.Parameters.Builder() this(new Job.Parameters.Builder()
@@ -51,7 +56,7 @@ public class SendReadReceiptJob extends BaseJob {
.build(), .build(),
threadId, threadId,
recipientId, recipientId,
messageIds, ensureSize(messageIds, MAX_TIMESTAMPS),
System.currentTimeMillis()); System.currentTimeMillis());
} }
@@ -69,6 +74,23 @@ public class SendReadReceiptJob extends BaseJob {
this.timestamp = timestamp; 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<Long> messageIds) {
JobManager jobManager = ApplicationDependencies.getJobManager();
List<List<Long>> 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<Long> chunk : messageIdChunks) {
jobManager.add(new SendReadReceiptJob(threadId, recipientId, chunk));
}
}
@Override @Override
public @NonNull Data serialize() { public @NonNull Data serialize() {
long[] ids = new long[messageIds.size()]; 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); Log.w(TAG, "Failed to send read receipts to: " + recipientId);
} }
private static <E> List<E> ensureSize(@NonNull List<E> 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<SendReadReceiptJob> { public static final class Factory implements Job.Factory<SendReadReceiptJob> {
private final Application application; private final Application application;

View File

@@ -99,7 +99,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
Stream.of(idMapForThread).forEach(entry -> { Stream.of(idMapForThread).forEach(entry -> {
List<Long> timestamps = Stream.of(entry.getValue()).map(SyncMessageId::getTimetamp).toList(); List<Long> 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);
}); });
}); });
} }