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

Refactor handling of removeMailboxMsg

Browse Source
This commit is contained in:
chimp1984 2021-01-12 13:31:03 -05:00
parent bffe2b82a7
commit f536aba841
No known key found for this signature in database
GPG Key ID: 9801B4EC591F90E3
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/main/java/bisq/core/support/SupportManager.java
View File

@ -159,8 +159,7 @@ public abstract class SupportManager {
sendAckMessage(chatMessage, receiverPubKeyRing, true, null);
}
private void onAckMessage(AckMessage ackMessage,
@Nullable DecryptedMessageWithPubKey decryptedMessageWithPubKey) {
private void onAckMessage(AckMessage ackMessage) {
if (ackMessage.getSourceType() == getAckMessageSourceType()) {
if (ackMessage.isSuccess()) {
log.info("Received AckMessage for {} with tradeId {} and uid {}",
@ -179,10 +178,6 @@ public abstract class SupportManager {
msg.setAckError(ackMessage.getErrorMessage());
});
requestPersistence();
if (decryptedMessageWithPubKey != null) {
mailboxMessageService.removeMailboxMsg(decryptedMessageWithPubKey);
}
}
}
@ -309,7 +304,7 @@ public abstract class SupportManager {
if (networkEnvelope instanceof SupportMessage) {
dispatchMessage((SupportMessage) networkEnvelope);
} else if (networkEnvelope instanceof AckMessage) {
onAckMessage((AckMessage) networkEnvelope, null);
onAckMessage((AckMessage) networkEnvelope);
}
});
decryptedDirectMessageWithPubKeys.clear();
@ -318,10 +313,13 @@ public abstract class SupportManager {
NetworkEnvelope networkEnvelope = decryptedMessageWithPubKey.getNetworkEnvelope();
log.debug("decryptedMessageWithPubKey.message " + networkEnvelope);
if (networkEnvelope instanceof SupportMessage) {
dispatchMessage((SupportMessage) networkEnvelope);
mailboxMessageService.removeMailboxMsg(decryptedMessageWithPubKey);
SupportMessage supportMessage = (SupportMessage) networkEnvelope;
dispatchMessage(supportMessage);
mailboxMessageService.removeMailboxMsg(supportMessage);
} else if (networkEnvelope instanceof AckMessage) {
onAckMessage((AckMessage) networkEnvelope, decryptedMessageWithPubKey);
AckMessage ackMessage = (AckMessage) networkEnvelope;
onAckMessage(ackMessage);
mailboxMessageService.removeMailboxMsg(ackMessage);
}
});
decryptedMailboxMessageWithPubKeys.clear();