taler-android

commit b50a3493fc6b4bb760c7c5ad8be765687aaeb53d
parent 39a0205fcada790169dea8cc1a5e70c37259dd2e
Author: Iván Ávalos <avalos@disroot.org>
Date:   Fri,  7 Feb 2025 14:59:58 +0100

[wallet] Withdraw demo money from demo.taler.net instead of test.taler.net

Diffstat:
M
wallet/src/main/java/net/taler/wallet/MainFragment.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
 | 
2
+-
M
wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
 | 
9
+++++++--
M
wallet/src/main/res/values/strings.xml
 | 
2
+-

4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/MainFragment.kt b/wallet/src/main/java/net/taler/wallet/MainFragment.kt
@@ -176,7 +176,7 @@ class MainFragment: Fragment() {
                             selectedScope = selectedScope,
                             selectedCurrencySpec = selectedSpec,
                             onGetDemoMoneyClicked = {
-                                model.withdrawManager.withdrawTestkudos()
+                                model.withdrawManager.withdrawTestBalance()
                                 Snackbar.make(requireView(), getString(R.string.settings_test_withdrawal), LENGTH_LONG).show()
                             },
                             onBalanceClicked = {
diff --git a/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt b/wallet/src/main/java/net/taler/wallet/settings/SettingsFragment.kt
@@ -140,7 +140,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         prefWithdrawTest.setOnPreferenceClickListener {
-            withdrawManager.withdrawTestkudos()
+            withdrawManager.withdrawTestBalance()
             Snackbar.make(requireView(), getString(R.string.settings_test_withdrawal), LENGTH_LONG).show()
             findNavController().navigate(R.id.nav_main)
             true
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
@@ -224,9 +224,14 @@ class WithdrawManager(
     var exchangeFees: ExchangeFees? = null
         private set
 
-    fun withdrawTestkudos() = scope.launch {
+    fun withdrawTestBalance() = scope.launch {
         _withdrawTestStatus.value = TestWithdrawStatus.Withdrawing
-        api.request<Unit>("withdrawTestkudos").onError {
+        api.request<Unit>("withdrawTestBalance") {
+            put("amount", "KUDOS:10")
+            put("corebankApiBaseUrl", "https://bank.demo.taler.net/")
+            put("exchangeBaseUrl", "https://exchange.demo.taler.net/")
+            put("useForeignAccount", true)
+        }.onError {
             _withdrawTestStatus.value = TestWithdrawStatus.Error(it.userFacingMsg)
         }.onSuccess {
             _withdrawTestStatus.value = TestWithdrawStatus.Success
diff --git a/wallet/src/main/res/values/strings.xml b/wallet/src/main/res/values/strings.xml
@@ -382,7 +382,7 @@ GNU Taler is immune against many types of fraud, such as phishing of credit card
     <string name="settings_version_protocol_exchange">Supported Exchange versions</string>
     <string name="settings_version_protocol_merchant">Supported Merchant versions</string>
     <string name="settings_version_unknown">Unknown</string>
-    <string name="settings_withdraw_testkudos">Withdraw TESTKUDOS</string>
+    <string name="settings_withdraw_testkudos">Withdraw demo KUDOS</string>
     <string name="settings_withdraw_testkudos_summary">Get money for testing</string>
 
     <!-- Refunds -->