From 9232eb7c165cea87bfb091372df2a4b73922475b Mon Sep 17 00:00:00 2001 From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com> Date: Fri, 20 Aug 2021 22:20:19 +0200 Subject: [PATCH] Replace use of AlertDialog.Builder with MaterialAlertDialogBuilder. --- .../org/thoughtcrime/securesms/contactshare/ContactUtil.java | 3 ++- .../securesms/conversation/ConversationActivity.java | 4 ++-- .../securesms/conversation/ConversationFragment.java | 4 ++-- .../securesms/logsubmit/SubmitDebugLogActivity.java | 3 ++- .../org/thoughtcrime/securesms/util/SaveAttachmentTask.java | 4 +++- 5 files changed, 11 insertions(+), 7 deletions(-) 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 0ec507f85..6ffe825ad 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/ConversationActivity.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java index 7cf2b45ea..14326dcce 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationActivity.java @@ -1265,7 +1265,7 @@ public class ConversationActivity extends PassphraseRequiredActivity } private void handleResetSecureSession() { - AlertDialog.Builder builder = new AlertDialog.Builder(this); + AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this); builder.setTitle(R.string.ConversationActivity_reset_secure_session_question); builder.setIcon(R.drawable.ic_warning); builder.setCancelable(true); @@ -2599,7 +2599,7 @@ public class ConversationActivity extends PassphraseRequiredActivity numberItems[i] = contactData.numbers.get(i).type + ": " + contactData.numbers.get(i).number; } - AlertDialog.Builder builder = new AlertDialog.Builder(this); + AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this); builder.setIcon(R.drawable.ic_account_box); builder.setTitle(R.string.ConversationActivity_select_contact_info); 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 d0ef8d80a..8cc5bb575 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationFragment.java @@ -902,7 +902,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); @@ -956,7 +956,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/logsubmit/SubmitDebugLogActivity.java b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java index 2c48d27b0..4dfc36a2c 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java +++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/SubmitDebugLogActivity.java @@ -21,6 +21,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.dd.CircularProgressButton; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.thoughtcrime.securesms.BaseActivity; import org.thoughtcrime.securesms.R; @@ -225,7 +226,7 @@ public class SubmitDebugLogActivity extends BaseActivity implements SubmitDebugL } private void presentResultDialog(@NonNull String url) { - AlertDialog.Builder builder = new AlertDialog.Builder(this) + AlertDialog.Builder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.SubmitDebugLogActivity_success) .setCancelable(false) .setNeutralButton(android.R.string.ok, (d, w) -> finish()) diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java index 62dc95e7b..65a28f591 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java +++ b/app/src/main/java/org/thoughtcrime/securesms/util/SaveAttachmentTask.java @@ -18,6 +18,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.signal.core.util.StreamUtil; import org.signal.core.util.logging.Log; import org.thoughtcrime.securesms.R; @@ -348,7 +350,7 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask