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

Adjust name of the adb dummy App

Browse source
This commit is contained in:
Jonas Lochmann 2022-03-21 01:00:00 +01:00
parent bf016a88bd
commit 35d4e359e5
No known key found for this signature in database
GPG key ID: 8B8C9AEE10FA5B36
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,9 @@ package io.timelimit.android.integration.platform.android
import android.app.admin.DevicePolicyManager import android.app.admin.DevicePolicyManager
import android.content.ComponentName import android.content.ComponentName
import android.content.Context
import android.os.UserManager import android.os.UserManager
import io.timelimit.android.R
import io.timelimit.android.integration.platform.PlatformFeature import io.timelimit.android.integration.platform.PlatformFeature
object AndroidFeatures { object AndroidFeatures {
@ -30,12 +32,12 @@ object AndroidFeatures {
return true return true
} }
fun getFeaturesAssumingDeviceOwnerGranted(): List<PlatformFeature> { fun getFeaturesAssumingDeviceOwnerGranted(context: Context): List<PlatformFeature> {
val result = mutableListOf<PlatformFeature>() val result = mutableListOf<PlatformFeature>()
result.add(PlatformFeature( result.add(PlatformFeature(
id = FEATURE_ADB, id = FEATURE_ADB,
title = "ADB" title = context.getString(R.string.dummy_app_feature_adb)
)) ))
return result return result

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

@ -521,7 +521,7 @@ class AndroidIntegration(context: Context): PlatformIntegration(maximumProtectio
Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
policyManager.isDeviceOwnerApp(context.packageName) && policyManager.isDeviceOwnerApp(context.packageName) &&
(!BuildConfig.storeCompilant) (!BuildConfig.storeCompilant)
) AndroidFeatures.getFeaturesAssumingDeviceOwnerGranted() ) AndroidFeatures.getFeaturesAssumingDeviceOwnerGranted(context)
else emptyList() else emptyList()
} }

1
app/src/main/res/values-de/strings.xml
View file

@ -1600,4 +1600,5 @@
<string name="task_review_last_grant">Diese Aufgabe wurde zuletzt bestätigt am %s</string> <string name="task_review_last_grant">Diese Aufgabe wurde zuletzt bestätigt am %s</string>
<string name="dummy_app_unassigned_system_image_app">nicht zugeordnete Apps von der Systempartition</string> <string name="dummy_app_unassigned_system_image_app">nicht zugeordnete Apps von der Systempartition</string>
<string name="dummy_app_feature_adb">Entwickleroptionen</string>
</resources> </resources>

1
app/src/main/res/values/strings.xml
View file

@ -1654,4 +1654,5 @@
<string name="task_review_last_grant">This task was confirmed last time at %s</string> <string name="task_review_last_grant">This task was confirmed last time at %s</string>
<string name="dummy_app_unassigned_system_image_app">not assigned Apps from the system image</string> <string name="dummy_app_unassigned_system_image_app">not assigned Apps from the system image</string>
<string name="dummy_app_feature_adb">Developer Options</string>
</resources> </resources>