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

Add read and viewed receipts to the MSL.

fork-5.53.8
Greyson Parrelli 2021-06-30 17:26:40 -04:00 zatwierdzone przez Alex Hart
rodzic 3d0e15e2b8
commit 0921ebe5f1
13 zmienionych plików z 190 dodań i 97 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsRepository.kt
Wyświetl plik

@ -187,7 +187,7 @@ class ConversationSettingsRepository(
} }
fun disableProfileSharingForInternalUser(recipientId: RecipientId) { fun disableProfileSharingForInternalUser(recipientId: RecipientId) {
Preconditions.checkArgument(FeatureFlags.internalUser(), "Internal users only!"); Preconditions.checkArgument(FeatureFlags.internalUser(), "Internal users only!")
SignalExecutors.BOUNDED.execute { SignalExecutors.BOUNDED.execute {
DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipientId, false) DatabaseFactory.getRecipientDatabase(context).setProfileSharing(recipientId, false)
@ -195,7 +195,7 @@ class ConversationSettingsRepository(
} }
fun deleteSessionForInternalUser(recipientId: RecipientId) { fun deleteSessionForInternalUser(recipientId: RecipientId) {
Preconditions.checkArgument(FeatureFlags.internalUser(), "Internal users only!"); Preconditions.checkArgument(FeatureFlags.internalUser(), "Internal users only!")
SignalExecutors.BOUNDED.execute { SignalExecutors.BOUNDED.execute {
DatabaseFactory.getSessionDatabase(context).deleteAllFor(recipientId) DatabaseFactory.getSessionDatabase(context).deleteAllFor(recipientId)

4
app/src/main/java/org/thoughtcrime/securesms/components/voice/VoiceNotePlaybackService.java
Wyświetl plik

@ -40,6 +40,7 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob; import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob; import org.thoughtcrime.securesms.jobs.SendViewedReceiptJob;
@ -256,7 +257,8 @@ public class VoiceNotePlaybackService extends MediaBrowserServiceCompat {
if (markedMessageInfo != null) { if (markedMessageInfo != null) {
ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(), ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(markedMessageInfo.getThreadId(),
recipientId, recipientId,
markedMessageInfo.getSyncMessageId().getTimetamp())); markedMessageInfo.getSyncMessageId().getTimetamp(),
new MessageId(messageId, true)));
MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(markedMessageInfo.getSyncMessageId())); MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(markedMessageInfo.getSyncMessageId()));
} }
}); });

13
app/src/main/java/org/thoughtcrime/securesms/database/MessageDatabase.java
Wyświetl plik

@ -20,6 +20,7 @@ import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchList; import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchList;
import org.thoughtcrime.securesms.database.documents.NetworkFailure; import org.thoughtcrime.securesms.database.documents.NetworkFailure;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.ReactionRecord; import org.thoughtcrime.securesms.database.model.ReactionRecord;
import org.thoughtcrime.securesms.database.model.SmsMessageRecord; import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
@ -682,11 +683,13 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
private final long threadId; private final long threadId;
private final SyncMessageId syncMessageId; private final SyncMessageId syncMessageId;
private final MessageId messageId;
private final ExpirationInfo expirationInfo; private final ExpirationInfo expirationInfo;
public MarkedMessageInfo(long threadId, SyncMessageId syncMessageId, ExpirationInfo expirationInfo) { public MarkedMessageInfo(long threadId, @NonNull SyncMessageId syncMessageId, @NonNull MessageId messageId, @Nullable ExpirationInfo expirationInfo) {
this.threadId = threadId; this.threadId = threadId;
this.syncMessageId = syncMessageId; this.syncMessageId = syncMessageId;
this.messageId = messageId;
this.expirationInfo = expirationInfo; this.expirationInfo = expirationInfo;
} }
@ -694,11 +697,15 @@ public abstract class MessageDatabase extends Database implements MmsSmsColumns
return threadId; return threadId;
} }
public SyncMessageId getSyncMessageId() { public @NonNull SyncMessageId getSyncMessageId() {
return syncMessageId; return syncMessageId;
} }
public ExpirationInfo getExpirationInfo() { public @NonNull MessageId getMessageId() {
return messageId;
}
public @Nullable ExpirationInfo getExpirationInfo() {
return expirationInfo; return expirationInfo;
} }
} }

9
app/src/main/java/org/thoughtcrime/securesms/database/MessageSendLogDatabase.kt
Wyświetl plik

