Skip to content

Avoiding ANR that may occur during login #3192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DaVinci9196 wants to merge 1 commit into
base: master
Choose a base branch
from
+21 −5
Open

Avoiding ANR that may occur during login #3192

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions play-services-core/src/main/kotlin/org/microg/gms/auth/login/DroidGuardHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,36 @@

package org.microg.gms.auth.login

import android.util.Log
import androidx.lifecycle.lifecycleScope
import com.google.android.gms.droidguard.DroidGuardClient
import com.google.android.gms.tasks.await
import java.util.*
import com.google.android.gms.tasks.Tasks
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import java.util.Collections
import java.util.concurrent.TimeUnit

private const val TAG = "DroidGuardHandler"

class DroidGuardHandler(private val activity: LoginActivity) {
fun start(dg: String) {
activity.lifecycleScope.launchWhenStarted {
activity.lifecycleScope.launch {
Log.d(TAG, "getDroidGuardResult start ${Thread.currentThread().name}")
val start = System.currentTimeMillis()
try {
val result = DroidGuardClient.getResults(activity, "minute_maid", Collections.singletonMap("dg_minutemaid", dg)).await()
activity.runScript("window.setDgResult('$result')")
val result = withContext(Dispatchers.IO) {
val resultTask = DroidGuardClient.getResults(activity, "minute_maid", Collections.singletonMap("dg_minutemaid", dg))
Tasks.await(resultTask, 5000, TimeUnit.MILLISECONDS)
}
Log.d(TAG, "start: result: $result")
withContext(Dispatchers.Main) {
activity.runScript("window.setDgResult('$result')")
}
} catch (e: Exception) {
// Ignore
}
Log.d(TAG, "getDroidGuardResult end " + (System.currentTimeMillis() - start))
}
}
}