From 48d7228ae7c71cb23e7f1b84c1aae22c65494057 Mon Sep 17 00:00:00 2001 From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:16:30 +0200 Subject: [PATCH] Replace use of AlertDialog.Builder with MaterialAlertDialogBuilder. --- .../org/thoughtcrime/securesms/backup/BackupDialog.java | 6 ++++-- .../thoughtcrime/securesms/contactshare/ContactUtil.java | 3 ++- .../securesms/conversation/ConversationFragment.java | 4 ++-- .../thoughtcrime/securesms/util/CommunicationActions.java | 4 +++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java index d71e5d4cf7..444fdfd240 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java +++ b/app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java @@ -23,6 +23,8 @@ import androidx.annotation.RequiresApi; import androidx.appcompat.app.AlertDialog; import androidx.fragment.app.Fragment; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.keyvalue.SignalStore; @@ -110,7 +112,7 @@ public class BackupDialog { @RequiresApi(29) public static void showChooseBackupLocationDialog(@NonNull Fragment fragment, int requestCode) { - new AlertDialog.Builder(fragment.requireContext()) + new MaterialAlertDialogBuilder(fragment.requireContext()) .setView(R.layout.backup_choose_location_dialog) .setCancelable(true) .setNegativeButton(android.R.string.cancel, (dialog, which) -> { @@ -141,7 +143,7 @@ public class BackupDialog { } public static void showDisableBackupDialog(@NonNull Context context, @NonNull Runnable onBackupsDisabled) { - new AlertDialog.Builder(context) + new MaterialAlertDialogBuilder(context) .setTitle(R.string.BackupDialog_delete_backups) .setMessage(R.string.BackupDialog_disable_and_delete_all_local_backups) .setNegativeButton(android.R.string.cancel, null) diff --git a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java index 5a47013f67..39e3f6fb31 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java +++ b/app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java @@ -14,6 +14,7 @@ import androidx.annotation.WorkerThread; import androidx.appcompat.app.AlertDialog; import com.annimon.stream.Stream; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; @@ -126,7 +127,7 @@ public final class ContactUtil { values[i] = getPrettyPhoneNumber(choices.get(i).requireE164(), locale); } - new AlertDialog.Builder(context) + new MaterialAlertDialogBuilder(context) .setItems(values, ((dialog, which) -> callback.onSelected(choices.get(which)))) .create() .show(); 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 375fc16b4a..069f049d43 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -957,7 +957,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set messageRecords) { Context context = requireActivity(); int messagesCount = messageRecords.size(); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); + AlertDialog.Builder builder = new MaterialAlertDialogBuilder(getActivity()); builder.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount)); builder.setCancelable(true); @@ -1011,7 +1011,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) { deleteForEveryone.run(); } else { - new AlertDialog.Builder(requireActivity()) + new MaterialAlertDialogBuilder(requireActivity()) .setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation) .setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> { SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java index 77bef7c399..2111d69a3f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java @@ -20,6 +20,8 @@ import androidx.appcompat.app.AlertDialog; import androidx.core.app.TaskStackBuilder; import androidx.fragment.app.FragmentActivity; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; @@ -62,7 +64,7 @@ public class CommunicationActions { if (resultCode == 1) { startCallInternal(activity, recipient, false); } else { - new AlertDialog.Builder(activity) + new MaterialAlertDialogBuilder(activity) .setMessage(R.string.CommunicationActions_start_voice_call) .setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(activity, recipient, false)) .setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss())