Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-22 09:49:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add extra guard against inserting unnecessary error messages.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-05-08 13:36:35 -04:00
committed by Cody Henthorne
parent ec6d5031cf
commit ee3f2d62cf
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/org/thoughtcrime/securesms/service/PendingRetryReceiptManager.java
View File

@@ -18,6 +18,8 @@ import org.thoughtcrime.securesms.database.model.PendingRetryReceiptModel;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.util.FeatureFlags;
import java.util.concurrent.TimeUnit;
/**
* Manages the time-based creation of error messages for retries that are pending for messages we couldn't decrypt.
@@ -26,6 +28,8 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
private static final String TAG = Log.tag(PendingRetryReceiptManager.class);
private static final long RETRY_RECEIPT_LIFESPAN = TimeUnit.HOURS.toMillis(1);
private final PendingRetryReceiptCache pendingCache;
private final MessageTable messageDatabase;
@@ -55,11 +59,15 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
@WorkerThread
@Override
protected void executeEvent(@NonNull PendingRetryReceiptModel event) {
if (SignalDatabase.threads().containsId(event.getThreadId()) && SignalDatabase.recipients().containsId(event.getAuthor())) {
Log.w(TAG, "It's been " + (System.currentTimeMillis() - event.getReceivedTimestamp()) + " ms since this retry receipt was received. Showing an error.");
messageDatabase.insertBadDecryptMessage(event.getAuthor(), event.getAuthorDevice(), event.getSentTimestamp(), event.getReceivedTimestamp(), event.getThreadId());
if (SignalDatabase.messages().messageExists(event.getSentTimestamp(), event.getAuthor())) {
Log.w(TAG, "[" + event.getSentTimestamp() + "] We have since received the target message! No longer need to insert an error.");
} else if (!SignalDatabase.threads().containsId(event.getThreadId())) {
Log.w(TAG, "[" + event.getSentTimestamp() + "] Would normally show an error, but the thread has since been deleted! ThreadId: " + event.getThreadId());
} else if (!SignalDatabase.recipients().containsId(event.getAuthor())) {
Log.w(TAG, "[" + event.getSentTimestamp() + "] Would normally show an error, but the recipient has since been deleted! RecipientId: " + event.getAuthor());
} else {
Log.w(TAG, "Would normally show an error, but the thread or recipient has since been deleted! ThreadId: " + event.getThreadId() + ", RecipientId: " + event.getAuthor());
Log.w(TAG, "[" + event.getSentTimestamp() + "] It's been " + (System.currentTimeMillis() - event.getReceivedTimestamp()) + " ms since this retry receipt was received. Showing an error.");
messageDatabase.insertBadDecryptMessage(event.getAuthor(), event.getAuthorDevice(), event.getSentTimestamp() - 1, event.getReceivedTimestamp(), event.getThreadId());
}
pendingCache.delete(event);
@@ -68,7 +76,7 @@ public final class PendingRetryReceiptManager extends TimedEventManager<PendingR
@WorkerThread
@Override
protected long getDelayForEvent(@NonNull PendingRetryReceiptModel event) {
long expiresAt = event.getReceivedTimestamp() + FeatureFlags.retryReceiptLifespan();
long expiresAt = event.getReceivedTimestamp() + RETRY_RECEIPT_LIFESPAN;
long timeLeft = expiresAt - System.currentTimeMillis();
return Math.max(0, timeLeft);