[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] 03/04: [wallet] Fix P2P payments (API changes)
From: |
gnunet |
Subject: |
[taler-taler-android] 03/04: [wallet] Fix P2P payments (API changes) |
Date: |
Tue, 10 Oct 2023 18:32:52 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
commit df63f3a7d2ad58333abee97def08e1ef65274bb3
Author: Iván Ávalos <avalos@disroot.org>
AuthorDate: Fri Oct 6 12:04:36 2023 -0600
[wallet] Fix P2P payments (API changes)
---
wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt | 6 ++++--
wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt | 8 ++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
b/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
index c6c78f3..fffa7bd 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/IncomingState.kt
@@ -48,7 +48,8 @@ data class PreparePeerPullDebitResponse(
val contractTerms: PeerContractTerms,
val amountRaw: Amount,
val amountEffective: Amount,
- val peerPullPaymentIncomingId: String,
+ val peerPullDebitId: String,
+ val transactionId: String,
)
@Serializable
@@ -56,5 +57,6 @@ data class PreparePeerPushCreditResponse(
val contractTerms: PeerContractTerms,
val amountRaw: Amount,
val amountEffective: Amount,
- val peerPushPaymentIncomingId: String,
+ val peerPushCreditId: String,
+ val transactionId: String,
)
diff --git a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
index 8829cc7..6e65e0b 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -162,7 +162,7 @@ class PeerManager(
amountRaw = response.amountRaw,
amountEffective = response.amountEffective,
contractTerms = response.contractTerms,
- id = response.peerPullPaymentIncomingId,
+ id = response.transactionId,
)
}.onError { error ->
Log.e(TAG, "got preparePeerPullDebit error result $error")
@@ -175,7 +175,7 @@ class PeerManager(
_incomingPullState.value = IncomingAccepting(terms)
scope.launch(Dispatchers.IO) {
api.request<Unit>("confirmPeerPullDebit") {
- put("peerPullPaymentIncomingId", terms.id)
+ put("transactionId", terms.id)
}.onSuccess {
_incomingPullState.value = IncomingAccepted
}.onError { error ->
@@ -195,7 +195,7 @@ class PeerManager(
amountRaw = response.amountRaw,
amountEffective = response.amountEffective,
contractTerms = response.contractTerms,
- id = response.peerPushPaymentIncomingId,
+ id = response.transactionId,
)
}.onError { error ->
Log.e(TAG, "got preparePeerPushCredit error result $error")
@@ -208,7 +208,7 @@ class PeerManager(
_incomingPushState.value = IncomingAccepting(terms)
scope.launch(Dispatchers.IO) {
api.request<Unit>("confirmPeerPushCredit") {
- put("peerPushPaymentIncomingId", terms.id)
+ put("transactionId", terms.id)
}.onSuccess {
_incomingPushState.value = IncomingAccepted
}.onError { error ->
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.