diff --git a/app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt b/app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt
index 625d204..f6972b4 100644
--- a/app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt
@@ -681,7 +681,8 @@ class MyViewModel(application: Application): AndroidViewModel(application) {
backupServiceEnabled = if (VERSION.SDK_INT >= 26) DPM.isBackupServiceEnabled(DAR) else false,
btContactSharingDisabled = if (VERSION.SDK_INT >= 23 && privilege.work)
DPM.getBluetoothContactSharingDisabled(DAR) else false,
- commonCriteriaMode = if (VERSION.SDK_INT >= 30) DPM.isCommonCriteriaModeEnabled(DAR) else false,
+ commonCriteriaMode = if (VERSION.SDK_INT >= 30 && privilege.run { device || org })
+ DPM.isCommonCriteriaModeEnabled(DAR) else false,
usbSignalEnabled = if (VERSION.SDK_INT >= 31) DPM.isUsbDataSignalingEnabled else false,
canDisableUsbSignal = if (VERSION.SDK_INT >= 31) DPM.canUsbDataSignalingBeDisabled() else false
)
diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt
index c058038..235516b 100644
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt
@@ -468,7 +468,8 @@ private fun ClearAppStorageDialog(
AlertDialog(
title = { Text(stringResource(R.string.clear_app_storage)) },
text = {
- if(clearing) LinearProgressIndicator(Modifier.fillMaxWidth())
+ if (clearing) LinearProgressIndicator(Modifier.fillMaxWidth())
+ else Text(stringResource(R.string.clear_app_storage_confirmation))
},
confirmButton = {
TextButton(
diff --git a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
index 5e1abd2..8d6b2da 100644
--- a/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
+++ b/app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
@@ -186,9 +186,9 @@ fun NetworkOptionsScreen(
) {
val privilege by Privilege.status.collectAsStateWithLifecycle()
var dialog by rememberSaveable { mutableIntStateOf(0) }
- var lanEnabled by rememberSaveable { mutableStateOf(getLanEnabled()) }
MyScaffold(R.string.options, onNavigateUp, 0.dp) {
if(VERSION.SDK_INT >= 30 && (privilege.device || privilege.org)) {
+ var lanEnabled by rememberSaveable { mutableStateOf(getLanEnabled()) }
SwitchItem(R.string.lockdown_admin_configured_network, icon = R.drawable.wifi_password_fill0,
state = lanEnabled,
onCheckedChange = {
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e494d21..9fab479 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -363,6 +363,7 @@
许可的输入法
卸载后保留的应用
清除应用存储
+ 你确定要删除应用数据吗?
设置默认拨号器
卸载应用
安装应用
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5e8682b..332e8ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -398,6 +398,7 @@
Permitted IME
Keep uninstalled packages
Clear app storage
+ Are you sure to delete app data?
Set default dialer
Uninstall app
Install app