Skip to content

Commit 14e2a20

Browse files
committed
Move to non-appwrite package
1 parent 6fa5f60 commit 14e2a20

29 files changed

+21
-27
lines changed

templates/android/library/src/main/java/io/appwrite/Client.kt.twig renamed to templates/android/library/src/main/java/io/package/Client.kt.twig

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,11 @@ package {{ sdk.namespace | caseDot }}
33
import android.content.Context
44
import android.content.Intent
55
import android.content.pm.PackageManager
6-
import com.google.gson.GsonBuilder
7-
import com.google.gson.reflect.TypeToken
86
import {{ sdk.namespace | caseDot }}.cookies.ListenableCookieJar
97
import {{ sdk.namespace | caseDot }}.cookies.stores.SharedPreferencesCookieStore
108
import {{ sdk.namespace | caseDot }}.exceptions.{{ spec.title | caseUcfirst }}Exception
11-
import {{ sdk.namespace | caseDot }}.json.PreciseNumberAdapter
9+
import {{ sdk.namespace | caseDot }}.extensions.fromJson
10+
import {{ sdk.namespace | caseDot }}.extensions.toJson
1211
import {{ sdk.namespace | caseDot }}.models.InputFile
1312
import {{ sdk.namespace | caseDot }}.models.UploadProgress
1413
import kotlinx.coroutines.CoroutineScope
@@ -55,11 +54,6 @@ class Client @JvmOverloads constructor(
5554

5655
private val job = Job()
5756

58-
private val gson = GsonBuilder().registerTypeAdapter(
59-
object : TypeToken<Map<String, Any>>(){}.type,
60-
PreciseNumberAdapter()
61-
).create()
62-
6357
internal lateinit var http: OkHttpClient
6458

6559
internal val headers: MutableMap<String, String>
@@ -99,12 +93,6 @@ class Client @JvmOverloads constructor(
9993
config = mutableMapOf()
10094

10195
setSelfSigned(selfSigned)
102-
103-
NotificationHandler.client = this
104-
105-
context.startService(Intent(context, NotificationHandler::class.java).apply {
106-
action = NotificationHandler.ACTION_CLIENT_INIT
107-
})
10896
}
10997

11098
{% for header in spec.global.headers %}
@@ -312,7 +300,8 @@ class Client @JvmOverloads constructor(
312300
}
313301
builder.build()
314302
} else {
315-
gson.toJson(filteredParams)
303+
filteredParams
304+
.toJson()
316305
.toRequestBody("application/json".toMediaType())
317306
}
318307

@@ -482,10 +471,8 @@ class Client @JvmOverloads constructor(
482471
.use(BufferedReader::readText)
483472

484473
val error = if (response.headers["content-type"]?.contains("application/json") == true) {
485-
val map = gson.fromJson<Map<String, Any>>(
486-
body,
487-
object : TypeToken<Map<String, Any>>(){}.type
488-
)
474+
val map = body.fromJson<Map<String, Any>>()
475+
489476
{{ spec.title | caseUcfirst }}Exception(
490477
map["message"] as? String ?: "",
491478
(map["code"] as Number).toInt(),
@@ -524,10 +511,9 @@ class Client @JvmOverloads constructor(
524511
it.resume(true as T)
525512
return
526513
}
527-
val map = gson.fromJson<Any>(
528-
body,
529-
object : TypeToken<Any>(){}.type
530-
)
514+
515+
val map = body.fromJson<Any>()
516+
531517
it.resume(
532518
converter?.invoke(map) ?: map as T
533519
)

templates/android/library/src/main/java/io/appwrite/services/Service.kt.twig renamed to templates/android/library/src/main/java/io/package/Service.kt.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package {{ sdk.namespace | caseDot }}.services
1+
package {{ sdk.namespace | caseDot }}
22

33
import {{ sdk.namespace | caseDot }}.Client
44

0 commit comments

Comments
 (0)