Show AlertDialogs for registration errors.

signalapp · Nov 30, 2022 · cff3840 · cff3840
1 parent a46fc96
commit cff3840
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/...main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java b/...main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
@@ -11,7 +11,6 @@
 import android.view.ViewGroup;
 import android.widget.ScrollView;
 import android.widget.Spinner;
-import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -146,12 +145,12 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
 
   private void handleRegister(@NonNull Context context) {
     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;
     }
 
     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;
     }
 
@@ -255,7 +254,7 @@ private void requestVerificationCode(@NonNull Mode mode) {
                                       SafeNavigation.safeNavigate(navController, EnterPhoneNumberFragmentDirections.actionRequestCaptcha());
                                     } else if (processor.rateLimit()) {
                                       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()) {
                                       Log.w(TAG, "Impossible number", processor.getError());
                                       Dialogs.showAlertDialog(requireContext(),
@@ -265,7 +264,7 @@ private void requestVerificationCode(@NonNull Mode mode) {
                                       handleNonNormalizedNumberError(processor.getOriginalNumber(), processor.getNormalizedNumber(), mode);
                                     } else {
                                       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();
@@ -275,6 +274,10 @@ private void requestVerificationCode(@NonNull Mode mode) {
     disposables.add(request);
   }
 
+  public void showErrorDialog(Context context, String msg) {
+    new MaterialAlertDialogBuilder(context).setMessage(msg).setPositiveButton(R.string.ok, null).show();
+  }
+
   @Override
   public void onNumberFocused() {
     scrollView.postDelayed(() -> scrollView.smoothScrollTo(0, register.getBottom()), 250);