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

Fix blocking home screen with the accessibility service enabled

Browse source
This commit is contained in:
Jonas L 2019-04-15 00:00:00 +00:00
parent d3403b6866
commit 5128e3587e
4 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt
View file

@ -29,6 +29,7 @@ abstract class PlatformIntegration(
abstract fun getLocalAppActivities(deviceId: String): Collection<AppActivity> abstract fun getLocalAppActivities(deviceId: String): Collection<AppActivity>
abstract fun getLocalAppTitle(packageName: String): String? abstract fun getLocalAppTitle(packageName: String): String?
abstract fun getAppIcon(packageName: String): Drawable? abstract fun getAppIcon(packageName: String): Drawable?
abstract fun getLauncherAppPackageName(): String?
abstract fun getCurrentProtectionLevel(): ProtectionLevel abstract fun getCurrentProtectionLevel(): ProtectionLevel
abstract fun getForegroundAppPermissionStatus(): RuntimePermissionStatus abstract fun getForegroundAppPermissionStatus(): RuntimePermissionStatus
abstract fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus abstract fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus

6
app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt
View file

@ -101,6 +101,12 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
return AndroidIntegrationApps.getAppIcon(packageName, context) return AndroidIntegrationApps.getAppIcon(packageName, context)
} }
override fun getLauncherAppPackageName(): String? {
return Intent(Intent.ACTION_MAIN)
.addCategory(Intent.CATEGORY_HOME)
.resolveActivity(context.packageManager)?.packageName
}
override fun getCurrentProtectionLevel(): ProtectionLevel { override fun getCurrentProtectionLevel(): ProtectionLevel {
return AdminStatus.getAdminStatus(context, policyManager) return AdminStatus.getAdminStatus(context, policyManager)
} }

2
app/src/main/java/io/timelimit/android/integration/platform/dummy/DummyIntegration.kt
View file

@ -50,6 +50,8 @@ class DummyIntegration(
return null return null
} }
override fun getLauncherAppPackageName(): String? = null
override fun getCurrentProtectionLevel(): ProtectionLevel { override fun getCurrentProtectionLevel(): ProtectionLevel {
return protectionLevel return protectionLevel
} }

6
app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt
View file

@ -146,8 +146,10 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
appLogic.platformIntegration.setShowBlockingOverlay(true) appLogic.platformIntegration.setShowBlockingOverlay(true)
if (appLogic.platformIntegration.isAccessibilityServiceEnabled()) { if (appLogic.platformIntegration.isAccessibilityServiceEnabled()) {
AccessibilityService.instance?.showHomescreen() if (blockedAppPackageName != appLogic.platformIntegration.getLauncherAppPackageName()) {
delay(100) AccessibilityService.instance?.showHomescreen()
delay(100)
}
} }
appLogic.platformIntegration.showAppLockScreen(blockedAppPackageName, blockedAppActivityName) appLogic.platformIntegration.showAppLockScreen(blockedAppPackageName, blockedAppActivityName)