diff options
author | Torsten Grote <t@grobox.de> | 2020-08-24 14:28:34 -0300 |
---|---|---|
committer | Torsten Grote <t@grobox.de> | 2020-08-24 14:28:34 -0300 |
commit | 35bc91761ad1f8336f331c6b04cff8bf4d9ae064 (patch) | |
tree | 330c195f60d909de5de4d156357a1f74847da70e /wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt | |
parent | d3955c2d8ae552c22547a186ab196274e32919e7 (diff) | |
download | taler-android-35bc91761ad1f8336f331c6b04cff8bf4d9ae064.tar.gz taler-android-35bc91761ad1f8336f331c6b04cff8bf4d9ae064.tar.bz2 taler-android-35bc91761ad1f8336f331c6b04cff8bf4d9ae064.zip |
Upgrade to Kotlin 1.4
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt')
-rw-r--r-- | wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt b/wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt index ab3d42e..57ce82e 100644 --- a/wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt +++ b/wallet/src/main/java/net/taler/wallet/backend/WalletResponse.kt @@ -21,18 +21,17 @@ import com.fasterxml.jackson.databind.DeserializationContext import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.deser.std.StdDeserializer -import kotlinx.serialization.Decoder -import kotlinx.serialization.Encoder import kotlinx.serialization.KSerializer -import kotlinx.serialization.PrimitiveDescriptor -import kotlinx.serialization.PrimitiveKind.STRING import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable -import kotlinx.serialization.json.JsonInput +import kotlinx.serialization.descriptors.PrimitiveKind.STRING +import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor +import kotlinx.serialization.encoding.Decoder +import kotlinx.serialization.encoding.Encoder +import kotlinx.serialization.json.JsonDecoder import kotlinx.serialization.json.JsonObject import org.json.JSONObject - @Serializable sealed class WalletResponse<T> { @Serializable @@ -96,11 +95,11 @@ data class WalletErrorInfo( class JSONObjectDeserializer : KSerializer<JSONObject> { - override val descriptor = PrimitiveDescriptor("JSONObjectDeserializer", STRING) + override val descriptor = PrimitiveSerialDescriptor("JSONObjectDeserializer", STRING) override fun deserialize(decoder: Decoder): JSONObject { - val input = decoder as JsonInput - val tree = input.decodeJson() as JsonObject + val input = decoder as JsonDecoder + val tree = input.decodeJsonElement() as JsonObject return JSONObject(tree.toString()) } |