awfixer/OwnDroid
1
0
Fork 0
mirror of https://github.com/awfixers-stuff/OwnDroid.git synced 2026-03-23 02:56:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some crash on profile owner mode (#206)

Browse Source
This commit is contained in:
BinTianqi
2025-12-01 12:46:06 +08:00
parent 001d013b0c
commit c55cc2d3e1
5 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/com/bintianqi/owndroid/MyViewModel.kt
View File

@@ -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
)

3
app/src/main/java/com/bintianqi/owndroid/dpm/Applications.kt
View File

@@ -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(

2
app/src/main/java/com/bintianqi/owndroid/dpm/Network.kt
View File

@@ -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 = {

1
app/src/main/res/values-zh-rCN/strings.xml
View File

@@ -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>

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

@@ -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>