From c55cc2d3e1bfca7ff5dfbe14a5612ef5fdd19f86 Mon Sep 17 00:00:00 2001
From: BinTianqi <bintianqi512@gmail.com>
Date: Mon, 1 Dec 2025 12:46:06 +0800
Subject: [PATCH] Fix some crash on profile owner mode (#206)

---
 app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt      | 3 ++-
 app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt | 3 ++-
 app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt      | 2 +-
 app/src/main/res/values-zh-rCN/strings.xml                   | 1 +
 app/src/main/res/values/strings.xml                          | 1 +
 5 files changed, 7 insertions(+), 3 deletions(-)

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 @@
     <string name="permitted_ime">许可的输入法</string>
     <string name="keep_uninstalled_packages">卸载后保留的应用</string>
     <string name="clear_app_storage">清除应用存储</string>
+    <string name="clear_app_storage_confirmation">你确定要删除应用数据吗？</string>
     <string name="set_default_dialer">设置默认拨号器</string>
     <string name="uninstall_app">卸载应用</string>
     <string name="install_app">安装应用</string>
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 @@
     <string name="permitted_ime">Permitted IME</string>
     <string name="keep_uninstalled_packages">Keep uninstalled packages</string>
     <string name="clear_app_storage">Clear app storage</string>
+    <string name="clear_app_storage_confirmation">Are you sure to delete app data?</string>
     <string name="set_default_dialer">Set default dialer</string>
     <string name="uninstall_app">Uninstall app</string>
     <string name="install_app">Install app</string>