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

fix crash in app manager

Browse Source 
close #70
This commit is contained in:
BinTianqi
2024-08-26 09:25:11 +08:00
parent 545eaea2f1
commit 99e02df084
2 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,7 +242,7 @@ private fun HomePage(navCtrl:NavHostController) {
) { ) {
HomePageItem(R.string.work_profile, R.drawable.work_fill0, "ManagedProfile", navCtrl) HomePageItem(R.string.work_profile, R.drawable.work_fill0, "ManagedProfile", navCtrl)
} }
HomePageItem(R.string.app_manager, R.drawable.apps_fill0, "ApplicationManage", navCtrl) if(deviceOwner || profileOwner) HomePageItem(R.string.app_manager, R.drawable.apps_fill0, "ApplicationManage", navCtrl)
if(VERSION.SDK_INT >= 24 && (profileOwner || deviceOwner)) { if(VERSION.SDK_INT >= 24 && (profileOwner || deviceOwner)) {
HomePageItem(R.string.user_restrict, R.drawable.person_off, "UserRestriction", navCtrl) HomePageItem(R.string.user_restrict, R.drawable.person_off, "UserRestriction", navCtrl)
} }

16
app/src/main/java/com/bintianqi/owndroid/dpm/ApplicationManage.kt
View File

@@ -220,7 +220,7 @@ private fun Home(
intent.setData(Uri.parse("package:$pkgName")) intent.setData(Uri.parse("package:$pkgName"))
startActivity(context, intent, null) startActivity(context, intent, null)
} }
if(VERSION.SDK_INT >= 24 && (deviceOwner || profileOwner)) { if(VERSION.SDK_INT >= 24) {
SwitchItem( SwitchItem(
title = R.string.suspend, desc = "", icon = R.drawable.block_fill0, title = R.string.suspend, desc = "", icon = R.drawable.block_fill0,
state = suspend, state = suspend,
@@ -228,26 +228,22 @@ private fun Home(
onClickBlank = { appControlAction = 1; appControlDialog = true } onClickBlank = { appControlAction = 1; appControlDialog = true }
) )
} }
if(deviceOwner || profileOwner) {
SwitchItem( SwitchItem(
title = R.string.hide, desc = stringResource(R.string.isapphidden_desc), icon = R.drawable.visibility_off_fill0, title = R.string.hide, desc = stringResource(R.string.isapphidden_desc), icon = R.drawable.visibility_off_fill0,
state = hide, state = hide,
onCheckedChange = { appControlAction = 2; appControl(it) }, onCheckedChange = { appControlAction = 2; appControl(it) },
onClickBlank = { appControlAction = 2; appControlDialog = true } onClickBlank = { appControlAction = 2; appControlDialog = true }
) )
}
if(deviceOwner || profileOwner) {
SwitchItem( SwitchItem(
title = R.string.block_uninstall, desc = "", icon = R.drawable.delete_forever_fill0, title = R.string.block_uninstall, desc = "", icon = R.drawable.delete_forever_fill0,
state = blockUninstall, state = blockUninstall,
onCheckedChange = { appControlAction = 3; appControl(it) }, onCheckedChange = { appControlAction = 3; appControl(it) },
onClickBlank = { appControlAction = 3; appControlDialog = true } onClickBlank = { appControlAction = 3; appControlDialog = true }
) )
}
if((VERSION.SDK_INT >= 33 && profileOwner) || (VERSION.SDK_INT >= 30 && deviceOwner)) { if((VERSION.SDK_INT >= 33 && profileOwner) || (VERSION.SDK_INT >= 30 && deviceOwner)) {
SubPageItem(R.string.ucd, "", R.drawable.do_not_touch_fill0) { navCtrl.navigate("UserControlDisabled") } SubPageItem(R.string.ucd, "", R.drawable.do_not_touch_fill0) { navCtrl.navigate("UserControlDisabled") }
} }
if(VERSION.SDK_INT>=23&&(deviceOwner||profileOwner)) { if(VERSION.SDK_INT>=23) {
SubPageItem(R.string.permission_manage, "", R.drawable.key_fill0) { navCtrl.navigate("PermissionManage") } SubPageItem(R.string.permission_manage, "", R.drawable.key_fill0) { navCtrl.navigate("PermissionManage") }
} }
if(VERSION.SDK_INT >= 30 && profileOwner && dpm.isManagedProfile(receiver)) { if(VERSION.SDK_INT >= 30 && profileOwner && dpm.isManagedProfile(receiver)) {
@@ -259,21 +255,15 @@ private fun Home(
if(VERSION.SDK_INT >= 34 && deviceOwner) { if(VERSION.SDK_INT >= 34 && deviceOwner) {
SubPageItem(R.string.credential_manage_policy, "", R.drawable.license_fill0) { navCtrl.navigate("CredentialManagePolicy") } SubPageItem(R.string.credential_manage_policy, "", R.drawable.license_fill0) { navCtrl.navigate("CredentialManagePolicy") }
} }
if(profileOwner || deviceOwner) {
SubPageItem(R.string.permitted_accessibility_services, "", R.drawable.settings_accessibility_fill0) { navCtrl.navigate("Accessibility") } SubPageItem(R.string.permitted_accessibility_services, "", R.drawable.settings_accessibility_fill0) { navCtrl.navigate("Accessibility") }
}
if(deviceOwner || profileOwner) {
SubPageItem(R.string.permitted_ime, "", R.drawable.keyboard_fill0) { navCtrl.navigate("IME") } SubPageItem(R.string.permitted_ime, "", R.drawable.keyboard_fill0) { navCtrl.navigate("IME") }
}
if(deviceOwner || profileOwner) {
SubPageItem(R.string.enable_system_app, "", R.drawable.enable_fill0) { SubPageItem(R.string.enable_system_app, "", R.drawable.enable_fill0) {
if(pkgName != "") dialogStatus.intValue = 1 if(pkgName != "") dialogStatus.intValue = 1
} }
}
if(VERSION.SDK_INT >= 28 && deviceOwner) { if(VERSION.SDK_INT >= 28 && deviceOwner) {
SubPageItem(R.string.keep_uninstalled_packages, "", R.drawable.delete_fill0) { navCtrl.navigate("KeepUninstalled") } SubPageItem(R.string.keep_uninstalled_packages, "", R.drawable.delete_fill0) { navCtrl.navigate("KeepUninstalled") }
} }
if(VERSION.SDK_INT >= 28 && (deviceOwner || profileOwner)) { if(VERSION.SDK_INT >= 28) {
SubPageItem(R.string.clear_app_storage, "", R.drawable.mop_fill0) { SubPageItem(R.string.clear_app_storage, "", R.drawable.mop_fill0) {
if(pkgName != "") dialogStatus.intValue = 2 if(pkgName != "") dialogStatus.intValue = 2
} }