@ -151,6 +151,15 @@ class MessageSendLogDatabase constructor(context: Context?, databaseHelper: SQLC
} }
} }
fun insertIfPossible(recipientId: RecipientId, sentTimestamp: Long, sendMessageResult: SendMessageResult, contentHint: ContentHint, messageIds: List<MessageId>) {
if (!FeatureFlags.senderKey()) return
if (sendMessageResult.isSuccess && sendMessageResult.success.content.isPresent) {
val recipientDevice = listOf(RecipientDevice(recipientId, sendMessageResult.success.devices))
insert(recipientDevice, sentTimestamp, sendMessageResult.success.content.get(), contentHint, messageIds)
}
}
fun insertIfPossible(sentTimestamp: Long, possibleRecipients: List<Recipient>, results: List<SendMessageResult>, contentHint: ContentHint, relatedMessageId: Long, isRelatedMessageMms: Boolean) { fun insertIfPossible(sentTimestamp: Long, possibleRecipients: List<Recipient>, results: List<SendMessageResult>, contentHint: ContentHint, relatedMessageId: Long, isRelatedMessageMms: Boolean) {
if (!FeatureFlags.senderKey()) return if (!FeatureFlags.senderKey()) return

9
app/src/main/java/org/thoughtcrime/securesms/database/MmsDatabase.java
Wyświetl plik

@ -47,6 +47,7 @@ import org.thoughtcrime.securesms.database.documents.NetworkFailureList;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord; import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.Mention; import org.thoughtcrime.securesms.database.model.Mention;
import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord; import org.thoughtcrime.securesms.database.model.NotificationMmsMessageRecord;
import org.thoughtcrime.securesms.database.model.Quote; import org.thoughtcrime.securesms.database.model.Quote;
@ -399,11 +400,12 @@ public class MmsDatabase extends MessageDatabase {
List<MarkedMessageInfo> results = new ArrayList<>(cursor.getCount()); List<MarkedMessageInfo> results = new ArrayList<>(cursor.getCount());
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
long messageId = CursorUtil.requireLong(cursor, ID);
RecipientId recipientId = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID)); RecipientId recipientId = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID));
long dateSent = CursorUtil.requireLong(cursor, DATE_SENT); long dateSent = CursorUtil.requireLong(cursor, DATE_SENT);
SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent); SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent);
results.add(new MarkedMessageInfo(threadId, syncMessageId, null)); results.add(new MarkedMessageInfo(threadId, syncMessageId, new MessageId(messageId, true), null));
} }
return results; return results;
@ -437,12 +439,13 @@ public class MmsDatabase extends MessageDatabase {
while (cursor != null && cursor.moveToNext()) { while (cursor != null && cursor.moveToNext()) {
long type = CursorUtil.requireLong(cursor, MESSAGE_BOX); long type = CursorUtil.requireLong(cursor, MESSAGE_BOX);
if (Types.isSecureType(type) && Types.isInboxType(type)) { if (Types.isSecureType(type) && Types.isInboxType(type)) {
long messageId = CursorUtil.requireLong(cursor, ID);
long threadId = CursorUtil.requireLong(cursor, THREAD_ID); long threadId = CursorUtil.requireLong(cursor, THREAD_ID);
RecipientId recipientId = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID)); RecipientId recipientId = RecipientId.from(CursorUtil.requireLong(cursor, RECIPIENT_ID));
long dateSent = CursorUtil.requireLong(cursor, DATE_SENT); long dateSent = CursorUtil.requireLong(cursor, DATE_SENT);
SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent); SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent);
results.add(new MarkedMessageInfo(threadId, syncMessageId, null)); results.add(new MarkedMessageInfo(threadId, syncMessageId, new MessageId(messageId, true), null));
ContentValues contentValues = new ContentValues(); ContentValues contentValues = new ContentValues();
contentValues.put(VIEWED_RECEIPT_COUNT, 1); contentValues.put(VIEWED_RECEIPT_COUNT, 1);
@ -1004,7 +1007,7 @@ public class MmsDatabase extends MessageDatabase {
SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent); SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent);
ExpirationInfo expirationInfo = new ExpirationInfo(messageId, expiresIn, expireStarted, true); ExpirationInfo expirationInfo = new ExpirationInfo(messageId, expiresIn, expireStarted, true);
result.add(new MarkedMessageInfo(threadId, syncMessageId, expirationInfo)); result.add(new MarkedMessageInfo(threadId, syncMessageId, new MessageId(messageId, true), expirationInfo));
} }
} }

3
app/src/main/java/org/thoughtcrime/securesms/database/SmsDatabase.java
Wyświetl plik

@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatchList;
import org.thoughtcrime.securesms.database.documents.NetworkFailure; import org.thoughtcrime.securesms.database.documents.NetworkFailure;
import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper; import org.thoughtcrime.securesms.database.helpers.SQLCipherOpenHelper;
import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil; import org.thoughtcrime.securesms.database.model.GroupCallUpdateDetailsUtil;
import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.database.model.MessageRecord; import org.thoughtcrime.securesms.database.model.MessageRecord;
import org.thoughtcrime.securesms.database.model.ReactionRecord; import org.thoughtcrime.securesms.database.model.ReactionRecord;
import org.thoughtcrime.securesms.database.model.SmsMessageRecord; import org.thoughtcrime.securesms.database.model.SmsMessageRecord;
@ -644,7 +645,7 @@ public class SmsDatabase extends MessageDatabase {
SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent); SyncMessageId syncMessageId = new SyncMessageId(recipientId, dateSent);
ExpirationInfo expirationInfo = new ExpirationInfo(messageId, expiresIn, expireStarted, false); ExpirationInfo expirationInfo = new ExpirationInfo(messageId, expiresIn, expireStarted, false);
results.add(new MarkedMessageInfo(threadId, syncMessageId, expirationInfo)); results.add(new MarkedMessageInfo(threadId, syncMessageId, new MessageId(messageId, false), expirationInfo));
} }
} }

69
app/src/main/java/org/thoughtcrime/securesms/jobs/SendReadReceiptJob.java
Wyświetl plik

