diff --git a/app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt b/app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt index 447b4ec..a82cce8 100644 --- a/app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt +++ b/app/src/main/java/io/timelimit/android/integration/platform/PlatformIntegration.kt @@ -38,7 +38,6 @@ abstract class PlatformIntegration( abstract fun getForegroundAppPermissionStatus(): RuntimePermissionStatus abstract fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus abstract fun getNotificationAccessPermissionStatus(): NewPermissionStatus - abstract fun getOverlayPermissionStatus(): RuntimePermissionStatus abstract fun isAccessibilityServiceEnabled(): Boolean abstract fun disableDeviceAdmin() abstract fun trySetLockScreenPassword(password: String): Boolean diff --git a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt index 043049b..3cc2b0e 100644 --- a/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt +++ b/app/src/main/java/io/timelimit/android/integration/platform/android/AndroidIntegration.kt @@ -173,17 +173,7 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio Toast.makeText(context, text, Toast.LENGTH_SHORT).show() } - override fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (Settings.canDrawOverlays(context)) { - return RuntimePermissionStatus.Granted - } else { - return RuntimePermissionStatus.NotGranted - } - } else { - return RuntimePermissionStatus.NotRequired - } - } + override fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus = overlay.getOverlayPermissionStatus() override fun getNotificationAccessPermissionStatus(): NewPermissionStatus { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { @@ -199,8 +189,6 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio } } - override fun getOverlayPermissionStatus(): RuntimePermissionStatus = overlay.getOverlayPermissionStatus() - override fun isAccessibilityServiceEnabled(): Boolean { val service = context.packageName + "/" + AccessibilityService::class.java.canonicalName diff --git a/app/src/main/java/io/timelimit/android/integration/platform/dummy/DummyIntegration.kt b/app/src/main/java/io/timelimit/android/integration/platform/dummy/DummyIntegration.kt index 863198f..1186edd 100644 --- a/app/src/main/java/io/timelimit/android/integration/platform/dummy/DummyIntegration.kt +++ b/app/src/main/java/io/timelimit/android/integration/platform/dummy/DummyIntegration.kt @@ -76,10 +76,6 @@ class DummyIntegration( return notificationAccess } - override fun getOverlayPermissionStatus(): RuntimePermissionStatus { - return RuntimePermissionStatus.NotRequired - } - override fun isAccessibilityServiceEnabled(): Boolean { return false } diff --git a/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt b/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt index 7ac6295..7845d03 100644 --- a/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt +++ b/app/src/main/java/io/timelimit/android/logic/BackgroundTaskLogic.kt @@ -877,7 +877,7 @@ class BackgroundTaskLogic(val appLogic: AppLogic) { val protectionLevel = appLogic.platformIntegration.getCurrentProtectionLevel() val usageStatsPermission = appLogic.platformIntegration.getForegroundAppPermissionStatus() val notificationAccess = appLogic.platformIntegration.getNotificationAccessPermissionStatus() - val overlayPermission = appLogic.platformIntegration.getOverlayPermissionStatus() + val overlayPermission = appLogic.platformIntegration.getDrawOverOtherAppsPermissionStatus() val accessibilityService = appLogic.platformIntegration.isAccessibilityServiceEnabled() val qOrLater = AndroidVersion.qOrLater diff --git a/app/src/main/java/io/timelimit/android/ui/setup/SetupDevicePermissionsFragment.kt b/app/src/main/java/io/timelimit/android/ui/setup/SetupDevicePermissionsFragment.kt index 30f4860..08e6ee5 100644 --- a/app/src/main/java/io/timelimit/android/ui/setup/SetupDevicePermissionsFragment.kt +++ b/app/src/main/java/io/timelimit/android/ui/setup/SetupDevicePermissionsFragment.kt @@ -106,7 +106,7 @@ class SetupDevicePermissionsFragment : Fragment() { binding.notificationAccessPermission = platform.getNotificationAccessPermissionStatus() binding.protectionLevel = platform.getCurrentProtectionLevel() binding.usageStatsAccess = platform.getForegroundAppPermissionStatus() - binding.overlayPermission = platform.getOverlayPermissionStatus() + binding.overlayPermission = platform.getDrawOverOtherAppsPermissionStatus() binding.accessibilityServiceEnabled = platform.isAccessibilityServiceEnabled() }