taler-android

commit 7915c0c6b6e035909c72000175cb509e67490718
parent 9f230c0aeeccb3a766ece438929ad5ea6259c63f
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 29 May 2024 14:16:12 -0600

[pos] Fix config retrieval from prefs

bug 0008838

Diffstat:
M
merchant-terminal/src/main/java/net/taler/merchantpos/config/ConfigManager.kt
 | 
16
++++++++++++----

1 file changed, 12 insertions(+), 4 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
@@ -90,10 +90,18 @@ class ConfigManager(
     private val prefs = context.getSharedPreferences(SETTINGS_NAME, MODE_PRIVATE)
     private val configurationReceivers = ArrayList<ConfigurationReceiver>()
 
-    var config: Config = Config.New(
-        merchantUrl = prefs.getString(SETTINGS_MERCHANT_URL, "")!!,
-        accessToken = prefs.getString(SETTINGS_ACCESS_TOKEN, NEW_CONFIG_ACCESS_TOKEN_DEMO)!!,
-    )
+    var config: Config = if (prefs.getInt(SETTINGS_CONFIG_VERSION, CONFIG_VERSION_OLD) == CONFIG_VERSION_NEW) {
+        Config.New(
+            merchantUrl = prefs.getString(SETTINGS_MERCHANT_URL, "")!!,
+            accessToken = prefs.getString(SETTINGS_ACCESS_TOKEN, NEW_CONFIG_ACCESS_TOKEN_DEMO)!!,
+        )
+    } else {
+        Config.Old(
+            configUrl = prefs.getString(SETTINGS_CONFIG_URL, "")!!,
+            username = prefs.getString(SETTINGS_USERNAME, OLD_CONFIG_USERNAME_DEMO)!!,
+            password = prefs.getString(SETTINGS_PASSWORD, OLD_CONFIG_PASSWORD_DEMO)!!,
+        )
+    }
 
     @Volatile
     var merchantConfig: MerchantConfig? = null