taler-android

commit 1a93d0809653210988a66dc6c368e1531365deda
parent 53163f914e8173239188beb01da2570642041b6a
Author: Iván Ávalos <avalos@disroot.org>
Date:   Wed, 28 Feb 2024 11:40:36 -0600

    [wallet] Remove bank URL from x-taler-bank URI, add receiver name to IBAN

    bug 0008532

Diffstat:
M
wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
 | 
3
+--
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt
 | 
3
+++
M
wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt
 | 
5
-----

3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt b/wallet/src/main/java/net/taler/wallet/withdraw/WithdrawManager.kt
@@ -97,7 +97,6 @@ sealed class TransferData {
         override val amountEffective: Amount,
         override val withdrawalAccount: WithdrawalExchangeAccountDetails,
         val receiverName: String? = null,
-        val bankUrl: String,
         val account: String,
     ): TransferData()
 
@@ -382,7 +381,6 @@ fun createManualTransferRequired(
         } else if (uri.authority.equals("x-taler-bank", true)) {
             TransferData.Taler(
                 account = uri.lastPathSegment!!,
-                bankUrl = uri.pathSegments.first(),
                 receiverName = uri.getQueryParameter("receiver_name"),
                 subject = uri.getQueryParameter("message") ?: "Error: No message in URI",
                 amountRaw = amountRaw,
@@ -392,6 +390,7 @@ fun createManualTransferRequired(
         } else if (uri.authority.equals("iban", true)) {
             TransferData.IBAN(
                 iban = uri.lastPathSegment!!,
+                receiverName = uri.getQueryParameter("receiver_name"),
                 subject = uri.getQueryParameter("message") ?: "Error: No message in URI",
                 amountRaw = amountRaw,
                 amountEffective = amountEffective,
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferIBAN.kt
@@ -67,6 +67,9 @@ fun TransferIBAN(
                 .padding(all = 16.dp)
         )
 
+        transfer.receiverName?.let {
+            DetailRow(stringResource(R.string.withdraw_manual_ready_receiver), it)
+        }
         DetailRow(stringResource(R.string.withdraw_manual_ready_iban), transfer.iban)
         DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
 
diff --git a/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt b/wallet/src/main/java/net/taler/wallet/withdraw/manual/TransferTaler.kt
@@ -72,11 +72,6 @@ fun TransferTaler(
         }
         DetailRow(stringResource(R.string.withdraw_manual_ready_account), transfer.account)
         DetailRow(stringResource(R.string.withdraw_manual_ready_subject), transfer.subject)
-        
-        TransactionInfoComposable(
-            label = stringResource(R.string.withdraw_bank),
-            info = cleanExchange(transfer.bankUrl),
-        )
 
         TransactionInfoComposable(
             label = stringResource(R.string.withdraw_exchange),