taler-android

commit 86c397d5096acbedffdd9d8235e443c69a5522e1
parent 2a9a915df8bfefe6a3014c2f1f1f19da1c720fa7
Author: Iván Ávalos <avalos@disroot.org>
Date:   Sat,  9 May 2026 21:06:44 +0200

[wallet] fix last remaining lint errors

Diffstat:
M
cashier/src/main/java/net/taler/cashier/MainViewModel.kt
 | 
2
+-
M
cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
 | 
1
+
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
 | 
16
++++++++++------
M
wallet/src/main/AndroidManifest.xml
 | 
2
+-

4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/cashier/src/main/java/net/taler/cashier/MainViewModel.kt b/cashier/src/main/java/net/taler/cashier/MainViewModel.kt
@@ -100,7 +100,7 @@ class MainViewModel(private val app: Application) : AndroidViewModel(app) {
         mBalance.postValue(result)
     }
 
-    fun lock() {
+    fun lock() = viewModelScope.launch(Dispatchers.IO) {
         configManager.lock()
     }
 
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
@@ -149,6 +149,7 @@ class ConfigManager(
             .commit()
     }
 
+    @WorkerThread
     fun lock() {
         saveConfig(config.copy(password = ""))
     }
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
@@ -36,6 +36,7 @@ import io.ktor.http.HttpStatusCode.Companion.Unauthorized
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import net.taler.common.Version
 import net.taler.common.getIncompatibleStringOrNull
 import net.taler.merchantlib.ConfigResponse
@@ -257,6 +258,7 @@ class ConfigManager(
         migrateLegacyPrefsIfNeeded();
     }
 
+    @Volatile
     var config: Config =
         Config.New(
             merchantUrl = prefs.getString(SETTINGS_MERCHANT_URL, "")!!,
@@ -373,13 +375,15 @@ class ConfigManager(
                 return
             }
         }
-        newConfig?.let {
-            config = it
-            saveConfig(it)
+        withContext(Dispatchers.Main) {
+            newConfig?.let {
+                config = it
+                saveConfig(it)
+            }
+            this@ConfigManager.merchantConfig = merchantConfig
+            this@ConfigManager.currency = configResponse.currency
+            mConfigUpdateResult.value = ConfigUpdateResult.Success(configResponse.currency)
         }
-        this.merchantConfig = merchantConfig
-        this.currency = configResponse.currency
-        mConfigUpdateResult.postValue(ConfigUpdateResult.Success(configResponse.currency))
     }
 
     /**
diff --git a/wallet/src/main/AndroidManifest.xml b/wallet/src/main/AndroidManifest.xml
@@ -121,7 +121,7 @@
             <data
                 android:host="iban"
                 android:scheme="payto" />
-            <action />
+            <action android:name="android.intent.action.VIEW" />
         </intent>
     </queries>