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

Replace use of AlertDialog.Builder with MaterialAlertDialogBuilder.

Browse source
This commit is contained in:
Sgn-32 2022-03-29 22:16:30 +02:00 • committed by Cody Henthorne
parent ae28df901f
commit 48d7228ae7
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/org/thoughtcrime/securesms/backup/BackupDialog.java
View file

@ -23,6 +23,8 @@ import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.keyvalue.SignalStore;
@ -110,7 +112,7 @@ public class BackupDialog {
@RequiresApi(29) @RequiresApi(29)
public static void showChooseBackupLocationDialog(@NonNull Fragment fragment, int requestCode) { 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) .setView(R.layout.backup_choose_location_dialog)
.setCancelable(true) .setCancelable(true)
.setNegativeButton(android.R.string.cancel, (dialog, which) -> { .setNegativeButton(android.R.string.cancel, (dialog, which) -> {
@ -141,7 +143,7 @@ public class BackupDialog {
} }
public static void showDisableBackupDialog(@NonNull Context context, @NonNull Runnable onBackupsDisabled) { public static void showDisableBackupDialog(@NonNull Context context, @NonNull Runnable onBackupsDisabled) {
new AlertDialog.Builder(context) new MaterialAlertDialogBuilder(context)
.setTitle(R.string.BackupDialog_delete_backups) .setTitle(R.string.BackupDialog_delete_backups)
.setMessage(R.string.BackupDialog_disable_and_delete_all_local_backups) .setMessage(R.string.BackupDialog_disable_and_delete_all_local_backups)
.setNegativeButton(android.R.string.cancel, null) .setNegativeButton(android.R.string.cancel, null)

3
app/src/main/java/org/thoughtcrime/securesms/contactshare/ContactUtil.java
View file

@ -14,6 +14,7 @@ import androidx.annotation.WorkerThread;
import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import com.annimon.stream.Stream; import com.annimon.stream.Stream;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import com.google.i18n.phonenumbers.NumberParseException; import com.google.i18n.phonenumbers.NumberParseException;
import com.google.i18n.phonenumbers.PhoneNumberUtil; import com.google.i18n.phonenumbers.PhoneNumberUtil;
import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber;
@ -126,7 +127,7 @@ public final class ContactUtil {
values[i] = getPrettyPhoneNumber(choices.get(i).requireE164(), locale); values[i] = getPrettyPhoneNumber(choices.get(i).requireE164(), locale);
} }
new AlertDialog.Builder(context) new MaterialAlertDialogBuilder(context)
.setItems(values, ((dialog, which) -> callback.onSelected(choices.get(which)))) .setItems(values, ((dialog, which) -> callback.onSelected(choices.get(which))))
.create() .create()
.show(); .show();

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

@ -957,7 +957,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set<MessageRecord> messageRecords) { private AlertDialog.Builder buildRemoteDeleteConfirmationDialog(Set<MessageRecord> messageRecords) {
Context context = requireActivity(); Context context = requireActivity();
int messagesCount = messageRecords.size(); 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.setTitle(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_delete_selected_messages, messagesCount, messagesCount));
builder.setCancelable(true); builder.setCancelable(true);
@ -1011,7 +1011,7 @@ public class ConversationFragment extends LoggingFragment implements Multiselect
if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) { if (SignalStore.uiHints().hasConfirmedDeleteForEveryoneOnce()) {
deleteForEveryone.run(); deleteForEveryone.run();
} else { } else {
new AlertDialog.Builder(requireActivity()) new MaterialAlertDialogBuilder(requireActivity())
.setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation) .setMessage(R.string.ConversationFragment_this_message_will_be_deleted_for_everyone_in_the_conversation)
.setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> { .setPositiveButton(R.string.ConversationFragment_delete_for_everyone, (dialog, which) -> {
SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce(); SignalStore.uiHints().markHasConfirmedDeleteForEveryoneOnce();

4
app/src/main/java/org/thoughtcrime/securesms/util/CommunicationActions.java
View file

@ -20,6 +20,8 @@ import androidx.appcompat.app.AlertDialog;
import androidx.core.app.TaskStackBuilder; import androidx.core.app.TaskStackBuilder;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.signal.core.util.concurrent.SignalExecutors; import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log; import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -62,7 +64,7 @@ public class CommunicationActions {
if (resultCode == 1) { if (resultCode == 1) {
startCallInternal(activity, recipient, false); startCallInternal(activity, recipient, false);
} else { } else {
new AlertDialog.Builder(activity) new MaterialAlertDialogBuilder(activity)
.setMessage(R.string.CommunicationActions_start_voice_call) .setMessage(R.string.CommunicationActions_start_voice_call)
.setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(activity, recipient, false)) .setPositiveButton(R.string.CommunicationActions_call, (d, w) -> startCallInternal(activity, recipient, false))
.setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss()) .setNegativeButton(R.string.CommunicationActions_cancel, (d, w) -> d.dismiss())