aboutsummaryrefslogtreecommitdiff
path: root/wallet/src/main/java
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2020-09-01 11:26:29 -0300
committerTorsten Grote <t@grobox.de>2020-09-01 11:26:29 -0300
commitaccae1d669ec0a90cb040a6479624d622956e667 (patch)
tree5606f0b6f2e1fa80cfc35143ba4abef8140d8cc0 /wallet/src/main/java
parentc928b458fce0c72c75852ab338a6e4e85a278ed4 (diff)
downloadtaler-android-accae1d669ec0a90cb040a6479624d622956e667.tar.gz
taler-android-accae1d669ec0a90cb040a6479624d622956e667.tar.bz2
taler-android-accae1d669ec0a90cb040a6479624d622956e667.zip
[wallet] show fullfillment message on payment details screen
Diffstat (limited to 'wallet/src/main/java')
-rw-r--r--wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt1
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt6
-rw-r--r--wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt1
3 files changed, 5 insertions, 3 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
index c364286..9e6984c 100644
--- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt
@@ -76,7 +76,6 @@ class PaymentManager(
}.onError {
handleError("preparePay", it)
}.onSuccess { response ->
- Log.e(TAG, "PreparePayResponse $response") // TODO remove
mPayStatus.value = when (response) {
is PaymentPossibleResponse -> response.toPayStatusPrepared()
is InsufficientBalanceResponse -> InsufficientBalance(
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
index 1103207..f15e34f 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/TransactionDetailFragment.kt
@@ -144,7 +144,11 @@ class TransactionDetailFragment : Fragment() {
private fun bindOrderAndFee(info: TransactionInfo, raw: Amount, fee: Amount) {
orderAmountView.text = raw.toString()
feeView.text = getString(R.string.amount_negative, fee.toString())
- orderSummaryView.text = info.summary
+ orderSummaryView.text = if (info.fulfillmentMessage == null) {
+ info.summary
+ } else {
+ "${info.summary}\n\n${info.fulfillmentMessage}"
+ }
if (info.fulfillmentUrl?.startsWith("http") == true) {
val i = Intent().apply {
data = Uri.parse(info.fulfillmentUrl)
diff --git a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
index 603b754..db3f283 100644
--- a/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
+++ b/wallet/src/main/java/net/taler/wallet/transactions/Transactions.kt
@@ -154,7 +154,6 @@ class TransactionInfo(
val fulfillmentUrl: String? = null,
/**
* Message shown to the user after the payment is complete.
- * TODO actually show this
*/
val fulfillmentMessage: String? = null,
/**