summaryrefslogtreecommitdiff
path: root/merchant-terminal/src/main/java/net/taler/merchantpos/config
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-08-11 09:41:40 -0300
committerTorsten Grote <t@grobox.de>2020-08-11 09:41:40 -0300
commitf0670e2f3936f0223c02e9ec0d0de52f31a3539f (patch)
treef50cfc07029a024f06b79ee6b5031f5ba668a0f5 /merchant-terminal/src/main/java/net/taler/merchantpos/config
parenta20adabb2cfbaa2a78acac6560d81c27ca721731 (diff)
downloadtaler-android-f0670e2f3936f0223c02e9ec0d0de52f31a3539f.tar.gz
taler-android-f0670e2f3936f0223c02e9ec0d0de52f31a3539f.tar.bz2
taler-android-f0670e2f3936f0223c02e9ec0d0de52f31a3539f.zip
[pos] Improve coroutine-based merchant library access
Diffstat (limited to 'merchant-terminal/src/main/java/net/taler/merchantpos/config')
-rw-r--r--merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt6
1 files changed, 3 insertions, 3 deletions
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 c0b01a2..67e3685 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
@@ -30,6 +30,7 @@ import io.ktor.client.features.ClientRequestException
import io.ktor.client.request.get
import io.ktor.client.request.header
import io.ktor.http.HttpHeaders.Authorization
+import io.ktor.http.HttpStatusCode.Companion.Unauthorized
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -114,7 +115,7 @@ class ConfigManager(
Log.e(TAG, "Error retrieving merchant config", e)
val msg = if (e is ClientRequestException) {
context.getString(
- if (e.response.status.value == 401) R.string.config_auth_error
+ if (e.response.status == Unauthorized) R.string.config_auth_error
else R.string.config_error_network
)
} else {
@@ -145,7 +146,7 @@ class ConfigManager(
Log.e(TAG, "Error handling configuration by ${receiver::class.java.simpleName}", e)
context.getString(R.string.config_error_unknown)
}
- if (result != null) { // error
+ if (result != null) { // error
mConfigUpdateResult.postValue(ConfigUpdateResult.Error(result))
return
}
@@ -178,7 +179,6 @@ class ConfigManager(
private fun onNetworkError(msg: String) = scope.launch(Dispatchers.Main) {
mConfigUpdateResult.value = ConfigUpdateResult.Error(msg)
}
-
}
sealed class ConfigUpdateResult {