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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View file

@ -176,7 +176,6 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
import org.thoughtcrime.securesms.util.HtmlUtil;
import org.thoughtcrime.securesms.util.LifecycleDisposable;
import org.thoughtcrime.securesms.util.MessageRecordUtil;
import org.thoughtcrime.securesms.util.ProfileUtil;
import org.thoughtcrime.securesms.util.Projection;
import org.thoughtcrime.securesms.util.RemoteDeleteUtil;
import org.thoughtcrime.securesms.util.SaveAttachmentTask;
@ -1047,14 +1046,14 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
}
private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set<MessageRecord> messageRecords) {
Context context = requireActivity();
int messagesCount = messageRecords.size();
AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity());
builder.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount));
builder.setCancelable(true);
builder.setPositiveButton(R.string.ConversationFragment_delete_for_me, (dialog, which) -> {
int deleteForMeResId = isNoteToSelfDelete(messageRecords) ? R.string.ConversationFragment_delete_on_this_device : R.string.ConversationFragment_delete_for_me;
builder.setPositiveButton(deleteForMeResId, (dialog, which) -> {
new ProgressDialogAsyncTask<Void, Void, Void>(getActivity(),
R.string.ConversationFragment_deleting,
R.string.ConversationFragment_deleting_messages)
@ -1083,14 +1082,20 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
}.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
});
int deleteForEveryoneResId = isNoteToSelfDelete(messageRecords) ? R.string.ConversationFragment_delete_everywhere : R.string.ConversationFragment_delete_for_everyone;
if (RemoteDeleteUtil.isValidSend(messageRecords, System.currentTimeMillis())) {
builder.setNeutralButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> handleDeleteForEveryone(messageRecords));
builder.setNeutralButton(deleteForEveryoneResId, (dialog, which) -> handleDeleteForEveryone(messageRecords));
}
builder.setNegativeButton(android.R.string.cancel, null);
return builder;
}
private static boolean isNoteToSelfDelete(Set<MessageRecord> messageRecords) {
return messageRecords.stream().allMatch(messageRecord -> messageRecord.isOutgoing() && messageRecord.getRecipient().isSelf());
}
private void handleDeleteForEveryone(Set<MessageRecord> messageRecords) {
Runnable deleteForEveryone = () -> {
SignalExecutors.BOUNDED.execute(() -> {
@ -1100,7 +1105,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
});
};
if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) {
if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce() || isNoteToSelfDelete(messageRecords)) {
deleteForEveryone.run();
} else {
new MaterialAlertDialogBuilder(requireActivity())

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());
}
}

4
app/src/main/res/values/strings.xml
View file

@ -450,6 +450,10 @@
<string name="ConversationFragment_deleting_messages">Deleting messages…</string>
<string name="ConversationFragment_delete_for_me">Delete for me</string>
<string name="ConversationFragment_delete_for_everyone">Delete for everyone</string>
<!-- Dialog button for deleting one or more note-to-self messages only on this device, leaving that same message intact on other devices. -->
<string name="ConversationFragment_delete_on_this_device">Delete on this device</string>
<!-- Dialog button for deleting one or more note-to-self messages on all linked devices. -->
<string name="ConversationFragment_delete_everywhere">Delete everywhere</string>
<string name="ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation">This message will be deleted for everyone in the conversation if they’re on a recent version of Signal. They will be able to see that you deleted a message.</string>
<string name="ConversationFragment_quoted_message_not_found">Original message not found</string>
<string name="ConversationFragment_quoted_message_no_longer_available">Original message no longer available</string>