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

Bugfix (#181, #182, #183, #185)

Browse Source
This commit is contained in:
BinTianqi
2025-10-16 17:45:01 +08:00
parent 9c796690e3
commit b5218d7ee5
20 changed files with 377 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -163,21 +163,16 @@ class MyViewModel(application: Application): AndroidViewModel(application) {
fun setApiKey(key: String) {
SP.apiKeyHash = if (key.isEmpty()) "" else key.hash()
}
fun getEnabledNotifications(): List<NotificationType> {
val enabledNotifications = MutableStateFlow(emptyList<Int>())
fun getEnabledNotifications() {
val list = SP.notifications?.split(',')?.mapNotNull { it.toIntOrNull() }
return if (list == null) {
NotificationType.entries
} else {
NotificationType.entries.filter { it.id in list }
}
enabledNotifications.value = list ?: NotificationType.entries.map { it.id }
}
fun setNotificationEnabled(type: NotificationType, enabled: Boolean) {
val list = SP.notifications?.split(',')?.mapNotNull { it.toIntOrNull() }
SP.notifications = if (list == null) {
NotificationType.entries.minus(type).map { it.id }
} else {
list.run { if (enabled) plus(type.id) else minus(type.id) }
}.joinToString { it.toString() }
enabledNotifications.update { list ->
if (enabled) list.plus(type.id) else list.minus(type.id)
}
SP.notifications = enabledNotifications.value.joinToString(",") { it.toString() }
}
val chosenPackage = Channel<String>(1, BufferOverflow.DROP_LATEST)
@@ -267,7 +262,7 @@ class MyViewModel(application: Application): AndroidViewModel(application) {
fun getPackagePermissions(name: String) {
if (name.isValidPackageName) {
packagePermissions.value = runtimePermissions.associate {
it.permission to DPM.getPermissionGrantState(DAR, name, it.permission)
it.id to DPM.getPermissionGrantState(DAR, name, it.id)
}
} else {
packagePermissions.value = emptyMap()
@@ -1027,7 +1022,8 @@ class MyViewModel(application: Application): AndroidViewModel(application) {
} else {
Dhizuku.requestPermission(object : DhizukuRequestPermissionListener() {
override fun onRequestPermission(grantResult: Int) {
if(grantResult == PackageManager.PERMISSION_GRANTED) onSucceed()
if (grantResult == PackageManager.PERMISSION_GRANTED) onSucceed()
else callback(false, application.getString(R.string.dhizuku_permission_not_granted))
}
})
}