Fix login page flickering

microg · Sep 11, 2024 · 9266119 · 9266119
1 parent 108bd88
commit 9266119
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/...es-core/src/main/kotlin/org/microg/gms/auth/credentials/identity/IdentitySignInService.kt b/...es-core/src/main/kotlin/org/microg/gms/auth/credentials/identity/IdentitySignInService.kt
@@ -24,6 +24,7 @@ import com.google.android.gms.auth.api.identity.internal.IGetSignInIntentCallbac
 import com.google.android.gms.auth.api.identity.internal.ISignInService
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import com.google.android.gms.common.ConnectionResult
+import com.google.android.gms.common.api.CommonStatusCodes
 import com.google.android.gms.common.api.Status
 import com.google.android.gms.common.api.internal.IStatusCallback
 import com.google.android.gms.common.internal.ConnectionInfo
@@ -76,6 +77,12 @@ class IdentitySignInServiceImpl(private val context: Context, private val client
         Log.d(TAG, "method 'beginSignIn' called")
         Log.d(TAG, "request-> $request")
         if (request.googleIdTokenRequestOptions.isSupported) {
+            val accounts = AccountManager.get(context).getAccountsByType(AuthConstants.DEFAULT_ACCOUNT_TYPE)
+            if (accounts.isEmpty()) {
+                Log.d(TAG, "accounts is empty, return CANCELED ")
+                callback.onResult(Status.CANCELED, null)
+                return
+            }
             if (request.googleIdTokenRequestOptions.serverClientId.isNullOrEmpty()) {
                 Log.d(TAG, "serverClientId is empty, return CANCELED ")
                 callback.onResult(Status.CANCELED, null)