Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-24 13:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Catch possible ISE at end of re-registration.

Browse Source
This commit is contained in:
Nicholas Tinsley
2024-04-12 17:49:37 -04:00
committed by Greyson Parrelli
parent d36b2a23f5
commit 29b3f09d8a
1 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/thoughtcrime/securesms/registration/fragments/ReRegisterWithPinFragment.kt
View File

@@ -7,6 +7,7 @@ import android.view.inputmethod.EditorInfo
import android.widget.Toast
import androidx.fragment.app.activityViewModels
import androidx.fragment.app.viewModels
import androidx.navigation.Navigation
import androidx.navigation.fragment.findNavController
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import org.signal.core.util.concurrent.LifecycleDisposable
@@ -119,7 +120,30 @@ class ReRegisterWithPinFragment : LoggingFragment(R.layout.pin_restore_entry_fra
.subscribe { processor ->
if (processor.hasResult()) {
Log.i(TAG, "Successfully re-registered via skip flow")
findNavController().safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
try {
findNavController().safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
return@subscribe
} catch (ise: IllegalStateException) {
Log.w(TAG, "Could not get parent activity fragment manager!")
}
try {
val hostActivity = activity
if (hostActivity != null) {
Navigation.findNavController(hostActivity, R.id.nav_host_fragment).safeNavigate(R.id.action_reRegisterWithPinFragment_to_registrationCompletePlaceHolderFragment)
return@subscribe
} else {
Log.w(TAG, "Could not get parent activity!")
}
} catch (ise: IllegalStateException) {
Log.w(TAG, "Could not find navigation host fragment!")
}
activity?.let {
Log.w(TAG, "Could not navigate to registration complete. Finishing activity gracefully.")
it.finish()
}
return@subscribe
}