@ -7,6 +7,10 @@ import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo;
import org.thoughtcrime.securesms.database.model.MessageId;
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;
@ -19,8 +23,11 @@ import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.thoughtcrime.securesms.transport.UndeliverableMessageException; import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; 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.ContentHint;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
@ -28,8 +35,11 @@ import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedExcept
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
public class SendReadReceiptJob extends BaseJob { public class SendReadReceiptJob extends BaseJob {
@ -42,15 +52,17 @@ public class SendReadReceiptJob extends BaseJob {
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_SENT_TIMESTAMPS = "message_ids";
private static final String KEY_MESSAGE_IDS = "message_db_ids";
private static final String KEY_TIMESTAMP = "timestamp"; private static final String KEY_TIMESTAMP = "timestamp";
private final long threadId; private final long threadId;
private final RecipientId recipientId; private final RecipientId recipientId;
private final List<Long> messageIds; private final List<Long> messageSentTimestamps;
private final long timestamp; private final long timestamp;
private final List<MessageId> messageIds;
public SendReadReceiptJob(long threadId, @NonNull RecipientId recipientId, List<Long> messageIds) { public SendReadReceiptJob(long threadId, @NonNull RecipientId recipientId, List<Long> messageSentTimestamps, List<MessageId> messageIds) {
this(new Job.Parameters.Builder() this(new Job.Parameters.Builder()
.addConstraint(NetworkConstraint.KEY) .addConstraint(NetworkConstraint.KEY)
.setLifespan(TimeUnit.DAYS.toMillis(1)) .setLifespan(TimeUnit.DAYS.toMillis(1))
@ -59,6 +71,7 @@ public class SendReadReceiptJob extends BaseJob {
.build(), .build(),
threadId, threadId,
recipientId, recipientId,
ensureSize(messageSentTimestamps, MAX_TIMESTAMPS),
ensureSize(messageIds, MAX_TIMESTAMPS), ensureSize(messageIds, MAX_TIMESTAMPS),
System.currentTimeMillis()); System.currentTimeMillis());
} }
@ -66,13 +79,15 @@ public class SendReadReceiptJob extends BaseJob {
private SendReadReceiptJob(@NonNull Job.Parameters parameters, private SendReadReceiptJob(@NonNull Job.Parameters parameters,
long threadId, long threadId,
@NonNull RecipientId recipientId, @NonNull RecipientId recipientId,
@NonNull List<Long> messageIds, @NonNull List<Long> messageSentTimestamps,
@NonNull List<MessageId> messageIds,
long timestamp) long timestamp)
{ {
super(parameters); super(parameters);
this.threadId = threadId; this.threadId = threadId;
this.recipientId = recipientId; this.recipientId = recipientId;
this.messageSentTimestamps = messageSentTimestamps;
this.messageIds = messageIds; this.messageIds = messageIds;
this.timestamp = timestamp; this.timestamp = timestamp;
} }
@ -81,28 +96,34 @@ public class SendReadReceiptJob extends BaseJob {
* Enqueues all the necessary jobs for read receipts, ensuring that they're all within the * Enqueues all the necessary jobs for read receipts, ensuring that they're all within the
* maximum size. * maximum size.
*/ */
public static void enqueue(long threadId, @NonNull RecipientId recipientId, List<Long> messageIds) { public static void enqueue(long threadId, @NonNull RecipientId recipientId, List<MarkedMessageInfo> markedMessageInfos) {
JobManager jobManager = ApplicationDependencies.getJobManager(); JobManager jobManager = ApplicationDependencies.getJobManager();
List<List<Long>> messageIdChunks = Util.chunk(messageIds, MAX_TIMESTAMPS); List<List<MarkedMessageInfo>> messageIdChunks = Util.chunk(markedMessageInfos, MAX_TIMESTAMPS);
if (messageIdChunks.size() > 1) { if (messageIdChunks.size() > 1) {
Log.w(TAG, "Large receipt count! Had to break into multiple chunks. Total count: " + messageIds.size()); Log.w(TAG, "Large receipt count! Had to break into multiple chunks. Total count: " + markedMessageInfos.size());
} }
for (List<Long> chunk : messageIdChunks) { for (List<MarkedMessageInfo> chunk : messageIdChunks) {
jobManager.add(new SendReadReceiptJob(threadId, recipientId, chunk)); List<Long> sentTimestamps = chunk.stream().map(info -> info.getSyncMessageId().getTimetamp()).collect(Collectors.toList());
List<MessageId> messageIds = chunk.stream().map(MarkedMessageInfo::getMessageId).collect(Collectors.toList());
jobManager.add(new SendReadReceiptJob(threadId, recipientId, sentTimestamps, messageIds));
} }
} }
@Override @Override
public @NonNull Data serialize() { public @NonNull Data serialize() {
long[] ids = new long[messageIds.size()]; long[] sentTimestamps = new long[messageSentTimestamps.size()];
for (int i = 0; i < ids.length; i++) { for (int i = 0; i < sentTimestamps.length; i++) {
ids[i] = messageIds.get(i); sentTimestamps[i] = messageSentTimestamps.get(i);
} }
List<String> serializedMessageIds = messageIds.stream().map(MessageId::serialize).collect(Collectors.toList());
return new Data.Builder().putString(KEY_RECIPIENT, recipientId.serialize()) return new Data.Builder().putString(KEY_RECIPIENT, recipientId.serialize())
.putLongArray(KEY_MESSAGE_IDS, ids) .putLongArray(KEY_MESSAGE_SENT_TIMESTAMPS, sentTimestamps)
.putStringListAsArray(KEY_MESSAGE_IDS, serializedMessageIds)
.putLong(KEY_TIMESTAMP, timestamp) .putLong(KEY_TIMESTAMP, timestamp)
.putLong(KEY_THREAD, threadId) .putLong(KEY_THREAD, threadId)
.build(); .build();
@ -119,7 +140,7 @@ public class SendReadReceiptJob extends BaseJob {
throw new NotPushRegisteredException(); throw new NotPushRegisteredException();
} }
if (!TextSecurePreferences.isReadReceiptsEnabled(context) || messageIds.isEmpty()) return; if (!TextSecurePreferences.isReadReceiptsEnabled(context) || messageSentTimestamps.isEmpty()) return;
if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) { if (!RecipientUtil.isMessageRequestAccepted(context, threadId)) {
Log.w(TAG, "Refusing to send receipts to untrusted recipient"); Log.w(TAG, "Refusing to send receipts to untrusted recipient");
@ -139,11 +160,15 @@ public class SendReadReceiptJob extends BaseJob {
SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender(); SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
SignalServiceAddress remoteAddress = RecipientUtil.toSignalServiceAddress(context, recipient); SignalServiceAddress remoteAddress = RecipientUtil.toSignalServiceAddress(context, recipient);
SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ, messageIds, timestamp); SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.READ, messageSentTimestamps, timestamp);
messageSender.sendReceipt(remoteAddress, SendMessageResult result = messageSender.sendReceipt(remoteAddress,
UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)), UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)),
receiptMessage); receiptMessage);
if (Util.hasItems(messageIds)) {
DatabaseFactory.getMessageLogDatabase(context).insertIfPossible(recipientId, timestamp, result, ContentHint.IMPLICIT, messageIds);
}
} }
@Override @Override
@ -176,17 +201,19 @@ public class SendReadReceiptJob extends BaseJob {
@Override @Override
public @NonNull SendReadReceiptJob create(@NonNull Parameters parameters, @NonNull Data data) { public @NonNull SendReadReceiptJob create(@NonNull Parameters parameters, @NonNull Data data) {
long timestamp = data.getLong(KEY_TIMESTAMP); long timestamp = data.getLong(KEY_TIMESTAMP);
long[] ids = data.hasLongArray(KEY_MESSAGE_IDS) ? data.getLongArray(KEY_MESSAGE_IDS) : new long[0]; long[] ids = data.hasLongArray(KEY_MESSAGE_SENT_TIMESTAMPS) ? data.getLongArray(KEY_MESSAGE_SENT_TIMESTAMPS) : new long[0];
List<Long> messageIds = new ArrayList<>(ids.length); List<Long> sentTimestamps = new ArrayList<>(ids.length);
List<String> rawMessageIds = data.hasStringArray(KEY_MESSAGE_IDS) ? data.getStringArrayAsList(KEY_MESSAGE_IDS) : Collections.emptyList();
List<MessageId> messageIds = rawMessageIds.stream().map(MessageId::deserialize).collect(Collectors.toList());
long threadId = data.getLong(KEY_THREAD);
RecipientId recipientId = data.hasString(KEY_RECIPIENT) ? RecipientId.from(data.getString(KEY_RECIPIENT)) RecipientId recipientId = data.hasString(KEY_RECIPIENT) ? RecipientId.from(data.getString(KEY_RECIPIENT))
: Recipient.external(application, data.getString(KEY_ADDRESS)).getId(); : Recipient.external(application, data.getString(KEY_ADDRESS)).getId();
long threadId = data.getLong(KEY_THREAD);
for (long id : ids) { for (long id : ids) {
messageIds.add(id); sentTimestamps.add(id);
} }
return new SendReadReceiptJob(parameters, threadId, recipientId, messageIds, timestamp); return new SendReadReceiptJob(parameters, threadId, recipientId, sentTimestamps, messageIds, timestamp);
} }
} }
} }

