From b190f9495adbf78aa08c082ef7246b42a879c81e Mon Sep 17 00:00:00 2001 From: Nicholas Date: Tue, 29 Nov 2022 09:48:02 -0500 Subject: [PATCH] Only show "Delete Everywhere" with linked devices. This applies to Note To Self. --- .../securesms/conversation/ConversationFragment.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java index dc8d2bfc2..3dc75b3d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -1052,7 +1052,9 @@ public class ConversationFragment extends LoggingFragment implements Multiselect builder.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount)); builder.setCancelable(true); - int deleteForMeResId = isNoteToSelfDelete(messageRecords) ? R.string.ConversationFragment_delete_on_this_device : R.string.ConversationFragment_delete_for_me; + boolean isNoteToSelfDelete = isNoteToSelfDelete(messageRecords); + + int deleteForMeResId = isNoteToSelfDelete ? R.string.ConversationFragment_delete_on_this_device : R.string.ConversationFragment_delete_for_me; builder.setPositiveButton(deleteForMeResId, (dialog, which) -> { new ProgressDialogAsyncTask(getActivity(), R.string.ConversationFragment_deleting, @@ -1082,9 +1084,9 @@ 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; + int deleteForEveryoneResId = isNoteToSelfDelete ? R.string.ConversationFragment_delete_everywhere : R.string.ConversationFragment_delete_for_everyone; - if (RemoteDeleteUtil.isValidSend(messageRecords, System.currentTimeMillis())) { + if (RemoteDeleteUtil.isValidSend(messageRecords, System.currentTimeMillis()) && (!isNoteToSelfDelete || TextSecurePreferences.isMultiDevice(requireContext()))) { builder.setNeutralButton(deleteForEveryoneResId, (dialog, which) -> handleDeleteForEveryone(messageRecords)); }