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

Restore entered phone number post-captcha.

Browse source
This commit is contained in:
Nicholas 2023-02-15 11:08:22 -05:00 • committed by Greyson Parrelli
parent 2bff2d3a30
commit 6fbfb87bd6
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/EnterPhoneNumberFragment.java
View file

@ -10,10 +10,8 @@ import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText;
import android.widget.ScrollView; import android.widget.ScrollView;
import android.widget.Spinner;
import android.widget.Toast;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.ActionBar;
@ -116,7 +114,7 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
cancel.setVisibility(View.GONE); cancel.setVisibility(View.GONE);
} }
viewModel.getLiveNumber().observe(getViewLifecycleOwner(), controller::updateNumber); viewModel.getLiveNumber().observe(getViewLifecycleOwner(), controller::updateNumberFormatter);
if (viewModel.hasCaptchaToken()) { if (viewModel.hasCaptchaToken()) {
ThreadUtil.runOnMainDelayed(() -> handleRegister(requireContext()), 250); ThreadUtil.runOnMainDelayed(() -> handleRegister(requireContext()), 250);
@ -129,6 +127,7 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
supportActionBar.setTitle(null); supportActionBar.setTitle(null);
} }
controller.prepopulateCountryCode(); controller.prepopulateCountryCode();
controller.setNumberAndCountryCode(viewModel.getNumber());
showKeyboard(number.getEditText()); showKeyboard(number.getEditText());
} }
@ -159,7 +158,7 @@ public final class EnterPhoneNumberFragment extends LoggingFragment implements R
return; return;
} }
if (TextUtils.isEmpty(this.number.getEditText().getText())) { if (TextUtils.isEmpty(viewModel.getNumber().getNationalNumber())) {
showErrorDialog(context, getString(R.string.RegistrationActivity_please_enter_a_valid_phone_number_to_register)); showErrorDialog(context, getString(R.string.RegistrationActivity_please_enter_a_valid_phone_number_to_register));
return; return;
} }

16
app/src/main/java/org/thoughtcrime/securesms/registration/util/RegistrationNumberInputController.kt
View file

@ -73,7 +73,21 @@ class RegistrationNumberInputController(
} }
} }
fun updateNumber(numberViewState: NumberViewState) { fun setNumberAndCountryCode(numberViewState: NumberViewState) {
val countryCode = numberViewState.countryCode
isUpdating = true
phoneNumberInputLayout.setText(numberViewState.nationalNumber)
if (numberViewState.countryCode != 0) {
spinnerView.setText(supportedCountryPrefixes.first { it.digits == numberViewState.countryCode }.toString())
}
val regionCode = PhoneNumberUtil.getInstance().getRegionCodeForCountryCode(countryCode)
setCountryFormatter(regionCode)
isUpdating = false
}
fun updateNumberFormatter(numberViewState: NumberViewState) {
val countryCode = numberViewState.countryCode val countryCode = numberViewState.countryCode
isUpdating = true isUpdating = true