Skip to content

Commit 78efd59

Browse files
committed
Don't double escape
1 parent 9658d32 commit 78efd59

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

templates/android/library/src/main/java/io/appwrite/Query.kt.twig

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package {{ sdk.namespace | caseDot }}
22

33
import {{ sdk.namespace | caseDot }}.extensions.toJson
4+
import {{ sdk.namespace | caseDot }}.extensions.fromJson
45

56
class Query(
67
val method: String,
@@ -50,9 +51,21 @@ class Query(
5051

5152
fun contains(attribute: String, value: Any) = Query("contains", attribute, parseValue(value)).toJson()
5253

53-
fun or(queries: List<Query>) = Query("or", null, queries).toJson()
54+
fun or(queries: List<string>): String {
55+
val queryObjects = mutableListOf<Query>()
56+
for(query in queries) {
57+
queryObjects.add(query.fromJson())
58+
}
59+
return Query("or", null, queryObjects).toJson()
60+
}
5461

55-
fun and(queries: List<Query>) = Query("and", null, queries).toJson()
62+
fun and(queries: List<string>): String {
63+
val queryObjects = mutableListOf<Query>()
64+
for(query in queries) {
65+
queryObjects.add(query.fromJson())
66+
}
67+
return Query("and", null, queryObjects).toJson()
68+
}
5669

5770
private fun parseValue(value: Any): List<Any> {
5871
return when (value) {

0 commit comments

Comments
 (0)