81
app/src/main/java/org/thoughtcrime/securesms/jobs/SendViewedReceiptJob.java
Wyświetl plik

@ -7,18 +7,24 @@ import androidx.annotation.NonNull;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil; import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase.MarkedMessageInfo;
import org.thoughtcrime.securesms.database.model.MessageId;
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.net.NotPushRegisteredException; import org.thoughtcrime.securesms.net.NotPushRegisteredException;
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.FeatureFlags;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.signalservice.api.SignalServiceMessageSender; import org.whispersystems.signalservice.api.SignalServiceMessageSender;
import org.whispersystems.signalservice.api.crypto.ContentHint;
import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException; import org.whispersystems.signalservice.api.crypto.UntrustedIdentityException;
import org.whispersystems.signalservice.api.messages.SendMessageResult;
import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage; import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
import org.whispersystems.signalservice.api.push.SignalServiceAddress; import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException; import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
@ -28,6 +34,9 @@ import java.io.IOException;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static org.thoughtcrime.securesms.jobs.SendReadReceiptJob.MAX_TIMESTAMPS;
public class SendViewedReceiptJob extends BaseJob { public class SendViewedReceiptJob extends BaseJob {
@ -38,19 +47,21 @@ public class SendViewedReceiptJob extends BaseJob {
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_SYNC_TIMESTAMPS = "message_ids"; private static final String KEY_MESSAGE_SENT_TIMESTAMPS = "message_ids";
private static final String KEY_MESSAGE_IDS = "message_db_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> syncTimestamps; private final List<Long> messageSentTimestamps;
private long timestamp; private final List<MessageId> messageIds;
private final long timestamp;
public SendViewedReceiptJob(long threadId, @NonNull RecipientId recipientId, long syncTimestamp) { public SendViewedReceiptJob(long threadId, @NonNull RecipientId recipientId, long syncTimestamp, @NonNull MessageId messageId) {
this(threadId, recipientId, Collections.singletonList(syncTimestamp)); this(threadId, recipientId, Collections.singletonList(syncTimestamp), Collections.singletonList(messageId));
} }
public SendViewedReceiptJob(long threadId, @NonNull RecipientId recipientId, @NonNull List<Long> syncTimestamps) { private SendViewedReceiptJob(long threadId, @NonNull RecipientId recipientId, @NonNull List<Long> messageSentTimestamps, @NonNull List<MessageId> messageIds) {
this(new Parameters.Builder() this(new Parameters.Builder()
.addConstraint(NetworkConstraint.KEY) .addConstraint(NetworkConstraint.KEY)
.setLifespan(TimeUnit.DAYS.toMillis(1)) .setLifespan(TimeUnit.DAYS.toMillis(1))
@ -58,28 +69,54 @@ public class SendViewedReceiptJob extends BaseJob {
.build(), .build(),
threadId, threadId,
recipientId, recipientId,
SendReadReceiptJob.ensureSize(syncTimestamps, SendReadReceiptJob.MAX_TIMESTAMPS), SendReadReceiptJob.ensureSize(messageSentTimestamps, MAX_TIMESTAMPS),
SendReadReceiptJob.ensureSize(messageIds, MAX_TIMESTAMPS),
System.currentTimeMillis()); System.currentTimeMillis());
} }
private SendViewedReceiptJob(@NonNull Parameters parameters, private SendViewedReceiptJob(@NonNull Parameters parameters,
long threadId, long threadId,
@NonNull RecipientId recipientId, @NonNull RecipientId recipientId,
@NonNull List<Long> syncTimestamps, @NonNull List<Long> messageSentTimestamps,
@NonNull List<MessageId> messageIds,
long timestamp) long timestamp)
{ {
super(parameters); super(parameters);
this.threadId = threadId; this.threadId = threadId;
this.recipientId = recipientId; this.recipientId = recipientId;
this.syncTimestamps = syncTimestamps; this.messageSentTimestamps = messageSentTimestamps;
this.messageIds = messageIds;
this.timestamp = timestamp; this.timestamp = timestamp;
} }
/**
* Enqueues all the necessary jobs for viewed receipts, ensuring that they're all within the
* maximum size.
*/
public static void enqueue(long threadId, @NonNull RecipientId recipientId, List<MarkedMessageInfo> markedMessageInfos) {
JobManager jobManager = ApplicationDependencies.getJobManager();
List<List<MarkedMessageInfo>> messageIdChunks = Util.chunk(markedMessageInfos, MAX_TIMESTAMPS);
if (messageIdChunks.size() > 1) {
Log.w(TAG, "Large receipt count! Had to break into multiple chunks. Total count: " + markedMessageInfos.size());
}
for (List<MarkedMessageInfo> chunk : messageIdChunks) {
List<Long> sentTimestamps = chunk.stream().map(info -> info.getSyncMessageId().getTimetamp()).collect(Collectors.toList());
List<MessageId> messageIds = chunk.stream().map(MarkedMessageInfo::getMessageId).collect(Collectors.toList());
jobManager.add(new SendViewedReceiptJob(threadId, recipientId, sentTimestamps, messageIds));
}
}
@Override @Override
public @NonNull Data serialize() { public @NonNull Data serialize() {
List<String> serializedMessageIds = messageIds.stream().map(MessageId::serialize).collect(Collectors.toList());
return new Data.Builder().putString(KEY_RECIPIENT, recipientId.serialize()) return new Data.Builder().putString(KEY_RECIPIENT, recipientId.serialize())
.putLongListAsArray(KEY_SYNC_TIMESTAMPS, syncTimestamps) .putLongListAsArray(KEY_MESSAGE_SENT_TIMESTAMPS, messageSentTimestamps)
.putStringListAsArray(KEY_MESSAGE_IDS, serializedMessageIds)
.putLong(KEY_TIMESTAMP, timestamp) .putLong(KEY_TIMESTAMP, timestamp)
.putLong(KEY_THREAD, threadId) .putLong(KEY_THREAD, threadId)
.build(); .build();
@ -101,7 +138,7 @@ public class SendViewedReceiptJob extends BaseJob {
return; return;
} }
if (syncTimestamps.isEmpty()) { if (messageSentTimestamps.isEmpty()) {
Log.w(TAG, "No sync timestamps!"); Log.w(TAG, "No sync timestamps!");
return; return;
} }
@ -125,12 +162,16 @@ public class SendViewedReceiptJob extends BaseJob {
SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender(); SignalServiceMessageSender messageSender = ApplicationDependencies.getSignalServiceMessageSender();
SignalServiceAddress remoteAddress = RecipientUtil.toSignalServiceAddress(context, recipient); SignalServiceAddress remoteAddress = RecipientUtil.toSignalServiceAddress(context, recipient);
SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED, SignalServiceReceiptMessage receiptMessage = new SignalServiceReceiptMessage(SignalServiceReceiptMessage.Type.VIEWED,
syncTimestamps, messageSentTimestamps,
timestamp); timestamp);
messageSender.sendReceipt(remoteAddress, SendMessageResult result = messageSender.sendReceipt(remoteAddress,
UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)), UnidentifiedAccessUtil.getAccessFor(context, Recipient.resolved(recipientId)),
receiptMessage); receiptMessage);
if (Util.hasItems(messageIds)) {
DatabaseFactory.getMessageLogDatabase(context).insertIfPossible(recipientId, timestamp, result, ContentHint.IMPLICIT, messageIds);
}
} }
@Override @Override
@ -157,12 +198,14 @@ public class SendViewedReceiptJob extends BaseJob {
public @NonNull public @NonNull
SendViewedReceiptJob create(@NonNull Parameters parameters, @NonNull Data data) { SendViewedReceiptJob create(@NonNull Parameters parameters, @NonNull Data data) {
long timestamp = data.getLong(KEY_TIMESTAMP); long timestamp = data.getLong(KEY_TIMESTAMP);
List<Long> syncTimestamps = data.getLongArrayAsList(KEY_SYNC_TIMESTAMPS); List<Long> syncTimestamps = data.getLongArrayAsList(KEY_MESSAGE_SENT_TIMESTAMPS);
List<String> rawMessageIds = data.hasStringArray(KEY_MESSAGE_IDS) ? data.getStringArrayAsList(KEY_MESSAGE_IDS) : Collections.emptyList();
List<MessageId> messageIds = rawMessageIds.stream().map(MessageId::deserialize).collect(Collectors.toList());
long threadId = data.getLong(KEY_THREAD);
RecipientId recipientId = data.hasString(KEY_RECIPIENT) ? RecipientId.from(data.getString(KEY_RECIPIENT)) RecipientId recipientId = data.hasString(KEY_RECIPIENT) ? RecipientId.from(data.getString(KEY_RECIPIENT))
: Recipient.external(application, data.getString(KEY_ADDRESS)).getId(); : Recipient.external(application, data.getString(KEY_ADDRESS)).getId();
long threadId = data.getLong(KEY_THREAD);
return new SendViewedReceiptJob(parameters, threadId, recipientId, syncTimestamps, timestamp); return new SendViewedReceiptJob(parameters, threadId, recipientId, syncTimestamps, messageIds, timestamp);
} }
} }
} }

