taler-android

commit 7c4148fc6db5666e9e2538c4ebdcb43a649be811
parent 3b5e2a84d1ac589e1d550e80e3ae7b50b56fbbf9
Author: Iván Ávalos <avalos@disroot.org>
Date:   Mon,  2 Sep 2024 19:27:05 +0200

[pos] follow HTTP redirects

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
 | 
2
+-
M
taler-kotlin-android/src/main/java/net/taler/common/HttpUtils.kt
 | 
4
++++

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/MainViewModel.kt
@@ -29,7 +29,7 @@ import net.taler.merchantpos.refund.RefundManager
 
 class MainViewModel(app: Application) : AndroidViewModel(app) {
 
-    private val httpClient = getDefaultHttpClient()
+    private val httpClient = getDefaultHttpClient(followRedirect = true)
     private val api = MerchantApi(httpClient)
 
     val orderManager = OrderManager(app)
diff --git a/taler-kotlin-android/src/main/java/net/taler/common/HttpUtils.kt b/taler-kotlin-android/src/main/java/net/taler/common/HttpUtils.kt
@@ -18,6 +18,7 @@ package net.taler.common
 
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.okhttp.OkHttp
+import io.ktor.client.plugins.HttpRedirect
 import io.ktor.client.plugins.HttpTimeout
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.client.plugins.logging.ANDROID
@@ -59,6 +60,9 @@ fun getDefaultHttpClient(
         socketTimeoutMillis = HttpTimeout.INFINITE_TIMEOUT_MS
         connectTimeoutMillis = HttpTimeout.INFINITE_TIMEOUT_MS
     }
+    install(HttpRedirect) {
+        checkHttpMethod = !followRedirect
+    }
     install(Logging) {
         logger = Logger.ANDROID
         level = if (logging) LogLevel.INFO else LogLevel.NONE