Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-21 17:29:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always allow remote delete in note to self.

Browse Source
This commit is contained in:
Nicholas
2022-11-08 15:15:17 -05:00
committed by Cody Henthorne
parent 65a4ef2f70
commit f96c31b38f
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ public final class RemoteDeleteUtil {
return isValidIncomingOutgoing &&
isValidSender &&
(deleteServerTimestamp - messageTimestamp) < RECEIVE_THRESHOLD;
(((deleteServerTimestamp - messageTimestamp) < RECEIVE_THRESHOLD) || (deleteSender.isSelf() && targetMessage.isOutgoing()));
}
public static boolean isValidSend(@NonNull Collection<MessageRecord> targetMessages, long currentTime) {
@@ -42,9 +42,8 @@ public final class RemoteDeleteUtil {
message.isOutgoing() &&
message.isPush() &&
(!message.getRecipient().isGroup() || message.getRecipient().isActiveGroup()) &&
!message.getRecipient().isSelf() &&
!message.isRemoteDelete() &&
!MessageRecordUtil.hasGiftBadge(message) &&
(currentTime - message.getDateSent()) < SEND_THRESHOLD;
(((currentTime - message.getDateSent()) < SEND_THRESHOLD) || message.getRecipient().isSelf());
}
}