[wallet] Error handling for exchange key reloadingHEADmasterdev/ivan-avalos/master

bug 0008298

2 files changed, 11 insertions, 1 deletions

diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeListFragment.kt b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeListFragment.kt
index dddf8d8..8a40bff 100644
--- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeListFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeListFragment.kt
@@ -110,6 +110,13 @@ open class ExchangeListFragment : Fragment(), ExchangeClickListener {
                 showError(error.userFacingMsg)
             }
         })
+        exchangeManager.reloadError.observe(viewLifecycleOwner, EventObserver { error ->
+            if (model.devMode.value == true) {
+                showError(error)
+            } else {
+                showError(error.userFacingMsg)
+            }
+        })
     }
 
     protected open fun onExchangeUpdate(exchanges: List<ExchangeItem>) {
diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
index 5b688dc..fa357b5 100644
--- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeManager.kt
@@ -62,6 +62,9 @@ class ExchangeManager(
     private val mDeleteError = MutableLiveData<Event<TalerErrorInfo>>()
     val deleteError: LiveData<Event<TalerErrorInfo>> = mDeleteError
 
+    private val mReloadError = MutableLiveData<Event<TalerErrorInfo>>()
+    val reloadError: LiveData<Event<TalerErrorInfo>> = mReloadError
+
     var withdrawalExchange: ExchangeItem? = null
 
     private fun list(): LiveData<List<ExchangeItem>> {
@@ -103,7 +106,7 @@ class ExchangeManager(
         }.onError {
             Log.e(TAG, "Error reloading exchange: $it")
             mProgress.value = false
-            mAddError.value = it.toEvent()
+            mReloadError.value = it.toEvent()
         }.onSuccess {
             mProgress.value = false
             Log.d(TAG, "Exchange $exchangeUrl reloaded")