7
app/src/main/java/org/thoughtcrime/securesms/messagerequests/MessageRequestRepository.java
Wyświetl plik

@ -155,12 +155,7 @@ final class MessageRequestRepository {
List<MessageDatabase.MarkedMessageInfo> viewedInfos = DatabaseFactory.getMmsDatabase(context) List<MessageDatabase.MarkedMessageInfo> viewedInfos = DatabaseFactory.getMmsDatabase(context)
.getViewedIncomingMessages(threadId); .getViewedIncomingMessages(threadId);
ApplicationDependencies.getJobManager() SendViewedReceiptJob.enqueue(threadId, liveRecipient.getId(), viewedInfos);
.add(new SendViewedReceiptJob(threadId,
liveRecipient.getId(),
Stream.of(viewedInfos)
.map(info -> info.getSyncMessageId().getTimetamp())
.toList()));
if (TextSecurePreferences.isMultiDevice(context)) { if (TextSecurePreferences.isMultiDevice(context)) {
ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(liveRecipient.getId())); ApplicationDependencies.getJobManager().add(MultiDeviceMessageRequestResponseJob.forAccept(liveRecipient.getId()));

14
app/src/main/java/org/thoughtcrime/securesms/notifications/MarkReadReceiver.java
Wyświetl plik

@ -92,14 +92,16 @@ public class MarkReadReceiver extends BroadcastReceiver {
.collect(Collectors.groupingBy(MarkedMessageInfo::getThreadId)); .collect(Collectors.groupingBy(MarkedMessageInfo::getThreadId));
Stream.of(threadToInfo).forEach(threadToInfoEntry -> { Stream.of(threadToInfo).forEach(threadToInfoEntry -> {
Map<RecipientId, List<SyncMessageId>> idMapForThread = Stream.of(threadToInfoEntry.getValue()) Map<RecipientId, List<MarkedMessageInfo>> recipientIdToInfo = Stream.of(threadToInfoEntry.getValue())
.map(MarkedMessageInfo::getSyncMessageId) .map(info -> info)
.collect(Collectors.groupingBy(SyncMessageId::getRecipientId)); .collect(Collectors.groupingBy(info -> info.getSyncMessageId().getRecipientId()));
Stream.of(idMapForThread).forEach(entry -> { Stream.of(recipientIdToInfo).forEach(entry -> {
List<Long> timestamps = Stream.of(entry.getValue()).map(SyncMessageId::getTimetamp).toList(); long threadId = threadToInfoEntry.getKey();
RecipientId recipientId = entry.getKey();
List<MarkedMessageInfo> infos = entry.getValue();
SendReadReceiptJob.enqueue(threadToInfoEntry.getKey(), entry.getKey(), timestamps); SendReadReceiptJob.enqueue(threadId, recipientId, infos);
}); });
}); });
} }

4
app/src/main/java/org/thoughtcrime/securesms/revealable/ViewOnceMessageRepository.java
Wyświetl plik

@ -9,6 +9,7 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.DatabaseFactory; import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.MmsDatabase; import org.thoughtcrime.securesms.database.MmsDatabase;
import org.thoughtcrime.securesms.database.model.MessageId;
import org.thoughtcrime.securesms.database.model.MmsMessageRecord; import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies; import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob; import org.thoughtcrime.securesms.jobs.MultiDeviceViewedUpdateJob;
@ -37,7 +38,8 @@ class ViewOnceMessageRepository {
if (info != null) { if (info != null) {
ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(record.getThreadId(), ApplicationDependencies.getJobManager().add(new SendViewedReceiptJob(record.getThreadId(),
info.getSyncMessageId().getRecipientId(), info.getSyncMessageId().getRecipientId(),
info.getSyncMessageId().getTimetamp())); info.getSyncMessageId().getTimetamp(),
info.getMessageId()));
MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(info.getSyncMessageId())); MultiDeviceViewedUpdateJob.enqueue(Collections.singletonList(info.getSyncMessageId()));
} }

