summaryrefslogtreecommitdiff
path: root/merchant-lib
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-09-03 14:35:49 -0300
committerTorsten Grote <t@grobox.de>2020-09-03 14:39:30 -0300
commite92fb0d6d4f20c0109638a695f30bd8737686d7b (patch)
treefdf59619d448a03cca786880185ecacc8832d326 /merchant-lib
parent4572a3d5fc5ae5f3bbeaa8836fb919dcec0483e0 (diff)
downloadtaler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.tar.gz
taler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.tar.bz2
taler-android-e92fb0d6d4f20c0109638a695f30bd8737686d7b.zip
Remove instance parameter from merchant config
and reset order state when moving to new config
Diffstat (limited to 'merchant-lib')
-rw-r--r--merchant-lib/src/main/java/net/taler/merchantlib/Config.kt3
1 files changed, 0 insertions, 3 deletions
diff --git a/merchant-lib/src/main/java/net/taler/merchantlib/Config.kt b/merchant-lib/src/main/java/net/taler/merchantlib/Config.kt
index eb09485..572ab3d 100644
--- a/merchant-lib/src/main/java/net/taler/merchantlib/Config.kt
+++ b/merchant-lib/src/main/java/net/taler/merchantlib/Config.kt
@@ -38,15 +38,12 @@ data class ConfigResponse(
data class MerchantConfig(
@SerialName("base_url")
val baseUrl: String,
- // TODO remove instance when it is part of baseURL
- val instance: String? = null,
@SerialName("api_key")
val apiKey: String
) {
fun urlFor(endpoint: String): String {
val sb = StringBuilder(baseUrl)
if (sb.last() != '/') sb.append('/')
- instance?.let { sb.append("instances/$it/") }
sb.append(endpoint)
return sb.toString()
}