From a7b7cbbbca3e38d9c9cd7a12d405c606b1cea784 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Thu, 11 May 2017 18:32:00 +0200 Subject: [PATCH] Fix missing methods --- .../bisq/core/trade/protocol/ProcessModel.java | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java b/core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java index 03cc1fce20..783bb895c2 100644 --- a/core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java +++ b/core/src/main/java/io/bisq/core/trade/protocol/ProcessModel.java @@ -41,6 +41,8 @@ import io.bisq.core.trade.TradeManager; import io.bisq.core.trade.messages.TradeMsg; import io.bisq.core.user.User; import io.bisq.generated.protobuffer.PB; +import io.bisq.network.p2p.DecryptedMsgWithPubKey; +import io.bisq.network.p2p.MailboxMsg; import io.bisq.network.p2p.NodeAddress; import io.bisq.network.p2p.P2PService; import lombok.Getter; @@ -53,7 +55,6 @@ import org.bitcoinj.core.Transaction; import javax.annotation.Nullable; import java.lang.reflect.Method; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Getter @@ -89,6 +90,8 @@ public class ProcessModel implements Model, Persistable { transient private Transaction takeOfferFeeTx; @Setter transient private TradeMsg tradeMessage; + @Setter + transient private DecryptedMsgWithPubKey decryptedMsgWithPubKey; // Mutable private String takeOfferFeeTxId; @@ -235,4 +238,15 @@ public class ProcessModel implements Model, Persistable { .setTempTradingPeerNodeAddress(tempTradingPeerNodeAddress.toProto()) .build(); } + + + public void removeMailboxMessageAfterProcessing(Trade trade) { + if (tradeMessage instanceof MailboxMsg && + decryptedMsgWithPubKey != null && + decryptedMsgWithPubKey.msg.equals(tradeMessage)) { + log.debug("Remove decryptedMsgWithPubKey from P2P network. decryptedMsgWithPubKey = " + decryptedMsgWithPubKey); + p2PService.removeEntryFromMailbox(decryptedMsgWithPubKey); + trade.removeDecryptedMsgWithPubKey(decryptedMsgWithPubKey); + } + } }