From 41459266eae410f2f2e07087038563cab98a3692 Mon Sep 17 00:00:00 2001 From: NicolasBourdin88 Date: Tue, 28 May 2024 14:49:05 +0200 Subject: [PATCH 1/3] Change import to kotlinx serialization --- src/main/java/com/infomaniak/lib/core/api/ApiController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt index 62ed2e6b..73f1143d 100644 --- a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt +++ b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt @@ -20,7 +20,6 @@ package com.infomaniak.lib.core.api import androidx.annotation.StringRes import com.google.gson.Gson import com.google.gson.GsonBuilder -import com.google.gson.JsonElement import com.google.gson.JsonParser import com.google.gson.reflect.TypeToken import com.infomaniak.lib.core.BuildConfig.LOGIN_ENDPOINT_URL @@ -38,6 +37,7 @@ import com.infomaniak.lib.login.ApiToken import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import kotlinx.serialization.json.Json +import kotlinx.serialization.json.JsonElement import kotlinx.serialization.json.JsonObject import kotlinx.serialization.json.JsonPrimitive import okhttp3.MediaType.Companion.toMediaTypeOrNull From c3763f79dbcddd5ec0bcf6995e584c408064589e Mon Sep 17 00:00:00 2001 From: NicolasBourdin88 Date: Tue, 28 May 2024 16:40:48 +0200 Subject: [PATCH 2/3] Add Kotlinx serialization to Json Element --- src/main/java/com/infomaniak/lib/core/api/ApiController.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt index 73f1143d..b8da40ba 100644 --- a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt +++ b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt @@ -87,7 +87,7 @@ object ApiController { fun generateRequestBody(body: Any?): RequestBody { val jsonMediaType = "application/json; charset=utf-8".toMediaTypeOrNull() val toJson = when (body) { - is JsonElement -> body.toString() + is JsonElement, is com.google.gson.JsonElement -> body.toString() is String -> body else -> gson.toJson(body) } From 165410e2c2154be6359eef6a286efcaa597b0a12 Mon Sep 17 00:00:00 2001 From: Kevin Boulongne Date: Wed, 29 May 2024 07:06:46 +0200 Subject: [PATCH 3/3] Use an alias instead of full package for Gson JsonElement --- src/main/java/com/infomaniak/lib/core/api/ApiController.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt index b8da40ba..299ca986 100644 --- a/src/main/java/com/infomaniak/lib/core/api/ApiController.kt +++ b/src/main/java/com/infomaniak/lib/core/api/ApiController.kt @@ -49,6 +49,7 @@ import okhttp3.RequestBody.Companion.toRequestBody import java.lang.reflect.Type import java.net.UnknownHostException import java.util.Date +import com.google.gson.JsonElement as GsonElement object ApiController { @@ -87,7 +88,7 @@ object ApiController { fun generateRequestBody(body: Any?): RequestBody { val jsonMediaType = "application/json; charset=utf-8".toMediaTypeOrNull() val toJson = when (body) { - is JsonElement, is com.google.gson.JsonElement -> body.toString() + is JsonElement, is GsonElement -> body.toString() is String -> body else -> gson.toJson(body) }