From aa6dad91b20edd0a304423d1edc267cf4e8b5dbe Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Wed, 1 Apr 2020 15:02:15 -0300
Subject: [pos] Enable refunds

---
 .../src/main/java/net/taler/merchantpos/config/ConfigManager.kt     | 6 +++---
 .../src/main/java/net/taler/merchantpos/config/MerchantRequest.kt   | 3 ++-
 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 edb8059..171cf28 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,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.android.volley.Request.Method.GET
 import com.android.volley.RequestQueue
-import com.android.volley.Response.ErrorListener
 import com.android.volley.Response.Listener
 import com.android.volley.VolleyError
 import com.android.volley.toolbox.JsonObjectRequest
@@ -35,6 +34,7 @@ import com.fasterxml.jackson.module.kotlin.readValue
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import net.taler.merchantpos.LogErrorListener
 import net.taler.merchantpos.R
 import org.json.JSONObject
 
@@ -91,7 +91,7 @@ class ConfigManager(
 
         val stringRequest = object : JsonObjectRequest(GET, config.configUrl, null,
             Listener { onConfigReceived(it, configToSave) },
-            ErrorListener { onNetworkError(it) }
+            LogErrorListener { onNetworkError(it) }
         ) {
             // send basic auth header
             override fun getHeaders(): MutableMap<String, String> {
@@ -117,7 +117,7 @@ class ConfigManager(
         val params = mapOf("instance" to merchantConfig.instance)
         val req = MerchantRequest(GET, merchantConfig, "config", params, null,
             Listener { onMerchantConfigReceived(config, json, merchantConfig, it) },
-            ErrorListener { onNetworkError(it) }
+            LogErrorListener { onNetworkError(it) }
         )
         queue.add(req)
     }
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 8d95378..862dd33 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
@@ -20,6 +20,7 @@ package net.taler.merchantpos.config
 import android.util.ArrayMap
 import com.android.volley.Response
 import com.android.volley.toolbox.JsonObjectRequest
+import net.taler.merchantpos.LogErrorListener
 import org.json.JSONObject
 
 class MerchantRequest(
@@ -29,7 +30,7 @@ class MerchantRequest(
     params: Map<String, String>?,
     jsonRequest: JSONObject?,
     listener: Response.Listener<JSONObject>,
-    errorListener: Response.ErrorListener
+    errorListener: LogErrorListener
 ) :
     JsonObjectRequest(method, merchantConfig.urlFor(endpoint, params), jsonRequest, listener, errorListener) {
 
-- 
cgit v1.2.3