From 023ea96d26a65d29d408ef78c9405411bb842afd Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Mon, 16 May 2022 19:58:31 +0200
Subject: -remove multiplatform dependency, library upgrade WIP

---
 .../src/main/java/net/taler/merchantpos/config/ConfigManager.kt    | 7 ++++---
 .../src/main/java/net/taler/merchantpos/config/PosConfig.kt        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config')

diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
index 165bb8e..4327f4e 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
@@ -26,7 +26,8 @@ import androidx.annotation.WorkerThread
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import io.ktor.client.HttpClient
-import io.ktor.client.features.ClientRequestException
+import io.ktor.client.call.body
+import io.ktor.client.plugins.ClientRequestException
 import io.ktor.client.request.get
 import io.ktor.client.request.header
 import io.ktor.http.HttpHeaders.Authorization
@@ -34,8 +35,8 @@ import io.ktor.http.HttpStatusCode.Companion.Unauthorized
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import net.taler.common.Version
 import net.taler.common.getIncompatibleStringOrNull
-import net.taler.lib.common.Version
 import net.taler.merchantlib.ConfigResponse
 import net.taler.merchantlib.MerchantApi
 import net.taler.merchantlib.MerchantConfig
@@ -105,7 +106,7 @@ class ConfigManager(
                     val credentials = "${config.username}:${config.password}"
                     val auth = ("Basic ${encodeToString(credentials.toByteArray(), NO_WRAP)}")
                     header(Authorization, auth)
-                }
+                }.body()
                 val merchantConfig = posConfig.merchantConfig
                 // get config from merchant backend API
                 api.getConfig(merchantConfig.baseUrl).handleSuspend(::onNetworkError) {
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
index 971f92c..1f1ab74 100644
--- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
+++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/PosConfig.kt
@@ -19,10 +19,10 @@ package net.taler.merchantpos.config
 import android.os.Build.VERSION.SDK_INT
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
+import net.taler.common.Amount
 import net.taler.common.ContractProduct
 import net.taler.common.Product
 import net.taler.common.TalerUtils
-import net.taler.lib.common.Amount
 import net.taler.merchantlib.MerchantConfig
 import java.util.UUID
 
-- 
cgit v1.2.3