taler-android

commit 4390cf084c67c6148c3b327e464972124de972d3
parent 535d9dcff2b71d7ae9bf2a1d75c24d7a8e8e4329
Author: Iván Ávalos <avalos@disroot.org>
Date:   Tue, 30 Jan 2024 22:01:35 -0600

[wallet] Load wallet-core version from wallet-core itself

bug 0008230

Diffstat:
M
wallet/src/main/java/net/taler/wallet/MainViewModel.kt
 | 
6
++++++
M
wallet/src/main/java/net/taler/wallet/backend/InitResponse.kt
 | 
7
+++++--
M
wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
 | 
3
+--

3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/MainViewModel.kt b/wallet/src/main/java/net/taler/wallet/MainViewModel.kt
@@ -66,6 +66,10 @@ class MainViewModel(
 
     val devMode = MutableLiveData(BuildConfig.DEBUG)
     val showProgressBar = MutableLiveData<Boolean>()
+    var walletVersion: String? = null
+        private set
+    var walletVersionHash: String? = null
+        private set
     var exchangeVersion: String? = null
         private set
     var merchantVersion: String? = null
@@ -94,6 +98,8 @@ class MainViewModel(
     val scanCodeEvent: LiveData<Event<Boolean>> = mScanCodeEvent
 
     override fun onVersionReceived(versionInfo: WalletCoreVersion) {
+        walletVersion = versionInfo.implementationSemver
+        walletVersionHash = versionInfo.implementationGitHash
         exchangeVersion = versionInfo.exchange
         merchantVersion = versionInfo.merchant
     }
diff --git a/wallet/src/main/java/net/taler/wallet/backend/InitResponse.kt b/wallet/src/main/java/net/taler/wallet/backend/InitResponse.kt
@@ -29,10 +29,13 @@ fun interface VersionReceiver {
 
 @Serializable
 data class WalletCoreVersion(
-    val hash: String? = null,
+    val implementationSemver: String,
+    val implementationGitHash: String,
     val version: String,
     val exchange: String,
     val merchant: String,
-    val bank: String,
+    val bankIntegrationApiRange: String,
+    val bankConversionApiRange: String,
+    val corebankApiRange: String,
     val devMode: Boolean,
 )
diff --git a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -28,7 +28,6 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.BaseTransientBottomBar.LENGTH_SHORT
 import com.google.android.material.snackbar.Snackbar
 import net.taler.common.showError
-import net.taler.qtart.BuildConfig.WALLET_CORE_VERSION
 import net.taler.wallet.BuildConfig.FLAVOR
 import net.taler.wallet.BuildConfig.VERSION_CODE
 import net.taler.wallet.BuildConfig.VERSION_NAME
@@ -104,7 +103,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             prefDevMode.isChecked = enabled
             if (enabled) {
                 prefVersionApp.summary = "$VERSION_NAME ($FLAVOR $VERSION_CODE)"
-                prefVersionCore.summary = WALLET_CORE_VERSION
+                prefVersionCore.summary = "${model.walletVersion} (${model.walletVersionHash?.take(7)})"
                 model.exchangeVersion?.let { prefVersionExchange.summary = it }
                 model.merchantVersion?.let { prefVersionMerchant.summary = it }
             }