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

Show AlertDialogs for registration errors.

main
Nicholas 2022-11-22 10:28:49 -05:00 zatwierdzone przez Cody Henthorne
rodzic a46fc96ff1
commit cff3840c51
1 zmienionych plików z 8 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
Wyświetl plik

@ -11,7 +11,6 @@ import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -146,12 +145,12 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
private void handleRegister(@NonNull Context context) { private void handleRegister(@NonNull Context context) {
if (TextUtils.isEmpty(countryCode.getText())) { if (TextUtils.isEmpty(countryCode.getText())) {
Toast.makeText(context, getString(R.string.RegistrationActivity_you_must_specify_your_country_code), Toast.LENGTH_LONG).show(); showErrorDialog(context, getString(R.string.RegistrationActivity_you_must_specify_your_country_code));
return; return;
} }
if (TextUtils.isEmpty(this.number.getText())) { if (TextUtils.isEmpty(this.number.getText())) {
Toast.makeText(context, getString(R.string.RegistrationActivity_you_must_specify_your_phone_number), Toast.LENGTH_LONG).show(); showErrorDialog(context, getString(R.string.RegistrationActivity_you_must_specify_your_phone_number));
return; return;
} }
@ -255,7 +254,7 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionRequestCaptcha()); SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionRequestCaptcha());
} else if (processor.rateLimit()) { } else if (processor.rateLimit()) {
Log.i(TAG, "Unable to request sms code due to rate limit"); Log.i(TAG, "Unable to request sms code due to rate limit");
Toast.makeText(register.getContext(), R.string.RegistrationActivity_rate_limited_to_service, Toast.LENGTH_LONG).show(); showErrorDialog(register.getContext(), getString(R.string.RegistrationActivity_rate_limited_to_service));
} else if (processor.isImpossibleNumber()) { } else if (processor.isImpossibleNumber()) {
Log.w(TAG, "Impossible number", processor.getError()); Log.w(TAG, "Impossible number", processor.getError());
Dialogs.showAlertDialog(requireContext(), Dialogs.showAlertDialog(requireContext(),
@ -265,7 +264,7 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
handleNonNormalizedNumberError(processor.getOriginalNumber(), processor.getNormalizedNumber(), mode); handleNonNormalizedNumberError(processor.getOriginalNumber(), processor.getNormalizedNumber(), mode);
} else { } else {
Log.i(TAG, "Unknown error during verification code request", processor.getError()); Log.i(TAG, "Unknown error during verification code request", processor.getError());
Toast.makeText(register.getContext(), R.string.RegistrationActivity_unable_to_connect_to_service, Toast.LENGTH_LONG).show(); showErrorDialog(register.getContext(), getString(R.string.RegistrationActivity_unable_to_connect_to_service));
} }
register.cancelSpinning(); register.cancelSpinning();
@ -275,6 +274,10 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
disposables.add(request); disposables.add(request);
} }
public void showErrorDialog(Context context, String msg) {
new MaterialAlertDialogBuilder(context).setMessage(msg).setPositiveButton(R.string.ok, null).show();
}
@Override @Override
public void onNumberFocused() { public void onNumberFocused() {
scrollView.postDelayed(() -> scrollView.smoothScrollTo(0, register.getBottom()), 250); scrollView.postDelayed(() -> scrollView.smoothScrollTo(0, register.getBottom()), 250);