Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-25 03:11:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update delete for everyone functionality to match requirements.

Browse Source
This commit is contained in:
Cody Henthorne
2020-07-02 12:37:58 -04:00
committed by Greyson Parrelli
parent c877aba09f
commit 1752972be9
9 changed files with 70 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/org/thoughtcrime/securesms/util/RemoteDeleteUtil.java
View File

@@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit;
public final class RemoteDeleteUtil {
private static final long RECEIVE_THRESHOLD = TimeUnit.DAYS.toMillis(1);
private static final long SEND_THRESHOLD = TimeUnit.MINUTES.toMillis(30);
private static final long SEND_THRESHOLD = TimeUnit.HOURS.toMillis(3);
private RemoteDeleteUtil() {}
@@ -21,17 +21,23 @@ public final class RemoteDeleteUtil {
boolean isValidSender = (deleteSender.isLocalNumber() && targetMessage.isOutgoing()) ||
(!deleteSender.isLocalNumber() && !targetMessage.isOutgoing());
return isValidSender &&
return isValidSender &&
targetMessage.getIndividualRecipient().equals(deleteSender) &&
(deleteServerTimestamp - targetMessage.getServerTimestamp()) < RECEIVE_THRESHOLD;
}
public static boolean isValidSend(@NonNull Collection<MessageRecord> targetMessages, long currentTime) {
// TODO [greyson] [remote-delete] Update with server timestamp when available for outgoing messages
return Stream.of(targetMessages)
.allMatch(message -> message.isOutgoing() &&
!message.isRemoteDelete() &&
!message.isPending() &&
(currentTime - message.getDateSent()) < SEND_THRESHOLD);
return Stream.of(targetMessages).allMatch(message -> isValidSend(message, currentTime));
}
private static boolean isValidSend(MessageRecord message, long currentTime) {
return message.isOutgoing() &&
message.isPush() &&
(!message.getRecipient().isGroup() || message.getRecipient().isActiveGroup()) &&
!message.getRecipient().isLocalNumber() &&
!message.isRemoteDelete() &&
!message.isPending() &&
(currentTime - message.getDateSent()) < SEND_THRESHOLD;
}
}