Auth: Catch exceptions in AssistedSignInFragment (#2446)

Fixes #2424
microg · Aug 5, 2024 · 75a23ed · 75a23ed
1 parent ad6d93b
commit 75a23ed
Showing 1 changed file with 23 additions and 12 deletions.
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AssistedSignInFragment.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/signin/AssistedSignInFragment.kt
@@ -82,11 +82,17 @@ class AssistedSignInFragment(
     private fun filterAccountsLogin(multiMethod: (List<Account>) -> Unit, loginMethod: (Account, Boolean) -> Unit) {
         lifecycleScope.launch {
             val allowAutoLoginAccounts = mutableListOf<Account>()
-            accounts.forEach { account ->
-                val authStatus = checkAppAuthStatus(requireContext(), clientPackageName, options, account)
-                if (authStatus) {
-                    allowAutoLoginAccounts.add(account)
+            runCatching {
+                accounts.forEach { account ->
+                    val authStatus = checkAppAuthStatus(requireContext(), clientPackageName, options, account)
+                    if (authStatus) {
+                        allowAutoLoginAccounts.add(account)
+                    }
                 }
+            }.onFailure {
+                Log.d(TAG, "filterAccountsLogin: error", it)
+                errorBlock(Status(CommonStatusCodes.INTERNAL_ERROR, "auth error"))
+                return@launch
             }
             if (accounts.size == 1) {
                 loginMethod(accounts.first(), allowAutoLoginAccounts.isNotEmpty())
@@ -255,15 +261,20 @@ class AssistedSignInFragment(
             lastChooseAccountPermitted = permitted
             isSigningIn = true
             delay(3000)
-            val googleSignInAccount = withContext(Dispatchers.IO) {
-                performSignIn(requireContext(), clientPackageName, options, account, permitted)
-            }
-            if (googleSignInAccount == null) {
-                isSigningIn = false
-                prepareChooseLogin(account, showConsent = true, permitted = true)
-                return@launch
+            runCatching {
+                val googleSignInAccount = withContext(Dispatchers.IO) {
+                    performSignIn(requireContext(), clientPackageName, options, account, permitted)
+                }
+                if (googleSignInAccount == null) {
+                    isSigningIn = false
+                    prepareChooseLogin(account, showConsent = true, permitted = true)
+                    return@launch
+                }
+                loginBlock(googleSignInAccount)
+            }.onFailure {
+                Log.d(TAG, "startLogin: error", it)
+                errorBlock(Status(CommonStatusCodes.INTERNAL_ERROR, "signIn error"))
             }
-            loginBlock(googleSignInAccount)
         }
     }