Fix crash during sign-in when SafetyNet is disabled

microg · Nov 2, 2022 · 3d46e80 · 3d46e80
1 parent cedd205
commit 3d46e80
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/play-services-core/src/main/kotlin/org/microg/gms/auth/login/DroidGuardHandler.kt b/play-services-core/src/main/kotlin/org/microg/gms/auth/login/DroidGuardHandler.kt
@@ -14,9 +14,13 @@ import java.util.*
 class DroidGuardHandler(private val activity: LoginActivity) {
     fun start(dg: String) {
         activity.lifecycleScope.launchWhenStarted {
-            val result = getResult(activity, "minute_maid", Collections.singletonMap("dg_minutemaid", dg))
-                .toBase64(Base64.NO_WRAP, Base64.NO_PADDING, Base64.URL_SAFE)
-            activity.runScript("window.setDgResult('$result')");
+            try {
+                val result = getResult(activity, "minute_maid", Collections.singletonMap("dg_minutemaid", dg))
+                    .toBase64(Base64.NO_WRAP, Base64.NO_PADDING, Base64.URL_SAFE)
+                activity.runScript("window.setDgResult('$result')")
+            } catch (e: Exception) {
+                // Ignore
+            }
         }
     }
 }