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

Remove duplicate function

Browse source
This commit is contained in:
Jonas Lochmann 2021-12-20 01:00:00 +01:00
parent 4aefef38e0
commit 88a210aaf3
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
5 changed files with 3 additions and 20 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

@ -38,7 +38,6 @@ abstract class PlatformIntegration(
abstract fun getForegroundAppPermissionStatus(): RuntimePermissionStatus abstract fun getForegroundAppPermissionStatus(): RuntimePermissionStatus
abstract fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus abstract fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus
abstract fun getNotificationAccessPermissionStatus(): NewPermissionStatus abstract fun getNotificationAccessPermissionStatus(): NewPermissionStatus
abstract fun getOverlayPermissionStatus(): RuntimePermissionStatus
abstract fun isAccessibilityServiceEnabled(): Boolean abstract fun isAccessibilityServiceEnabled(): Boolean
abstract fun disableDeviceAdmin() abstract fun disableDeviceAdmin()
abstract fun trySetLockScreenPassword(password: String): Boolean abstract fun trySetLockScreenPassword(password: String): Boolean

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

@ -173,17 +173,7 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
Toast.makeText(context, text, Toast.LENGTH_SHORT).show() Toast.makeText(context, text, Toast.LENGTH_SHORT).show()
} }
override fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus { override fun getDrawOverOtherAppsPermissionStatus(): RuntimePermissionStatus = overlay.getOverlayPermissionStatus()
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 getNotificationAccessPermissionStatus(): NewPermissionStatus { override fun getNotificationAccessPermissionStatus(): NewPermissionStatus {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { 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 { override fun isAccessibilityServiceEnabled(): Boolean {
val service = context.packageName + "/" + AccessibilityService::class.java.canonicalName val service = context.packageName + "/" + AccessibilityService::class.java.canonicalName

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

@ -76,10 +76,6 @@ class DummyIntegration(
return notificationAccess return notificationAccess
} }
override fun getOverlayPermissionStatus(): RuntimePermissionStatus {
return RuntimePermissionStatus.NotRequired
}
override fun isAccessibilityServiceEnabled(): Boolean { override fun isAccessibilityServiceEnabled(): Boolean {
return false return false
} }

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

@ -877,7 +877,7 @@ class BackgroundTaskLogic(val appLogic: AppLogic) {
val protectionLevel = appLogic.platformIntegration.getCurrentProtectionLevel() val protectionLevel = appLogic.platformIntegration.getCurrentProtectionLevel()
val usageStatsPermission = appLogic.platformIntegration.getForegroundAppPermissionStatus() val usageStatsPermission = appLogic.platformIntegration.getForegroundAppPermissionStatus()
val notificationAccess = appLogic.platformIntegration.getNotificationAccessPermissionStatus() val notificationAccess = appLogic.platformIntegration.getNotificationAccessPermissionStatus()
val overlayPermission = appLogic.platformIntegration.getOverlayPermissionStatus() val overlayPermission = appLogic.platformIntegration.getDrawOverOtherAppsPermissionStatus()
val accessibilityService = appLogic.platformIntegration.isAccessibilityServiceEnabled() val accessibilityService = appLogic.platformIntegration.isAccessibilityServiceEnabled()
val qOrLater = AndroidVersion.qOrLater val qOrLater = AndroidVersion.qOrLater

2
app/src/main/java/io/timelimit/android/ui/setup/SetupDevicePermissionsFragment.kt
View file

@ -106,7 +106,7 @@ class SetupDevicePermissionsFragment : Fragment() {
binding.notificationAccessPermission = platform.getNotificationAccessPermissionStatus() binding.notificationAccessPermission = platform.getNotificationAccessPermissionStatus()
binding.protectionLevel = platform.getCurrentProtectionLevel() binding.protectionLevel = platform.getCurrentProtectionLevel()
binding.usageStatsAccess = platform.getForegroundAppPermissionStatus() binding.usageStatsAccess = platform.getForegroundAppPermissionStatus()
binding.overlayPermission = platform.getOverlayPermissionStatus() binding.overlayPermission = platform.getDrawOverOtherAppsPermissionStatus()
binding.accessibilityServiceEnabled = platform.isAccessibilityServiceEnabled() binding.accessibilityServiceEnabled = platform.isAccessibilityServiceEnabled()
} }