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

update dependencies, fix disable account management

Browse Source
This commit is contained in:
BinTianqi
2024-07-07 17:30:17 +08:00
parent e3f06911c5
commit 168ed085c4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle.kts
View File

@@ -1,6 +1,7 @@
plugins { plugins {
alias(libs.plugins.android.application) alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android) alias(libs.plugins.kotlin.android)
alias(libs.plugins.cc)
} }
var keyPassword: String? = null var keyPassword: String? = null
@@ -56,9 +57,6 @@ android {
compose = true compose = true
aidl = true aidl = true
} }
composeOptions {
kotlinCompilerExtensionVersion = "1.5.13"
}
packaging { packaging {
resources { resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}" excludes += "/META-INF/{AL2.0,LGPL2.1}"

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

@@ -120,7 +120,7 @@ private fun Home(localNavCtrl:NavHostController,listScrollState:ScrollState) {
SubPageItem(R.string.enrollment_specific_id, "", R.drawable.id_card_fill0) { localNavCtrl.navigate("SpecificID") } SubPageItem(R.string.enrollment_specific_id, "", R.drawable.id_card_fill0) { localNavCtrl.navigate("SpecificID") }
} }
if(isDeviceOwner(dpm) || isProfileOwner(dpm)) { if(isDeviceOwner(dpm) || isProfileOwner(dpm)) {
SubPageItem(R.string.disable_account_management, "", R.drawable.account_circle_fill0) { localNavCtrl.navigate("NoManagementAccount") } SubPageItem(R.string.disable_account_management, "", R.drawable.account_circle_fill0) { localNavCtrl.navigate("DisableAccountManagement") }
} }
if(VERSION.SDK_INT >= 24 && (isDeviceOwner(dpm) || dpm.isOrgProfile(receiver))) { if(VERSION.SDK_INT >= 24 && (isDeviceOwner(dpm) || dpm.isOrgProfile(receiver))) {
SubPageItem(R.string.device_owner_lock_screen_info, "", R.drawable.screen_lock_portrait_fill0) { localNavCtrl.navigate("LockScreenInfo") } SubPageItem(R.string.device_owner_lock_screen_info, "", R.drawable.screen_lock_portrait_fill0) { localNavCtrl.navigate("LockScreenInfo") }

6
gradle/libs.versions.toml
View File

@@ -1,6 +1,7 @@
[versions] [versions]
agp = "8.4.0" agp = "8.5.0"
kt-android = "1.9.23" kt-android = "2.0.0"
cc = "2.0.0"
androidx-activity-compose = "1.8.2" androidx-activity-compose = "1.8.2"
navigation-compose = "2.7.7" navigation-compose = "2.7.7"
@@ -27,3 +28,4 @@ androidx-fragment = { group = "androidx.fragment", name = "fragment", version.re
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "agp" } android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kt-android" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kt-android" }
cc = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "cc" }