rei-forks/element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

formatting

Browse Source
This commit is contained in:
Adam Brown 2022-06-09 17:42:42 +01:00
parent f2db4be479
commit bfa50f186a
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthGenericTextInputFormFragment.kt
View File

@ -224,7 +224,7 @@ class FtueAuthGenericTextInputFormFragment @Inject constructor() : AbstractFtueA
TextInputFormFragmentMode.SetEmail -> { TextInputFormFragmentMode.SetEmail -> {
views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable) views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable)
} }
TextInputFormFragmentMode.SetMsisdn -> { TextInputFormFragmentMode.SetMsisdn -> {
views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable) views.loginGenericTextInputFormTil.error = errorFormatter.toHumanReadable(throwable)
} }
TextInputFormFragmentMode.ConfirmMsisdn -> { TextInputFormFragmentMode.ConfirmMsisdn -> {

4
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthPhoneEntryFragment.kt
View File

@ -68,9 +68,9 @@ class FtueAuthPhoneEntryFragment @Inject constructor(
val number = views.phoneEntryInput.content() val number = views.phoneEntryInput.content()
when (val result = phoneNumberParser.parseInternationalNumber(number)) { when (val result = phoneNumberParser.parseInternationalNumber(number)) {
PhoneNumberParser.Result.ErrorInvalidNumber -> views.phoneEntryInput.error = getString(R.string.login_msisdn_error_other) PhoneNumberParser.Result.ErrorInvalidNumber -> views.phoneEntryInput.error = getString(R.string.login_msisdn_error_other)
PhoneNumberParser.Result.ErrorMissingInternationalCode -> views.phoneEntryInput.error = getString(R.string.login_msisdn_error_not_international) PhoneNumberParser.Result.ErrorMissingInternationalCode -> views.phoneEntryInput.error = getString(R.string.login_msisdn_error_not_international)
is PhoneNumberParser.Result.Success -> { is PhoneNumberParser.Result.Success -> {
val (countryCode, phoneNumber) = result val (countryCode, phoneNumber) = result
viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Msisdn(phoneNumber, countryCode)))) viewModel.handle(OnboardingAction.PostRegisterAction(RegisterAction.AddThreePid(RegisterThreePid.Msisdn(phoneNumber, countryCode))))
} }

10
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthVariant.kt
View File

@ -387,10 +387,10 @@ class FtueAuthVariant(
when (stage) { when (stage) {
is Stage.ReCaptcha -> onCaptcha(stage) is Stage.ReCaptcha -> onCaptcha(stage)
is Stage.Email -> onEmail(stage) is Stage.Email -> onEmail(stage)
is Stage.Msisdn -> onMsisdn(stage) is Stage.Msisdn -> onMsisdn(stage)
is Stage.Terms -> onTerms(stage) is Stage.Terms -> onTerms(stage)
else -> Unit // Should not happen else -> Unit // Should not happen
} }
} }
@ -399,7 +399,7 @@ class FtueAuthVariant(
vectorFeatures.isOnboardingCombinedRegisterEnabled() -> addRegistrationStageFragmentToBackstack( vectorFeatures.isOnboardingCombinedRegisterEnabled() -> addRegistrationStageFragmentToBackstack(
FtueAuthPhoneEntryFragment::class.java FtueAuthPhoneEntryFragment::class.java
) )
else -> addRegistrationStageFragmentToBackstack( else -> addRegistrationStageFragmentToBackstack(
FtueAuthGenericTextInputFormFragment::class.java, FtueAuthGenericTextInputFormFragment::class.java,
FtueAuthGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory), FtueAuthGenericTextInputFormFragmentArgument(TextInputFormFragmentMode.SetMsisdn, stage.mandatory),
) )

2
vector/src/main/java/im/vector/app/features/onboarding/ftueauth/PhoneNumberParser.kt
View File

@ -27,7 +27,7 @@ class PhoneNumberParser @Inject constructor(
fun parseInternationalNumber(rawPhoneNumber: String): Result { fun parseInternationalNumber(rawPhoneNumber: String): Result {
return when { return when {
rawPhoneNumber.doesNotStartWith("+") -> Result.ErrorMissingInternationalCode rawPhoneNumber.doesNotStartWith("+") -> Result.ErrorMissingInternationalCode
else -> parseNumber(rawPhoneNumber) else -> parseNumber(rawPhoneNumber)
} }
} }