TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-27 20:15:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed conditions in sql queries

Browse Source
This commit is contained in:
Viktor De Pasquale 2019-05-12 18:34:28 +02:00
parent 0245e13591
commit 125ae0a173
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/Constants.kt
View File

@ -8,7 +8,7 @@ object Constants {
val MAGISK_PATH = "/sbin/.magisk/img" val MAGISK_PATH = "/sbin/.magisk/img"
val MAGISK_LOG = "/cache/magisk.log" val MAGISK_LOG = "/cache/magisk.log"
val USER_ID = Process.myUid() / 100000 val USER_ID get() = Process.myUid() / 100000
const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107" const val SNET_REVISION = "b66b1a914978e5f4c4bbfd74a59f4ad371bac107"
const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77" const val BOOTCTL_REVISION = "9c5dfc1b8245c0b5b524901ef0ff0f8335757b77"

6
app/src/main/java/com/topjohnwu/magisk/data/database/PolicyDao.kt
View File

@ -36,13 +36,13 @@ class PolicyDao(
fun delete(uid: Int) = query<Delete> { fun delete(uid: Int) = query<Delete> {
condition { condition {
equals("uid", uid.toString()) equals("uid", uid)
} }
}.ignoreElement() }.ignoreElement()
fun fetch(uid: Int) = query<Select> { fun fetch(uid: Int) = query<Select> {
condition { condition {
equals("uid", uid.toString()) equals("uid", uid)
} }
}.map { it.first().toPolicy(context.packageManager) } }.map { it.first().toPolicy(context.packageManager) }
.doOnError { .doOnError {
@ -57,7 +57,7 @@ class PolicyDao(
fun fetchAll() = query<Select> { fun fetchAll() = query<Select> {
condition { condition {
equals("uid/100000", Constants.USER_ID.toString()) equals("uid/100000", Constants.USER_ID)
} }
}.flattenAsFlowable { it } }.flattenAsFlowable { it }
.map { it.toPolicy(context.packageManager) } .map { it.toPolicy(context.packageManager) }

7
app/src/main/java/com/topjohnwu/magisk/data/database/base/MagiskQueryBuilder.kt
View File

@ -107,8 +107,11 @@ class Condition {
private val conditionWord = "WHERE %s" private val conditionWord = "WHERE %s"
private var condition: String = "" private var condition: String = ""
fun equals(field: String, value: String) { fun equals(field: String, value: Any) {
condition = "$field=\"$value\"" condition = when (value) {
is String -> "$field=\"$value\""
else -> "$field=$value"
}
} }
fun greaterThan(field: String, value: String) { fun greaterThan(field: String, value: String) {