empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Chunk read sync messages.

Browse source 
Same thing we do with read receipts we send to other people. Just missed
this part.
This commit is contained in:
Greyson Parrelli 2020-11-30 11:36:01 -05:00
parent cce8cdc7bf
commit 105862b524
3 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceReadUpdateJob.java
View file

@ -8,6 +8,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
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;
@ -18,6 +19,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.util.JsonUtils;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
@ -40,13 +42,13 @@ public class MultiDeviceReadUpdateJob extends BaseJob {
private List<SerializableSyncMessageId> messageIds;
public MultiDeviceReadUpdateJob(List<SyncMessageId> messageIds) {
private MultiDeviceReadUpdateJob(List<SyncMessageId> messageIds) {
this(new Job.Parameters.Builder()
.addConstraint(NetworkConstraint.KEY)
.setLifespan(TimeUnit.DAYS.toMillis(1))
.setMaxAttempts(Parameters.UNLIMITED)
.build(),
messageIds);
SendReadReceiptJob.ensureSize(messageIds, SendReadReceiptJob.MAX_TIMESTAMPS));
}
private MultiDeviceReadUpdateJob(@NonNull Job.Parameters parameters, @NonNull List<SyncMessageId> messageIds) {
@ -59,6 +61,23 @@ public class MultiDeviceReadUpdateJob extends BaseJob {
}
}
/**
* Enqueues all the necessary jobs for read receipts, ensuring that they're all within the
* maximum size.
*/
public static void enqueue(@NonNull List<SyncMessageId> messageIds) {
JobManager jobManager = ApplicationDependencies.getJobManager();
List<List<SyncMessageId>> messageIdChunks = Util.chunk(messageIds, SendReadReceiptJob.MAX_TIMESTAMPS);
if (messageIdChunks.size() > 1) {
Log.w(TAG, "Large receipt count! Had to break into multiple chunks. Total count: " + messageIds.size());
}
for (List<SyncMessageId> chunk : messageIdChunks) {
jobManager.add(new MultiDeviceReadUpdateJob(chunk));
}
}
@Override
public @NonNull Data serialize() {
String[] ids = new String[messageIds.size()];

4
app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
View file

@ -35,7 +35,7 @@ public class SendReadReceiptJob extends BaseJob {
private static final String TAG = SendReadReceiptJob.class.getSimpleName();
private static final int MAX_TIMESTAMPS = 500;
static final int MAX_TIMESTAMPS = 500;
private static final String KEY_THREAD = "thread";
private static final String KEY_ADDRESS = "address";
@ -150,7 +150,7 @@ public class SendReadReceiptJob extends BaseJob {
Log.w(TAG, "Failed to send read receipts to: " + recipientId);
}
private static <E> List<E> ensureSize(@NonNull List<E> list, int maxSize) {
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);
}

2
app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
View file

@ -85,7 +85,7 @@ public class MarkReadReceiver extends BroadcastReceiver {
scheduleDeletion(context, smsExpirationInfo, mmsExpirationInfo);
ApplicationDependencies.getJobManager().add(new MultiDeviceReadUpdateJob(syncMessageIds));
MultiDeviceReadUpdateJob.enqueue(syncMessageIds);
Map<Long, List<MarkedMessageInfo>> threadToInfo = Stream.of(markedReadMessages)
.collect(Collectors.groupingBy(MarkedMessageInfo::getThreadId));