[taler-taler-android] branch master updated (f7649e3 -> 43ad014)

[gnunet]

This is an automated email from the git hooks/post-receive script.

torsten-grote pushed a change to branch master
in repository taler-android.

    from f7649e3  Fix some lint warnings
     new 8643037  [wallet] Change 'Subject' to 'Purpose' for pay-push and 
pay-pull
     new 43ad014  [wallet] Fix crash when exchange is missing currency

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt   | 11 ++++++++---
 .../java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt |  2 +-
 .../java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt |  2 +-
 .../java/net/taler/wallet/peer/TransactionPeerPullCredit.kt   |  2 +-
 .../java/net/taler/wallet/peer/TransactionPeerPullDebit.kt    |  2 +-
 .../java/net/taler/wallet/peer/TransactionPeerPushCredit.kt   |  2 +-
 .../java/net/taler/wallet/peer/TransactionPeerPushDebit.kt    |  2 +-
 .../taler/wallet/withdraw/manual/ManualWithdrawFragment.kt    |  5 +++--
 wallet/src/main/res/values/strings.xml                        |  1 +
 9 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt 
b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
index 5b0d947..e0cf5be 100644
--- a/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
+++ b/wallet/src/main/java/net/taler/wallet/exchanges/ExchangeAdapter.kt
@@ -34,8 +34,9 @@ import 
net.taler.wallet.exchanges.ExchangeAdapter.ExchangeItemViewHolder
 @Serializable
 data class ExchangeItem(
     val exchangeBaseUrl: String,
-    val currency: String,
-    val paytoUris: List<String>
+    // can be null before exchange info in wallet-core was fully loaded
+    val currency: String? = null,
+    val paytoUris: List<String>,
 ) {
     val name: String get() = cleanExchange(exchangeBaseUrl)
 }
@@ -79,7 +80,11 @@ internal class ExchangeAdapter(
 
         fun bind(item: ExchangeItem) {
             urlView.text = item.name
-            currencyView.text = 
context.getString(R.string.exchange_list_currency, item.currency)
+            currencyView.text = if (item.currency == null) {
+                context.getString(R.string.settings_version_unknown)
+            } else {
+                context.getString(R.string.exchange_list_currency, 
item.currency)
+            }
             if (selectOnly) {
                 itemView.setOnClickListener { 
listener.onExchangeSelected(item) }
                 overflowIcon.visibility = GONE
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt 
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
index d2091ee..5faea07 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPullIntroComposable.kt
@@ -76,7 +76,7 @@ fun OutgoingPullIntroComposable(
             isError = subject.isBlank(),
             label = {
                 Text(
-                    stringResource(R.string.withdraw_manual_ready_subject),
+                    stringResource(R.string.send_peer_purpose),
                     color = if (subject.isBlank()) {
                         colorResource(R.color.red)
                     } else Color.Unspecified,
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt 
b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
index 1964ebd..915d002 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingPushIntroComposable.kt
@@ -78,7 +78,7 @@ fun OutgoingPushIntroComposable(
             isError = subject.isBlank(),
             label = {
                 Text(
-                    stringResource(R.string.withdraw_manual_ready_subject),
+                    stringResource(R.string.send_peer_purpose),
                     color = if (subject.isBlank()) {
                         colorResource(R.color.red)
                     } else Color.Unspecified,
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt 
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
index 82a16be..02b3774 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullCredit.kt
@@ -58,7 +58,7 @@ fun ColumnScope.TransactionPeerPullCreditComposable(t: 
TransactionPeerPullCredit
         )
     }
     TransactionInfoComposable(
-        label = stringResource(id = R.string.withdraw_manual_ready_subject),
+        label = stringResource(id = R.string.send_peer_purpose),
         info = t.info.summary ?: "",
     )
     if (t.pending) {
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt 
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
index fc14ec1..d09a659 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPullDebit.kt
@@ -51,7 +51,7 @@ fun TransactionPeerPullDebitComposable(t: 
TransactionPeerPullDebit) {
         )
     }
     TransactionInfoComposable(
-        label = stringResource(id = R.string.withdraw_manual_ready_subject),
+        label = stringResource(id = R.string.send_peer_purpose),
         info = t.info.summary ?: "",
     )
 }
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt 
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
index ae8e7ac..e918c42 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushCredit.kt
@@ -51,7 +51,7 @@ fun TransactionPeerPushCreditComposable(t: 
TransactionPeerPushCredit) {
         )
     }
     TransactionInfoComposable(
-        label = stringResource(id = R.string.withdraw_manual_ready_subject),
+        label = stringResource(id = R.string.send_peer_purpose),
         info = t.info.summary ?: "",
     )
 }
diff --git 
a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt 
b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
index 2eb1c86..f068fb8 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/TransactionPeerPushDebit.kt
@@ -58,7 +58,7 @@ fun ColumnScope.TransactionPeerPushDebitComposable(t: 
TransactionPeerPushDebit)
         )
     }
     TransactionInfoComposable(
-        label = stringResource(id = R.string.withdraw_manual_ready_subject),
+        label = stringResource(id = R.string.send_peer_purpose),
         info = t.info.summary ?: "",
     )
     QrCodeUriComposable(
diff --git 
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
 
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
index 148b8c0..aae8c95 100644
--- 
a/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
+++ 
b/wallet/src/main/java/net/taler/wallet/withdraw/manual/ManualWithdrawFragment.kt
@@ -67,7 +67,8 @@ class ManualWithdrawFragment : Fragment() {
     }
 
     private fun onCheckFees() {
-        if (ui.amountView.text?.isEmpty() != false) {
+        val currency = exchangeItem.currency
+        if (currency == null || ui.amountView.text?.isEmpty() != false) {
             ui.amountLayout.error = getString(R.string.withdraw_amount_error)
             return
         }
@@ -79,7 +80,7 @@ class ManualWithdrawFragment : Fragment() {
             ui.amountLayout.error = getString(R.string.withdraw_amount_error)
             return
         }
-        val amount = Amount.fromDouble(exchangeItem.currency, value)
+        val amount = Amount.fromDouble(currency, value)
         ui.amountView.hideKeyboard()
 
         withdrawManager.getWithdrawalDetails(exchangeItem.exchangeBaseUrl, 
amount)
diff --git a/wallet/src/main/res/values/strings.xml 
b/wallet/src/main/res/values/strings.xml
index b34bc24..472959d 100644
--- a/wallet/src/main/res/values/strings.xml
+++ b/wallet/src/main/res/values/strings.xml
@@ -143,6 +143,7 @@ GNU Taler is immune against many types of fraud, such as 
phishing of credit card
     <string name="send_peer_payment_instruction">Let the payee scan this QR 
code to receive:</string>
     <string name="send_peer_payment_amount_received">Amount received</string>
     <string name="send_peer_payment_amount_sent">Amount sent</string>
+    <string name="send_peer_purpose">Purpose</string>
 
     <string name="pay_peer_title">Pay invoice</string>
     <string name="pay_peer_intro">Do you want to pay this invoice?</string>

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.