yetangitu/opentimelimit-android
1
0
Fork 0
mirror of https://codeberg.org/timelimit/opentimelimit-android.git synced 2025-10-05 10:49:29 +02:00
Code Issues Projects Releases Wiki Activity

Optimize foreground app detection

Browse source
This commit is contained in:
Jonas L 2019-01-31 16:14:49 +01:00
parent 22130c2ff6
commit 9e19582bdd
1 changed files with 29 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

43
app/src/main/java/io/timelimit/android/integration/platform/android/foregroundapp/LollipopForegroundAppHelper.kt
View file

@ -21,7 +21,6 @@ import android.app.usage.UsageEvents
import android.app.usage.UsageStatsManager import android.app.usage.UsageStatsManager
import android.content.Context import android.content.Context
import android.os.Build import android.os.Build
import io.timelimit.android.async.Threads
import io.timelimit.android.coroutines.executeAndWait import io.timelimit.android.coroutines.executeAndWait
import io.timelimit.android.integration.platform.RuntimePermissionStatus import io.timelimit.android.integration.platform.RuntimePermissionStatus
import java.util.concurrent.Executor import java.util.concurrent.Executor
@ -36,6 +35,11 @@ class LollipopForegroundAppHelper(private val context: Context) : ForegroundAppH
private val usageStatsManager = context.getSystemService(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) Context.USAGE_STATS_SERVICE else "usagestats") as UsageStatsManager private val usageStatsManager = context.getSystemService(if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) Context.USAGE_STATS_SERVICE else "usagestats") as UsageStatsManager
private val appOpsManager = context.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager private val appOpsManager = context.getSystemService(Context.APP_OPS_SERVICE) as AppOpsManager
private var lastQueryTime: Long = 0
private var lastPackage: String? = null
private var lastPackageTime: Long = 0
private val event = UsageEvents.Event()
@Throws(SecurityException::class) @Throws(SecurityException::class)
override suspend fun getForegroundAppPackage(): String? { override suspend fun getForegroundAppPackage(): String? {
if (getPermissionStatus() == RuntimePermissionStatus.NotGranted) { if (getPermissionStatus() == RuntimePermissionStatus.NotGranted) {
@ -43,31 +47,42 @@ class LollipopForegroundAppHelper(private val context: Context) : ForegroundAppH
} }
return foregroundAppThread.executeAndWait { return foregroundAppThread.executeAndWait {
val time = System.currentTimeMillis() val now = System.currentTimeMillis()
// query data for last 7 days
val usageEvents = usageStatsManager.queryEvents(time - 1000 * 60 * 60 * 24 * 7, time)
if (usageEvents != null) { if (lastQueryTime > now) {
val event = UsageEvents.Event() // if the time went backwards, forget everything
lastQueryTime = 0
lastPackage = null
lastPackageTime = 0
}
var lastTime: Long = 0 val queryStartTime = if (lastQueryTime == 0L) {
var lastPackage: String? = null // query data for last 7 days
now - 1000 * 60 * 60 * 24 * 7
} else {
// query data since last query
// note: when the duration is too small, Android returns no data
// due to that, 1 second more than required is queried
// which seems to provide all data
lastQueryTime - 1000
}
usageStatsManager.queryEvents(queryStartTime, now)?.let { usageEvents ->
while (usageEvents.hasNextEvent()) { while (usageEvents.hasNextEvent()) {
usageEvents.getNextEvent(event) usageEvents.getNextEvent(event)
if (event.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND) { if (event.eventType == UsageEvents.Event.MOVE_TO_FOREGROUND) {
if (event.timeStamp > lastTime) { if (event.timeStamp > lastPackageTime) {
lastTime = event.timeStamp lastPackageTime = event.timeStamp
lastPackage = event.packageName lastPackage = event.packageName
} }
} }
} }
lastPackage
} else {
null
} }
lastQueryTime = now
lastPackage
} }
} }