From 8eb241ccce345a35b05a6335d11306465220f66d Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Thu, 23 Jul 2020 15:41:50 -0300 Subject: [pos] refactor configuration fetching and validation --- .../java/net/taler/merchantpos/config/MerchantRequest.kt | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt') diff --git a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt index 9cfae94..5d41196 100644 --- a/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt +++ b/merchant-terminal/src/main/java/net/taler/merchantpos/config/MerchantRequest.kt @@ -16,9 +16,11 @@ package net.taler.merchantpos.config +import android.net.Uri import android.util.ArrayMap import com.android.volley.Response import com.android.volley.toolbox.JsonObjectRequest +import net.taler.merchantlib.MerchantConfig import net.taler.merchantpos.LogErrorListener import org.json.JSONObject @@ -33,7 +35,7 @@ class MerchantRequest( ) : JsonObjectRequest( method, - merchantConfig.urlFor(endpoint, params), + merchantConfig.legacyUrl(endpoint, params), jsonRequest, listener, errorListener @@ -44,4 +46,14 @@ class MerchantRequest( headerMap["Authorization"] = "ApiKey " + merchantConfig.apiKey return headerMap } + +} + +private fun MerchantConfig.legacyUrl(endpoint: String, params: Map?): String { + val uriBuilder = Uri.parse(baseUrl).buildUpon() + uriBuilder.appendPath(endpoint) + params?.forEach { + uriBuilder.appendQueryParameter(it.key, it.value) + } + return uriBuilder.toString() } -- cgit v1.2.3