From f562577e2cb2014c641caf560f8aa795e94d46a9 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 26 Sep 2025 09:06:01 +0000 Subject: [PATCH 1/3] chore: regenerate sdks --- README.md | 4 ++-- library/src/main/java/io/appwrite/Client.kt | 2 +- library/src/main/java/io/appwrite/Query.kt | 7 ------- .../java/io/appwrite/enums/ExecutionStatus.kt | 16 ++++++++++++++++ .../java/io/appwrite/enums/ExecutionTrigger.kt | 14 ++++++++++++++ .../main/java/io/appwrite/models/Execution.kt | 16 +++++++++------- .../src/main/java/io/appwrite/models/Target.kt | 2 +- library/src/main/java/io/appwrite/models/User.kt | 6 +++--- .../main/java/io/appwrite/services/Account.kt | 1 - .../main/java/io/appwrite/services/Avatars.kt | 1 - .../main/java/io/appwrite/services/Databases.kt | 1 - .../main/java/io/appwrite/services/Functions.kt | 1 - .../main/java/io/appwrite/services/Graphql.kt | 1 - .../src/main/java/io/appwrite/services/Locale.kt | 1 - .../main/java/io/appwrite/services/Messaging.kt | 1 - .../main/java/io/appwrite/services/Storage.kt | 1 - .../main/java/io/appwrite/services/TablesDb.kt | 1 - .../src/main/java/io/appwrite/services/Teams.kt | 1 - 18 files changed, 46 insertions(+), 31 deletions(-) create mode 100644 library/src/main/java/io/appwrite/enums/ExecutionStatus.kt create mode 100644 library/src/main/java/io/appwrite/enums/ExecutionTrigger.kt diff --git a/README.md b/README.md index eec3541..64be2b8 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ repositories { Next, add the dependency to your project's `build.gradle(.kts)` file: ```groovy -implementation("io.appwrite:sdk-for-android:10.1.0") +implementation("io.appwrite:sdk-for-android:10.2.0") ``` ### Maven @@ -49,7 +49,7 @@ Add this to your project's `pom.xml` file: io.appwrite sdk-for-android - 10.1.0 + 10.2.0 ``` diff --git a/library/src/main/java/io/appwrite/Client.kt b/library/src/main/java/io/appwrite/Client.kt index fe486b0..131ea40 100644 --- a/library/src/main/java/io/appwrite/Client.kt +++ b/library/src/main/java/io/appwrite/Client.kt @@ -87,7 +87,7 @@ class Client @JvmOverloads constructor( "x-sdk-name" to "Android", "x-sdk-platform" to "client", "x-sdk-language" to "android", - "x-sdk-version" to "10.1.0", + "x-sdk-version" to "10.2.0", "x-appwrite-response-format" to "1.8.0" ) config = mutableMapOf() diff --git a/library/src/main/java/io/appwrite/Query.kt b/library/src/main/java/io/appwrite/Query.kt index e059b91..6d5db56 100644 --- a/library/src/main/java/io/appwrite/Query.kt +++ b/library/src/main/java/io/appwrite/Query.kt @@ -151,13 +151,6 @@ class Query( */ fun orderDesc(attribute: String) = Query("orderDesc", attribute).toJson() - /** - * Sort results randomly. - * - * @returns The query string. - */ - fun orderRandom() = Query("orderRandom").toJson() - /** * Return results before documentId. * diff --git a/library/src/main/java/io/appwrite/enums/ExecutionStatus.kt b/library/src/main/java/io/appwrite/enums/ExecutionStatus.kt new file mode 100644 index 0000000..6944c55 --- /dev/null +++ b/library/src/main/java/io/appwrite/enums/ExecutionStatus.kt @@ -0,0 +1,16 @@ +package io.appwrite.enums + +import com.google.gson.annotations.SerializedName + +enum class ExecutionStatus(val value: String) { + @SerializedName("waiting") + WAITING("waiting"), + @SerializedName("processing") + PROCESSING("processing"), + @SerializedName("completed") + COMPLETED("completed"), + @SerializedName("failed") + FAILED("failed"); + + override fun toString() = value +} \ No newline at end of file diff --git a/library/src/main/java/io/appwrite/enums/ExecutionTrigger.kt b/library/src/main/java/io/appwrite/enums/ExecutionTrigger.kt new file mode 100644 index 0000000..e8bb981 --- /dev/null +++ b/library/src/main/java/io/appwrite/enums/ExecutionTrigger.kt @@ -0,0 +1,14 @@ +package io.appwrite.enums + +import com.google.gson.annotations.SerializedName + +enum class ExecutionTrigger(val value: String) { + @SerializedName("http") + HTTP("http"), + @SerializedName("schedule") + SCHEDULE("schedule"), + @SerializedName("event") + EVENT("event"); + + override fun toString() = value +} \ No newline at end of file diff --git a/library/src/main/java/io/appwrite/models/Execution.kt b/library/src/main/java/io/appwrite/models/Execution.kt index 3d71082..5b9863c 100644 --- a/library/src/main/java/io/appwrite/models/Execution.kt +++ b/library/src/main/java/io/appwrite/models/Execution.kt @@ -2,6 +2,8 @@ package io.appwrite.models import com.google.gson.annotations.SerializedName import io.appwrite.extensions.jsonCast +import io.appwrite.enums.ExecutionTrigger +import io.appwrite.enums.ExecutionStatus /** * Execution @@ -47,13 +49,13 @@ data class Execution( * The trigger that caused the function to execute. Possible values can be: `http`, `schedule`, or `event`. */ @SerializedName("trigger") - val trigger: String, + val trigger: ExecutionTrigger, /** * The status of the function execution. Possible values can be: `waiting`, `processing`, `completed`, or `failed`. */ @SerializedName("status") - val status: String, + val status: ExecutionStatus, /** * HTTP request method type. @@ -123,8 +125,8 @@ data class Execution( "\$permissions" to permissions as Any, "functionId" to functionId as Any, "deploymentId" to deploymentId as Any, - "trigger" to trigger as Any, - "status" to status as Any, + "trigger" to trigger.value as Any, + "status" to status.value as Any, "requestMethod" to requestMethod as Any, "requestPath" to requestPath as Any, "requestHeaders" to requestHeaders.map { it.toMap() } as Any, @@ -149,8 +151,8 @@ data class Execution( permissions = map["\$permissions"] as List, functionId = map["functionId"] as String, deploymentId = map["deploymentId"] as String, - trigger = map["trigger"] as String, - status = map["status"] as String, + trigger = ExecutionTrigger.values().find { it.value == map["trigger"] as String }!!, + status = ExecutionStatus.values().find { it.value == map["status"] as String }!!, requestMethod = map["requestMethod"] as String, requestPath = map["requestPath"] as String, requestHeaders = (map["requestHeaders"] as List>).map { Headers.from(map = it) }, @@ -160,7 +162,7 @@ data class Execution( logs = map["logs"] as String, errors = map["errors"] as String, duration = (map["duration"] as Number).toDouble(), - scheduledAt = map["scheduledAt"] as? String?, + scheduledAt = map["scheduledAt"] as? String, ) } } \ No newline at end of file diff --git a/library/src/main/java/io/appwrite/models/Target.kt b/library/src/main/java/io/appwrite/models/Target.kt index 54b4694..48d9650 100644 --- a/library/src/main/java/io/appwrite/models/Target.kt +++ b/library/src/main/java/io/appwrite/models/Target.kt @@ -85,7 +85,7 @@ data class Target( updatedAt = map["\$updatedAt"] as String, name = map["name"] as String, userId = map["userId"] as String, - providerId = map["providerId"] as? String?, + providerId = map["providerId"] as? String, providerType = map["providerType"] as String, identifier = map["identifier"] as String, expired = map["expired"] as Boolean, diff --git a/library/src/main/java/io/appwrite/models/User.kt b/library/src/main/java/io/appwrite/models/User.kt index fd03fc2..e9a1144 100644 --- a/library/src/main/java/io/appwrite/models/User.kt +++ b/library/src/main/java/io/appwrite/models/User.kt @@ -196,9 +196,9 @@ data class User( createdAt = map["\$createdAt"] as String, updatedAt = map["\$updatedAt"] as String, name = map["name"] as String, - password = map["password"] as? String?, - hash = map["hash"] as? String?, - hashOptions = map["hashOptions"] as? Any?, + password = map["password"] as? String, + hash = map["hash"] as? String, + hashOptions = map["hashOptions"] as? Any, registration = map["registration"] as String, status = map["status"] as Boolean, labels = map["labels"] as List, diff --git a/library/src/main/java/io/appwrite/services/Account.kt b/library/src/main/java/io/appwrite/services/Account.kt index 3dfd654..a3f94d3 100644 --- a/library/src/main/java/io/appwrite/services/Account.kt +++ b/library/src/main/java/io/appwrite/services/Account.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import io.appwrite.WebAuthComponent diff --git a/library/src/main/java/io/appwrite/services/Avatars.kt b/library/src/main/java/io/appwrite/services/Avatars.kt index 63b436d..3df22a4 100644 --- a/library/src/main/java/io/appwrite/services/Avatars.kt +++ b/library/src/main/java/io/appwrite/services/Avatars.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Databases.kt b/library/src/main/java/io/appwrite/services/Databases.kt index 9be75a3..17321df 100644 --- a/library/src/main/java/io/appwrite/services/Databases.kt +++ b/library/src/main/java/io/appwrite/services/Databases.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Functions.kt b/library/src/main/java/io/appwrite/services/Functions.kt index 45fd87e..cadf014 100644 --- a/library/src/main/java/io/appwrite/services/Functions.kt +++ b/library/src/main/java/io/appwrite/services/Functions.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Graphql.kt b/library/src/main/java/io/appwrite/services/Graphql.kt index 895b9d6..c168f5f 100644 --- a/library/src/main/java/io/appwrite/services/Graphql.kt +++ b/library/src/main/java/io/appwrite/services/Graphql.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Locale.kt b/library/src/main/java/io/appwrite/services/Locale.kt index aecc83a..95e7d96 100644 --- a/library/src/main/java/io/appwrite/services/Locale.kt +++ b/library/src/main/java/io/appwrite/services/Locale.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Messaging.kt b/library/src/main/java/io/appwrite/services/Messaging.kt index 148618e..82213f3 100644 --- a/library/src/main/java/io/appwrite/services/Messaging.kt +++ b/library/src/main/java/io/appwrite/services/Messaging.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Storage.kt b/library/src/main/java/io/appwrite/services/Storage.kt index daa79a4..b04c189 100644 --- a/library/src/main/java/io/appwrite/services/Storage.kt +++ b/library/src/main/java/io/appwrite/services/Storage.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/TablesDb.kt b/library/src/main/java/io/appwrite/services/TablesDb.kt index 2cc40e3..597ee8c 100644 --- a/library/src/main/java/io/appwrite/services/TablesDb.kt +++ b/library/src/main/java/io/appwrite/services/TablesDb.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie diff --git a/library/src/main/java/io/appwrite/services/Teams.kt b/library/src/main/java/io/appwrite/services/Teams.kt index 54dcc3b..64e38c8 100644 --- a/library/src/main/java/io/appwrite/services/Teams.kt +++ b/library/src/main/java/io/appwrite/services/Teams.kt @@ -4,7 +4,6 @@ import android.net.Uri import io.appwrite.Client import io.appwrite.Service import io.appwrite.models.* -import io.appwrite.enums.* import io.appwrite.exceptions.AppwriteException import io.appwrite.extensions.classOf import okhttp3.Cookie From b87c01b683c2e6cfbe3ac4355a9d97a9e559f9f0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 1 Oct 2025 04:34:50 +0000 Subject: [PATCH 2/3] regen --- library/src/main/java/io/appwrite/Client.kt | 2 +- library/src/main/java/io/appwrite/Query.kt | 7 +++++++ library/src/main/java/io/appwrite/models/Document.kt | 2 +- library/src/main/java/io/appwrite/models/Preferences.kt | 2 +- library/src/main/java/io/appwrite/models/Row.kt | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/io/appwrite/Client.kt b/library/src/main/java/io/appwrite/Client.kt index 131ea40..5211ab9 100644 --- a/library/src/main/java/io/appwrite/Client.kt +++ b/library/src/main/java/io/appwrite/Client.kt @@ -557,7 +557,7 @@ class Client @JvmOverloads constructor( val warnings = response.headers["x-appwrite-warning"] if (warnings != null) { warnings.split(";").forEach { warning -> - println("Warning: $warning") + System.err.println("Warning: $warning") } } diff --git a/library/src/main/java/io/appwrite/Query.kt b/library/src/main/java/io/appwrite/Query.kt index 6d5db56..e059b91 100644 --- a/library/src/main/java/io/appwrite/Query.kt +++ b/library/src/main/java/io/appwrite/Query.kt @@ -151,6 +151,13 @@ class Query( */ fun orderDesc(attribute: String) = Query("orderDesc", attribute).toJson() + /** + * Sort results randomly. + * + * @returns The query string. + */ + fun orderRandom() = Query("orderRandom").toJson() + /** * Return results before documentId. * diff --git a/library/src/main/java/io/appwrite/models/Document.kt b/library/src/main/java/io/appwrite/models/Document.kt index c0dfe61..6a2fd9c 100644 --- a/library/src/main/java/io/appwrite/models/Document.kt +++ b/library/src/main/java/io/appwrite/models/Document.kt @@ -99,7 +99,7 @@ data class Document( createdAt = map["\$createdAt"] as String, updatedAt = map["\$updatedAt"] as String, permissions = map["\$permissions"] as List, - data = map.jsonCast(to = nestedType) + data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType) ) } } \ No newline at end of file diff --git a/library/src/main/java/io/appwrite/models/Preferences.kt b/library/src/main/java/io/appwrite/models/Preferences.kt index 309fb98..3d41ad1 100644 --- a/library/src/main/java/io/appwrite/models/Preferences.kt +++ b/library/src/main/java/io/appwrite/models/Preferences.kt @@ -29,7 +29,7 @@ data class Preferences( map: Map, nestedType: Class ) = Preferences( - data = map.jsonCast(to = nestedType) + data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType) ) } } \ No newline at end of file diff --git a/library/src/main/java/io/appwrite/models/Row.kt b/library/src/main/java/io/appwrite/models/Row.kt index bb5c14f..3621fc5 100644 --- a/library/src/main/java/io/appwrite/models/Row.kt +++ b/library/src/main/java/io/appwrite/models/Row.kt @@ -99,7 +99,7 @@ data class Row( createdAt = map["\$createdAt"] as String, updatedAt = map["\$updatedAt"] as String, permissions = map["\$permissions"] as List, - data = map.jsonCast(to = nestedType) + data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType) ) } } \ No newline at end of file From d97f0eb547ea228cc1eaaa8a83e8a42f84295b9b Mon Sep 17 00:00:00 2001 From: root Date: Fri, 3 Oct 2025 03:06:47 +0000 Subject: [PATCH 3/3] chore: update title and desc --- README.md | 4 ++-- library/src/main/java/io/appwrite/Client.kt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 64be2b8..769492f 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ repositories { Next, add the dependency to your project's `build.gradle(.kts)` file: ```groovy -implementation("io.appwrite:sdk-for-android:10.2.0") +implementation("io.appwrite:sdk-for-android:11.0.0") ``` ### Maven @@ -49,7 +49,7 @@ Add this to your project's `pom.xml` file: io.appwrite sdk-for-android - 10.2.0 + 11.0.0 ``` diff --git a/library/src/main/java/io/appwrite/Client.kt b/library/src/main/java/io/appwrite/Client.kt index 5211ab9..d29fb28 100644 --- a/library/src/main/java/io/appwrite/Client.kt +++ b/library/src/main/java/io/appwrite/Client.kt @@ -87,7 +87,7 @@ class Client @JvmOverloads constructor( "x-sdk-name" to "Android", "x-sdk-platform" to "client", "x-sdk-language" to "android", - "x-sdk-version" to "10.2.0", + "x-sdk-version" to "11.0.0", "x-appwrite-response-format" to "1.8.0" ) config = mutableMapOf()