update version number

Author: TorstenDittmann

.github/workflows/publish.yml

@@ -50,4 +50,5 @@ jobs:
           SIGNING_KEY_ID: ${{ secrets.SIGNING_KEY_ID }}
           SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
           SIGNING_SECRET_KEY_RING_FILE: ${{ secrets.SIGNING_SECRET_KEY_RING_FILE }}
-          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          SONATYPE_STAGING_PROFILE_ID: ${{ secrets.SONATYPE_STAGING_PROFILE_ID }}
+          SDK_VERSION: ${{ github.event.release.tag_name }}

README.md

@@ -2,12 +2,12 @@
 
 ![Maven Central](https://img.shields.io/maven-central/v/io.appwrite/sdk-for-android.svg?color=green&style=flat-square)
 ![License](https://img.shields.io/github/license/appwrite/sdk-for-android.svg?style=flat-square)
-![Version](https://img.shields.io/badge/api%20version-0.9.0-blue.svg?style=flat-square)
+![Version](https://img.shields.io/badge/api%20version-0.10.0-blue.svg?style=flat-square)
 [![Build Status](https://img.shields.io/travis/com/appwrite/sdk-generator?style=flat-square)](https://travis-ci.com/appwrite/sdk-generator)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite_io?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite_io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord)
 
-**This SDK is compatible with Appwrite server version 0.9.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-android/releases).**
+**This SDK is compatible with Appwrite server version 0.10.x. For older versions, please check [previous releases](https://github.com/appwrite/sdk-for-android/releases).**
 
 Appwrite is an open-source backend as a service server that abstract and simplify complex and repetitive development tasks behind a very simple to use REST API. Appwrite aims to help you develop your apps faster and in a more secure way. Use the Android SDK to integrate your app with the Appwrite server to easily start interacting with all of Appwrite backend APIs and tools. For full API documentation and tutorials go to [https://appwrite.io/docs](https://appwrite.io/docs)
 
@@ -38,7 +38,7 @@ repositories {
 Next, add the dependency to your project's `build.gradle(.kts)` file:
 
 ```groovy
-implementation("io.appwrite:sdk-for-android:0.0.1")
+implementation("io.appwrite:sdk-for-android:0.2.0")
 ```
 
 ### Maven
@@ -49,7 +49,7 @@ Add this to your project's `pom.xml` file:
     <dependency>
         <groupId>io.appwrite</groupId>
         <artifactId>sdk-for-android</artifactId>
-        <version>0.0.1</version>
+        <version>0.2.0</version>
     </dependency>
 </dependencies>
 ```
@@ -144,7 +144,7 @@ try {
 ```
 
 ### Learn more
-You can use following resources to learn more and get help
+You can use the following resources to learn more and get help
 - 🚀 [Getting Started Tutorial](https://appwrite.io/docs/getting-started-for-android)
 - 📜 [Appwrite Docs](https://appwrite.io/docs)
 - 💬 [Discord Community](https://appwrite.io/discord)

build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'io.github.gradle-nexus.publish-plugin'
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext.kotlin_version = "1.4.31"
-    version '0.0.1'
+    version '0.2.0'
     repositories {
         maven { url "https://plugins.gradle.org/m2/" }
         google()

docs/examples/java/account/create-magic-u-r-l-session.md

@@ -0,0 +1,48 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.createMagicURLSession(
+            "[email protected]", 
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/java/account/update-magic-u-r-l-session.md

@@ -0,0 +1,49 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+public class MainActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        Client client = new Client(getApplicationContext())
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2"); // Your project ID
+
+        Account account = new Account(client);
+
+        account.updateMagicURLSession(
+            "[USER_ID]", 
+            "[SECRET]"
+            new Continuation<Object>() {
+                @NotNull
+                @Override
+                public CoroutineContext getContext() {
+                    return EmptyCoroutineContext.INSTANCE;
+                }
+
+                @Override
+                public void resumeWith(@NotNull Object o) {
+                    String json = "";
+                    try {
+                        if (o instanceof Result.Failure) {
+                            Result.Failure failure = (Result.Failure) o;
+                            throw failure.exception;
+                        } else {
+                            Response response = (Response) o;
+                            json = response.body().string();
+                        }                    
+                    } catch (Throwable th) {
+                        Log.e("ERROR", th.toString());
+                    }
+                }
+            }
+        );
+    }
+}

docs/examples/kotlin/account/create-magic-u-r-l-session.md

@@ -0,0 +1,26 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val client = Client(applicationContext)
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2") // Your project ID
+
+        val account = Account(client)
+
+        GlobalScope.launch {
+            val response = account.createMagicURLSession(
+                email = "[email protected]",
+            )
+            val json = response.body?.string()        
+        }
+    }
+}

docs/examples/kotlin/account/update-magic-u-r-l-session.md

@@ -0,0 +1,27 @@
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import io.appwrite.Client
+import io.appwrite.services.Account
+
+class MainActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_main)
+
+        val client = Client(applicationContext)
+            .setEndpoint("https://[HOSTNAME_OR_IP]/v1") // Your API Endpoint
+            .setProject("5df5acd0d48c2") // Your project ID
+
+        val account = Account(client)
+
+        GlobalScope.launch {
+            val response = account.updateMagicURLSession(
+                userId = "[USER_ID]",
+                secret = "[SECRET]"
+            )
+            val json = response.body?.string()        
+        }
+    }
+}

library/build.gradle

@@ -7,7 +7,7 @@ plugins {
 ext {
     PUBLISH_GROUP_ID = 'io.appwrite'
     PUBLISH_ARTIFACT_ID = 'sdk-for-android'
-    PUBLISH_VERSION = '0.0.1'
+    PUBLISH_VERSION = System.getenv('SDK_VERSION')
     POM_URL = 'https://github.com/appwrite/sdk-for-android'
     POM_SCM_URL = 'https://github.com/appwrite/sdk-for-android'
     POM_ISSUE_URL = 'https://github.com/appwrite/sdk-for-android/issues'
@@ -53,8 +53,8 @@ android {
 
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:${KotlinCompilerVersion.VERSION}")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3")
-    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.1")
+    api("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.0")
 
     api(platform("com.squareup.okhttp3:okhttp-bom:4.9.0"))
     api("com.squareup.okhttp3:okhttp")
@@ -65,15 +65,16 @@ dependencies {
     implementation("net.gotev:cookie-store:1.3.5")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.3.1")
     implementation("androidx.lifecycle:lifecycle-common-java8:2.3.1")
-    implementation("androidx.appcompat:appcompat:1.2.0")
-    implementation("androidx.fragment:fragment-ktx:1.3.2")
-    implementation("androidx.activity:activity-ktx:1.2.2")
+    implementation("androidx.appcompat:appcompat:1.3.1")
+    implementation("androidx.fragment:fragment-ktx:1.3.6")
+    implementation("androidx.activity:activity-ktx:1.3.1")
     implementation("androidx.browser:browser:1.3.0")
 
     testImplementation 'junit:junit:4.+'
-    testImplementation "androidx.test.ext:junit-ktx:1.1.2"
-    testImplementation "androidx.test:core-ktx:1.3.0"
+    testImplementation "androidx.test.ext:junit-ktx:1.1.3"
+    testImplementation "androidx.test:core-ktx:1.4.0"
     testImplementation "org.robolectric:robolectric:4.5.1"
+    testApi("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.5.1")
 }
 
 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"

library/src/main/java/io/appwrite/Client.kt

@@ -5,8 +5,7 @@ import android.content.pm.PackageManager
 import com.google.gson.Gson
 import io.appwrite.appwrite.BuildConfig
 import io.appwrite.exceptions.AppwriteException
-import io.appwrite.extensions.JsonExtensions.fromJson
-import io.appwrite.models.Error
+import io.appwrite.extensions.fromJson
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
@@ -36,6 +35,7 @@ import kotlin.coroutines.resume
 class Client @JvmOverloads constructor(
     context: Context,
     var endPoint: String = "https://appwrite.io/v1",
+    var endPointRealtime: String? = null,
     private var selfSigned: Boolean = false
 ) : CoroutineScope {
 
@@ -71,7 +71,7 @@ class Client @JvmOverloads constructor(
             "origin" to "appwrite-android://${context.packageName}",
             "user-agent" to "${context.packageName}/${appVersion}, ${System.getProperty("http.agent")}",
             "x-sdk-version" to "appwrite:android:${BuildConfig.SDK_VERSION}",            
-            "x-appwrite-response-format" to "0.9.0"
+            "x-appwrite-response-format" to "0.10.0"
         )
         config = mutableMapOf()
 
@@ -171,14 +171,31 @@ class Client @JvmOverloads constructor(
     }
 
     /**
-     * Set endpoint
+     * Set endpoint and realtime endpoint.
      * 
      * @param endpoint
      *
      * @return this     
      */
     fun setEndpoint(endPoint: String): Client {
         this.endPoint = endPoint
+
+        if (this.endPointRealtime == null && endPoint.startsWith("http")) {
+            this.endPointRealtime = endPoint.replaceFirst("http", "ws")
+        }
+
+        return this
+    }
+
+    /**
+    * Set realtime endpoint
+    *
+    * @param endpoint
+    *
+    * @return this
+    */
+    fun setEndpointRealtime(endPoint: String): Client {
+        this.endPointRealtime = endPoint
         return this
     }
 
@@ -317,9 +334,9 @@ class Client @JvmOverloads constructor(
 
                     val contentType: String = response.headers["content-type"] ?: ""
                     val error = if (contentType.contains("application/json", ignoreCase = true)) {
-                        bodyString.fromJson(Error::class.java)
+                        bodyString.fromJson<AppwriteException>()
                     } else {
-                        Error(bodyString, response.code)
+                        AppwriteException(bodyString, response.code)
                     }
 
                     it.cancel(AppwriteException(

library/src/main/java/io/appwrite/extensions/CollectionExtensions.kt

@@ -0,0 +1,12 @@
+package io.appwrite.extensions
+
+import kotlinx.coroutines.Dispatchers.IO
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.withContext
+
+suspend fun <T> Collection<T>.forEachAsync(
+    callback: suspend (T) -> Unit
+) = withContext(IO) {
+    map { async { callback.invoke(it) } }.awaitAll()
+}

library/src/main/java/io/appwrite/extensions/JsonExtensions.kt

@@ -2,11 +2,33 @@ package io.appwrite.extensions
 
 import com.google.gson.Gson
 
-object JsonExtensions {
+val gson = Gson()
 
-    fun Any.toJson(): String =
-        Gson().toJson(this)
+fun Any.toJson(): String =
+    gson.toJson(this)
 
-    fun <T> String.fromJson(clazz: Class<T>): T =
-        Gson().fromJson(this, clazz)
-}
+fun <T> String.fromJson(clazz: Class<T>): T =
+    gson.fromJson(this, clazz)
+
+inline fun <reified T> String.fromJson(): T =
+    gson.fromJson(this, T::class.java)
+
+fun <T> Any.jsonCast(to: Class<T>): T =
+    toJson().fromJson(to)
+
+inline fun <reified T> Any.jsonCast(): T =
+    toJson().fromJson(T::class.java)
+
+fun <T> Any.tryJsonCast(to: Class<T>): T? = try {
+    toJson().fromJson(to)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
+}
+
+inline fun <reified T> Any.tryJsonCast(): T? = try {
+    toJson().fromJson(T::class.java)
+} catch (ex: Exception) {
+    ex.printStackTrace()
+    null
+}