summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Grote <t@grobox.de>2023-06-20 13:25:59 -0300
committerTorsten Grote <t@grobox.de>2023-06-20 13:42:36 -0300
commit2e255f70a501043307e3f14e89755e979a0d5d4c (patch)
tree148bcc3f3f8f751a5f7b694a75b61d444ff3b784
parent86f4786bb39feffb7b841220ceb5153fe4f4bd77 (diff)
downloadtaler-android-2e255f70a501043307e3f14e89755e979a0d5d4c.tar.gz
taler-android-2e255f70a501043307e3f14e89755e979a0d5d4c.tar.bz2
taler-android-2e255f70a501043307e3f14e89755e979a0d5d4c.zip
[wallet] rename InitiatePeerPushDebitResponse
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/OutgoingState.kt5
-rw-r--r--wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt3
2 files changed, 6 insertions, 2 deletions
diff --git a/wallet/src/main/java/net/taler/wallet/peer/OutgoingState.kt b/wallet/src/main/java/net/taler/wallet/peer/OutgoingState.kt
index 5673417..e53dd40 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/OutgoingState.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/OutgoingState.kt
@@ -62,7 +62,10 @@ data class CheckPeerPushDebitResponse(
)
@Serializable
-data class InitiatePeerPullCreditResponse(
+data class InitiatePeerPushDebitResponse(
val exchangeBaseUrl: String,
+ @Deprecated("Will be removed in future version")
val talerUri: String,
+ // TODO bring the user to that transaction and only show QR when in Pending/Ready state
+ 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 bff55ff..8829cc7 100644
--- a/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
+++ b/wallet/src/main/java/net/taler/wallet/peer/PeerManager.kt
@@ -130,7 +130,7 @@ class PeerManager(
_outgoingPushState.value = OutgoingCreating
scope.launch(Dispatchers.IO) {
val expiry = Timestamp.fromMillis(System.currentTimeMillis() + HOURS.toMillis(expirationHours))
- api.request("initiatePeerPushDebit", InitiatePeerPullCreditResponse.serializer()) {
+ api.request("initiatePeerPushDebit", InitiatePeerPushDebitResponse.serializer()) {
put("amount", amount.toJSONString())
put("partialContractTerms", JSONObject().apply {
put("amount", amount.toJSONString())
@@ -138,6 +138,7 @@ class PeerManager(
put("purse_expiration", JSONObject(Json.encodeToString(expiry)))
})
}.onSuccess { response ->
+ // TODO bring the user to that transaction and only show QR when in Pending/Ready state
val qrCode = QrCodeManager.makeQrCode(response.talerUri)
_outgoingPushState.value = OutgoingResponse(response.talerUri, qrCode)
}.onError { error ->