Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:11.0.0")
```

### Maven
Expand All @@ -49,7 +49,7 @@ Add this to your project's `pom.xml` file:
<dependency>
<groupId>io.appwrite</groupId>
<artifactId>sdk-for-android</artifactId>
<version>10.1.0</version>
<version>11.0.0</version>
</dependency>
</dependencies>
```
Expand Down
4 changes: 2 additions & 2 deletions library/src/main/java/io/appwrite/Client.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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 "11.0.0",
"x-appwrite-response-format" to "1.8.0"
)
config = mutableMapOf()
Expand Down Expand Up @@ -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")
}
}

Expand Down
16 changes: 16 additions & 0 deletions library/src/main/java/io/appwrite/enums/ExecutionStatus.kt
Original file line number Diff line number Diff line change
@@ -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
}
14 changes: 14 additions & 0 deletions library/src/main/java/io/appwrite/enums/ExecutionTrigger.kt
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion library/src/main/java/io/appwrite/models/Document.kt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ data class Document<T>(
createdAt = map["\$createdAt"] as String,
updatedAt = map["\$updatedAt"] as String,
permissions = map["\$permissions"] as List<String>,
data = map.jsonCast(to = nestedType)
data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType)
)
}
}
16 changes: 9 additions & 7 deletions library/src/main/java/io/appwrite/models/Execution.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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,
Expand All @@ -149,8 +151,8 @@ data class Execution(
permissions = map["\$permissions"] as List<String>,
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<String, Any>>).map { Headers.from(map = it) },
Expand All @@ -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,
)
}
}
2 changes: 1 addition & 1 deletion library/src/main/java/io/appwrite/models/Preferences.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ data class Preferences<T>(
map: Map<String, Any>,
nestedType: Class<T>
) = Preferences<T>(
data = map.jsonCast(to = nestedType)
data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType)
)
}
}
2 changes: 1 addition & 1 deletion library/src/main/java/io/appwrite/models/Row.kt
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ data class Row<T>(
createdAt = map["\$createdAt"] as String,
updatedAt = map["\$updatedAt"] as String,
permissions = map["\$permissions"] as List<String>,
data = map.jsonCast(to = nestedType)
data = map["data"]?.jsonCast(to = nestedType) ?: map.jsonCast(to = nestedType)
)
}
}
2 changes: 1 addition & 1 deletion library/src/main/java/io/appwrite/models/Target.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions library/src/main/java/io/appwrite/models/User.kt
Original file line number Diff line number Diff line change
Expand Up @@ -196,9 +196,9 @@ data class User<T>(
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<String>,
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Account.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Avatars.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Databases.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Functions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Graphql.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Locale.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Messaging.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Storage.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/TablesDb.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion library/src/main/java/io/appwrite/services/Teams.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down