Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
f417389a
Commit
f417389a
authored
Jun 06, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix magisk database code in app
parent
662a5c8e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
25 deletions
+14
-25
SettingsDao.kt
...in/java/com/topjohnwu/magisk/data/database/SettingsDao.kt
+3
-2
StringDao.kt
...main/java/com/topjohnwu/magisk/data/database/StringDao.kt
+2
-2
MagiskQueryBuilder.kt
...topjohnwu/magisk/data/database/base/MagiskQueryBuilder.kt
+9
-21
No files found.
app/src/main/java/com/topjohnwu/magisk/data/database/SettingsDao.kt
View file @
f417389a
...
@@ -10,11 +10,12 @@ class SettingsDao : BaseDao() {
...
@@ -10,11 +10,12 @@ class SettingsDao : BaseDao() {
condition
{
equals
(
"key"
,
key
)
}
condition
{
equals
(
"key"
,
key
)
}
}.
ignoreElement
()
}.
ignoreElement
()
fun
put
(
key
:
String
,
value
:
Int
)
=
query
<
Insert
>
{
fun
put
(
key
:
String
,
value
:
Int
)
=
query
<
Replace
>
{
values
(
key
to
value
.
toString
()
)
values
(
"key"
to
key
,
"value"
to
value
)
}.
ignoreElement
()
}.
ignoreElement
()
fun
fetch
(
key
:
String
,
default
:
Int
=
-
1
)
=
query
<
Select
>
{
fun
fetch
(
key
:
String
,
default
:
Int
=
-
1
)
=
query
<
Select
>
{
fields
(
"value"
)
condition
{
equals
(
"key"
,
key
)
}
condition
{
equals
(
"key"
,
key
)
}
}.
map
{
it
.
firstOrNull
()
?.
values
?.
firstOrNull
()
?.
toIntOrNull
()
?:
default
}
}.
map
{
it
.
firstOrNull
()
?.
values
?.
firstOrNull
()
?.
toIntOrNull
()
?:
default
}
...
...
app/src/main/java/com/topjohnwu/magisk/data/database/StringDao.kt
View file @
f417389a
...
@@ -10,8 +10,8 @@ class StringDao : BaseDao() {
...
@@ -10,8 +10,8 @@ class StringDao : BaseDao() {
condition
{
equals
(
"key"
,
key
)
}
condition
{
equals
(
"key"
,
key
)
}
}.
ignoreElement
()
}.
ignoreElement
()
fun
put
(
key
:
String
,
value
:
String
)
=
query
<
Insert
>
{
fun
put
(
key
:
String
,
value
:
String
)
=
query
<
Replace
>
{
values
(
key
to
value
)
values
(
"key"
to
key
,
"value"
to
value
)
}.
ignoreElement
()
}.
ignoreElement
()
fun
fetch
(
key
:
String
,
default
:
String
=
""
)
=
query
<
Select
>
{
fun
fetch
(
key
:
String
,
default
:
String
=
""
)
=
query
<
Select
>
{
...
...
app/src/main/java/com/topjohnwu/magisk/data/database/base/MagiskQueryBuilder.kt
View file @
f417389a
...
@@ -32,11 +32,7 @@ class Delete : MagiskQueryBuilder {
...
@@ -32,11 +32,7 @@ class Delete : MagiskQueryBuilder {
}
}
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
StringBuilder
()
return
listOf
(
requestType
,
table
,
condition
).
joinToString
(
" "
)
.
appendln
(
requestType
)
.
appendln
(
table
)
.
appendln
(
condition
)
.
toString
()
}
}
}
}
...
@@ -65,13 +61,7 @@ class Select : MagiskQueryBuilder {
...
@@ -65,13 +61,7 @@ class Select : MagiskQueryBuilder {
}
}
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
StringBuilder
()
return
listOf
(
requestType
,
table
,
condition
,
orderField
).
joinToString
(
" "
)
.
appendln
(
requestType
)
.
appendln
(
table
)
.
appendln
(
condition
)
.
appendln
(
orderField
)
.
toString
()
.
replace
(
"\n"
,
" "
)
}
}
}
}
...
@@ -84,23 +74,21 @@ open class Insert : MagiskQueryBuilder {
...
@@ -84,23 +74,21 @@ open class Insert : MagiskQueryBuilder {
override
lateinit
var
table
:
String
override
lateinit
var
table
:
String
private
val
keys
get
()
=
_values
.
keys
.
joinToString
(
","
)
private
val
keys
get
()
=
_values
.
keys
.
joinToString
(
","
)
private
val
values
get
()
=
_values
.
values
.
joinToString
(
","
)
{
"\"$it\""
}
private
val
values
get
()
=
_values
.
values
.
joinToString
(
","
)
{
private
var
_values
:
Map
<
String
,
String
>
=
mapOf
()
if
(
it
is
String
)
"\"$it\""
else
it
.
toString
()
}
private
var
_values
:
Map
<
String
,
Any
>
=
mapOf
()
fun
values
(
vararg
pairs
:
Pair
<
String
,
String
>)
{
fun
values
(
vararg
pairs
:
Pair
<
String
,
Any
>)
{
_values
=
pairs
.
toMap
()
_values
=
pairs
.
toMap
()
}
}
fun
values
(
values
:
Map
<
String
,
String
>)
{
fun
values
(
values
:
Map
<
String
,
Any
>)
{
_values
=
values
_values
=
values
}
}
override
fun
toString
():
String
{
override
fun
toString
():
String
{
return
StringBuilder
()
return
listOf
(
requestType
,
table
,
"($keys) VALUES($values)"
).
joinToString
(
" "
)
.
appendln
(
requestType
)
.
appendln
(
table
)
.
appendln
(
"($keys) VALUES($values)"
)
.
toString
()
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment