mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-19 09:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Wait for AckMessage before completing task

Browse Source
This commit is contained in:
jmacxx 2021-04-09 09:41:41 -05:00
parent b6f9231af9
commit e5399f189c
No known key found for this signature in database
GPG Key ID: 155297BABFE94A1B
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/main/java/bisq/core/trade/protocol/tasks/buyer/BuyerSendCounterCurrencyTransferStartedMessage.java
View File

@ -92,11 +92,10 @@ public class BuyerSendCounterCurrencyTransferStartedMessage extends SendMailboxM
@Override
protected void setStateArrived() {
trade.setStateIfValidTransitionTo(Trade.State.BUYER_SAW_ARRIVED_FIAT_PAYMENT_INITIATED_MSG);
processModel.getTradeManager().requestPersistence();
cleanup();
// Complete is called in base class
// the message has arrived but we're ultimately waiting for an AckMessage response
if (!trade.isPayoutPublished()) {
tryToSendAgainLater();
}
}
// We override the default behaviour for onStoredInMailbox and do not call complete
@ -142,6 +141,13 @@ public class BuyerSendCounterCurrencyTransferStartedMessage extends SendMailboxM
}
}
// complete() is called from base class SendMailboxMessageTask=>onArrived()
// We override the default behaviour for complete and keep this task open until receipt of the AckMessage
@Override
protected void complete() {
onMessageStateChange(processModel.getPaymentStartedMessageStateProperty().get()); // check for AckMessage
}
private void cleanup() {
if (timer != null) {
timer.stop();
@ -160,7 +166,7 @@ public class BuyerSendCounterCurrencyTransferStartedMessage extends SendMailboxM
return;
}
log.info("We send the message again to the peer after a delay of {} min.", delayInMin);
log.info("We will send the message again to the peer after a delay of {} min.", delayInMin);
if (timer != null) {
timer.stop();
}
@ -186,7 +192,7 @@ public class BuyerSendCounterCurrencyTransferStartedMessage extends SendMailboxM
processModel.getTradeManager().requestPersistence();
cleanup();
complete();
super.complete(); // received AckMessage, complete this task
}
}
}