6
app/src/test/java/org/thoughtcrime/securesms/jobmanager/migrations/SendReadReceiptsJobMigrationTest.java
Wyświetl plik

@ -23,7 +23,7 @@ public class SendReadReceiptsJobMigrationTest {
@Test @Test
public void givenSendReadReceiptJobDataWithoutThreadIdAndThreadIdFound_whenIMigrate_thenIInsertThreadId() { public void givenSendReadReceiptJobDataWithoutThreadIdAndThreadIdFound_whenIMigrate_thenIInsertThreadId() {
// GIVEN // GIVEN
SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>()); SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>(), new ArrayList<>());
JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(), JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(),
"asdf", "asdf",
new Data.Builder() new Data.Builder()
@ -45,7 +45,7 @@ public class SendReadReceiptsJobMigrationTest {
@Test @Test
public void givenSendReadReceiptJobDataWithoutThreadIdAndThreadIdNotFound_whenIMigrate_thenIGetAFailingJob() { public void givenSendReadReceiptJobDataWithoutThreadIdAndThreadIdNotFound_whenIMigrate_thenIGetAFailingJob() {
// GIVEN // GIVEN
SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>()); SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>(), new ArrayList<>());
JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(), JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(),
"asdf", "asdf",
new Data.Builder() new Data.Builder()
@ -64,7 +64,7 @@ public class SendReadReceiptsJobMigrationTest {
@Test @Test
public void givenSendReadReceiptJobDataWithThreadId_whenIMigrate_thenIDoNotReplace() { public void givenSendReadReceiptJobDataWithThreadId_whenIMigrate_thenIDoNotReplace() {
// GIVEN // GIVEN
SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>()); SendReadReceiptJob job = new SendReadReceiptJob(1, RecipientId.from(2), new ArrayList<>(), new ArrayList<>());
JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(), "asdf", job.serialize()); JobMigration.JobData jobData = new JobMigration.JobData(job.getFactoryKey(), "asdf", job.serialize());
// WHEN // WHEN

2
app/src/test/java/org/thoughtcrime/securesms/notifications/MarkReadReceiverTest.java
Wyświetl plik

@ -13,6 +13,7 @@ import org.mockito.stubbing.Answer;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner; import org.powermock.modules.junit4.PowerMockRunner;
import org.thoughtcrime.securesms.database.MessageDatabase; import org.thoughtcrime.securesms.database.MessageDatabase;
import org.thoughtcrime.securesms.database.model.MessageId;
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;
@ -95,6 +96,7 @@ public class MarkReadReceiverTest {
private MessageDatabase.MarkedMessageInfo createMarkedMessageInfo(long threadId, @NonNull RecipientId recipientId) { private MessageDatabase.MarkedMessageInfo createMarkedMessageInfo(long threadId, @NonNull RecipientId recipientId) {
return new MessageDatabase.MarkedMessageInfo(threadId, return new MessageDatabase.MarkedMessageInfo(threadId,
new MessageDatabase.SyncMessageId(recipientId, 0), new MessageDatabase.SyncMessageId(recipientId, 0),
new MessageId(1, true),
new MessageDatabase.ExpirationInfo(0, 0, 0, false)); new MessageDatabase.ExpirationInfo(0, 0, 0, false));
} }
} }