From c652d83f818ba7b446dc068ae39f9ee681acaff3 Mon Sep 17 00:00:00 2001 From: Sgn-32 <49990901+Sgn-32@users.noreply.github.com> Date: Tue, 27 Sep 2022 17:54:05 +0200 Subject: [PATCH] Use MaterialAlertDialogBuilder in EditProxyFragment. Closes #12479 --- .../preferences/EditProxyFragment.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java index 2539a165e..1e11a660f 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java +++ b/app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java @@ -1,6 +1,5 @@ package org.thoughtcrime.securesms.preferences; -import android.app.AlertDialog; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -16,6 +15,8 @@ import androidx.core.app.ShareCompat; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.keyvalue.SignalStore; @@ -147,24 +148,24 @@ public class EditProxyFragment extends Fragment { case PROXY_SUCCESS: proxyStatus.setVisibility(View.VISIBLE); proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse("")); - new AlertDialog.Builder(requireContext()) - .setTitle(R.string.preferences_success) - .setMessage(R.string.preferences_you_are_connected_to_the_proxy) - .setPositiveButton(android.R.string.ok, (d, i) -> { - requireActivity().onBackPressed(); - d.dismiss(); - }) - .show(); + new MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.preferences_success) + .setMessage(R.string.preferences_you_are_connected_to_the_proxy) + .setPositiveButton(android.R.string.ok, (d, i) -> { + requireActivity().onBackPressed(); + d.dismiss(); + }) + .show(); break; case PROXY_FAILURE: proxyStatus.setVisibility(View.INVISIBLE); proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse("")); ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(proxyText); - new AlertDialog.Builder(requireContext()) - .setTitle(R.string.preferences_failed_to_connect) - .setMessage(R.string.preferences_couldnt_connect_to_the_proxy) - .setPositiveButton(android.R.string.ok, (d, i) -> d.dismiss()) - .show(); + new MaterialAlertDialogBuilder(requireContext()) + .setTitle(R.string.preferences_failed_to_connect) + .setMessage(R.string.preferences_couldnt_connect_to_the_proxy) + .setPositiveButton(android.R.string.ok, (d, i) -> d.dismiss()) + .show(); break; } }