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

Fix state exception when registering without play services.

Browse source
This commit is contained in:
Cody Henthorne 2024-09-12 14:48:12 -04:00
parent e80ebd87fe
commit 5647215659
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/org/thoughtcrime/securesms/registration/ui/phonenumber/EnterPhoneNumberFragment.kt
View file

@ -41,6 +41,7 @@ import org.thoughtcrime.securesms.LoggingFragment
import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.R
import org.thoughtcrime.securesms.components.ViewBinderDelegate import org.thoughtcrime.securesms.components.ViewBinderDelegate
import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberBinding import org.thoughtcrime.securesms.databinding.FragmentRegistrationEnterPhoneNumberBinding
import org.thoughtcrime.securesms.dependencies.AppDependencies
import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter import org.thoughtcrime.securesms.phonenumbers.PhoneNumberFormatter
import org.thoughtcrime.securesms.registration.data.RegistrationRepository import org.thoughtcrime.securesms.registration.data.RegistrationRepository
import org.thoughtcrime.securesms.registration.data.network.Challenge import org.thoughtcrime.securesms.registration.data.network.Challenge
@ -570,18 +571,22 @@ class EnterPhoneNumberFragment : LoggingFragment(R.layout.fragment_registration_
} }
private fun handlePromptForNoPlayServices() { private fun handlePromptForNoPlayServices() {
Log.d(TAG, "Device does not have Play Services, showing consent dialog.") val context = activity
MaterialAlertDialogBuilder(requireContext()).apply {
setTitle(R.string.RegistrationActivity_missing_google_play_services) if (context != null) {
setMessage(R.string.RegistrationActivity_this_device_is_missing_google_play_services) Log.d(TAG, "Device does not have Play Services, showing consent dialog.")
setPositiveButton(R.string.RegistrationActivity_i_understand) { _, _ -> MaterialAlertDialogBuilder(context).apply {
Log.d(TAG, "User confirmed number.") setTitle(R.string.RegistrationActivity_missing_google_play_services)
sharedViewModel.onUserConfirmedPhoneNumber(requireContext()) setMessage(R.string.RegistrationActivity_this_device_is_missing_google_play_services)
setPositiveButton(R.string.RegistrationActivity_i_understand) { _, _ ->
Log.d(TAG, "User confirmed number.")
sharedViewModel.onUserConfirmedPhoneNumber(AppDependencies.application)
}
setNegativeButton(android.R.string.cancel, null)
setOnCancelListener { fragmentViewModel.clearError() }
setOnDismissListener { fragmentViewModel.clearError() }
show()
} }
setNegativeButton(android.R.string.cancel, null)
setOnCancelListener { fragmentViewModel.clearError() }
setOnDismissListener { fragmentViewModel.clearError() }
show()
} }
} }