Merge pull request #6 from appwrite/dev

feat: sdk updates

Author: christyjacob4

library/build.gradle

@@ -1,5 +1,4 @@
 import org.jetbrains.kotlin.config.KotlinCompilerVersion
-
 plugins {
     id("com.android.library")
     id("kotlin-android")
@@ -72,6 +71,9 @@ dependencies {
     implementation("com.github.franmontiel:PersistentCookieJar:v1.0.1")
 
     testImplementation 'junit:junit:4.+'
+    testImplementation "androidx.test.ext:junit-ktx:1.1.2"
+    testImplementation "androidx.test:core-ktx:1.3.0"
+    testImplementation "org.robolectric:robolectric:4.5.1"
 }
 
 apply from: "${rootProject.projectDir}/scripts/publish-module.gradle"

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

@@ -72,7 +72,7 @@ class Client @JvmOverloads constructor(
             "content-type" to "application/json",
             "origin" to "appwrite-android://${context.packageName}",
             "user-agent" to "${context.packageName}/${appVersion}, ${System.getProperty("http.agent")}",
-            "x-sdk-version" to "appwrite:kotlin:0.0.0-SNAPSHOT",            
+            "x-sdk-version" to "appwrite:android:0.0.0-SNAPSHOT",            
             "x-appwrite-response-format" to "0.8.0"
         )
         config = mutableMapOf()
@@ -106,7 +106,6 @@ class Client @JvmOverloads constructor(
         val builder = OkHttpClient()
             .newBuilder()
             .cookieJar(cookieJar)
-            .addInterceptor(HttpLoggingInterceptor().apply { setLevel(HttpLoggingInterceptor.Level.BODY) })
 
         if (!selfSigned) {
             http = builder.build()
@@ -148,7 +147,7 @@ class Client @JvmOverloads constructor(
         return this
     }
 
-    private fun addHeader(key: String, value: String): Client {
+    fun addHeader(key: String, value: String): Client {
         headers[key] = value
         return this
     }
@@ -242,13 +241,18 @@ class Client @JvmOverloads constructor(
                     val bodyString = response.body
                         ?.charStream()
                         ?.buffered()
-                        ?.use(BufferedReader::readText)
+                        ?.use(BufferedReader::readText) ?: ""
 
-                    val error = bodyString?.fromJson(Error::class.java)
+                    val contentType: String = response.headers["content-type"] ?: ""
+                    val error = if (contentType.contains("application/json", ignoreCase = true)) {
+                        bodyString.fromJson(Error::class.java)
+                    } else {
+                        Error(bodyString, response.code)
+                    }
 
                     it.cancel(AppwriteException(
-                        error?.message,
-                        error?.code,
+                        error.message,
+                        error.code,
                         bodyString
                     ))
                 }