diff options
| author | Torsten Grote <t@grobox.de> | 2020-03-20 15:43:23 -0300 |
|---|---|---|
| committer | Torsten Grote <t@grobox.de> | 2020-03-20 15:43:23 -0300 |
| commit | db8b71418b766258a7a4bda91e496b1b03cb28cd (patch) | |
| tree | bd221d1a7ecf77d7752ea7a6086da344e74619cc /wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt | |
| parent | 82b8b57dc16112b859150696199774fcf06655e1 (diff) | |
| download | taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.tar.gz taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.tar.bz2 taler-android-db8b71418b766258a7a4bda91e496b1b03cb28cd.zip | |
Let all apps use the same Amount class
The wallet now also uses taler-kotlin-common
Diffstat (limited to 'wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt')
| -rw-r--r-- | wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt | 5 |
1 files changed, 3 insertions, 2 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 ee0edaf..8aaebbc 100644 --- a/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt +++ b/wallet/src/main/java/net/taler/wallet/payment/PaymentManager.kt @@ -22,7 +22,8 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import com.fasterxml.jackson.databind.ObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import net.taler.wallet.Amount +import net.taler.common.Amount +import net.taler.common.ContractTerms import net.taler.wallet.TAG import net.taler.wallet.backend.WalletBackendApi import org.json.JSONObject @@ -79,7 +80,7 @@ class PaymentManager( "payment-possible" -> PayStatus.Prepared( contractTerms = getContractTerms(json), proposalId = json.getString("proposalId"), - totalFees = Amount.fromJson(json.getJSONObject("totalFees")) + totalFees = Amount.fromJsonObject(json.getJSONObject("totalFees")) ) "paid" -> PayStatus.AlreadyPaid(getContractTerms(json)) "insufficient-balance" -> PayStatus.InsufficientBalance(getContractTerms(json)) |