mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Use MaterialAlertDialogBuilder in EditProxyFragment. 

Closes #12479
fork-5.53.8
Sgn-32 2022-09-27 17:54:05 +02:00 zatwierdzone przez Cody Henthorne
rodzic 7167ad331f
commit c652d83f81
1 zmienionych plików z 15 dodań i 14 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

29
app/src/main/java/org/thoughtcrime/securesms/preferences/EditProxyFragment.java
Wyświetl plik

@ -1,6 +1,5 @@
package org.thoughtcrime.securesms.preferences; package org.thoughtcrime.securesms.preferences;
import android.app.AlertDialog;
import android.os.Bundle; import android.os.Bundle;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -16,6 +15,8 @@ import androidx.core.app.ShareCompat;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher; import org.thoughtcrime.securesms.contactshare.SimpleTextWatcher;
import org.thoughtcrime.securesms.keyvalue.SignalStore; import org.thoughtcrime.securesms.keyvalue.SignalStore;
@ -147,24 +148,24 @@ public class EditProxyFragment extends Fragment {
case PROXY_SUCCESS: case PROXY_SUCCESS:
proxyStatus.setVisibility(View.VISIBLE); proxyStatus.setVisibility(View.VISIBLE);
proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse("")); proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse(""));
new AlertDialog.Builder(requireContext()) new MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.preferences_success) .setTitle(R.string.preferences_success)
.setMessage(R.string.preferences_you_are_connected_to_the_proxy) .setMessage(R.string.preferences_you_are_connected_to_the_proxy)
.setPositiveButton(android.R.string.ok, (d, i) -> { .setPositiveButton(android.R.string.ok, (d, i) -> {
requireActivity().onBackPressed(); requireActivity().onBackPressed();
d.dismiss(); d.dismiss();
}) })
.show(); .show();
break; break;
case PROXY_FAILURE: case PROXY_FAILURE:
proxyStatus.setVisibility(View.INVISIBLE); proxyStatus.setVisibility(View.INVISIBLE);
proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse("")); proxyText.setText(Optional.ofNullable(SignalStore.proxy().getProxy()).map(SignalProxy::getHost).orElse(""));
ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(proxyText); ViewUtil.focusAndMoveCursorToEndAndOpenKeyboard(proxyText);
new AlertDialog.Builder(requireContext()) new MaterialAlertDialogBuilder(requireContext())
.setTitle(R.string.preferences_failed_to_connect) .setTitle(R.string.preferences_failed_to_connect)
.setMessage(R.string.preferences_couldnt_connect_to_the_proxy) .setMessage(R.string.preferences_couldnt_connect_to_the_proxy)
.setPositiveButton(android.R.string.ok, (d, i) -> d.dismiss()) .setPositiveButton(android.R.string.ok, (d, i) -> d.dismiss())
.show(); .show();
break; break;
} }
} }