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

catch error when using Dhizuku API

Browse Source
This commit is contained in:
BinTianqi
2024-07-21 11:04:22 +08:00
parent 8fd1d9e4fe
commit 9171da06ea
15 changed files with 244 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/bintianqi/owndroid/dpm/ShizukuActivate.kt
View File

@@ -51,8 +51,8 @@ fun ShizukuActivate() {
var bindShizuku by remember { mutableStateOf(false) }
var outputText by remember { mutableStateOf("") }
var showDeviceAdminButton by remember { mutableStateOf(!dpm.isAdminActive(receiver)) }
var showProfileOwnerButton by remember { mutableStateOf(!dpm.isProfileOwner(context)) }
var showDeviceOwnerButton by remember { mutableStateOf(!dpm.isDeviceOwner(context)) }
var showProfileOwnerButton by remember { mutableStateOf(!context.isProfileOwner) }
var showDeviceOwnerButton by remember { mutableStateOf(!context.isDeviceOwner) }
var showOrgProfileOwnerButton by remember { mutableStateOf(true) }
val service by shizukuService.collectAsState()
LaunchedEffect(service) {
@@ -140,7 +140,7 @@ fun ShizukuActivate() {
outputText = service!!.execute(context.getString(R.string.dpm_activate_po_command))
outputTextScrollState.animateScrollTo(0)
delay(500)
showProfileOwnerButton = !dpm.isProfileOwner(context)
showProfileOwnerButton = !context.isProfileOwner
}
},
enabled = enabled
@@ -156,7 +156,7 @@ fun ShizukuActivate() {
outputText = service!!.execute(context.getString(R.string.dpm_activate_do_command))
outputTextScrollState.animateScrollTo(0)
delay(500)
showDeviceOwnerButton = !dpm.isDeviceOwner(context)
showDeviceOwnerButton = !context.isDeviceOwner
}
},
enabled = enabled
@@ -165,7 +165,7 @@ fun ShizukuActivate() {
}
}
if(VERSION.SDK_INT >= 30 && dpm.isProfileOwner(context) && dpm.isManagedProfile(receiver) && !dpm.isOrganizationOwnedDeviceWithManagedProfile) {
if(VERSION.SDK_INT >= 30 && context.isProfileOwner && dpm.isManagedProfile(receiver) && !dpm.isOrganizationOwnedDeviceWithManagedProfile) {
AnimatedVisibility(showOrgProfileOwnerButton) {
Button(
onClick = {