Add param for using mailbox if msg send failes

core/src/main/java/io/bitsquare/p2p/MessageService.java

@@ -23,7 +23,7 @@ import io.bitsquare.p2p.listener.SendMessageListener;
 
 public interface MessageService extends P2PService {
 
-    void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener);
+    void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener);
 
     void addMessageHandler(MessageHandler listener);
 

core/src/main/java/io/bitsquare/p2p/tomp2p/BootstrappedPeerBuilder.java

@@ -200,7 +200,10 @@ public class BootstrappedPeerBuilder {
             peer.peerBean().peerMap().addPeerMapChangeListener(new PeerMapChangeListener() {
                 @Override
                 public void peerInserted(PeerAddress peerAddress, boolean verified) {
+                    if (verified)
                         log.debug("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
+                    else
+                        log.trace("Peer inserted: peerAddress=" + peerAddress + ", verified=" + verified);
                 }
 
                 @Override

core/src/main/java/io/bitsquare/p2p/tomp2p/TomP2PMessageService.java

@@ -72,7 +72,7 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
     }
 
     @Override
-    public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, SendMessageListener listener) {
+    public void sendEncryptedMessage(Peer peer, PubKeyRing pubKeyRing, Message message, boolean useMailboxIfUnreachable, SendMessageListener listener) {
         assert pubKeyRing != null;
 
         log.debug("sendMessage called");
@@ -97,16 +97,30 @@ public class TomP2PMessageService extends TomP2PService implements MessageServic
                                              else {
                                                  log.info("sendMessage failed. We will try to send the message to the mailbox. Fault reason:  " +
                                                          futureDirect.failedReason());
+                                                 if (useMailboxIfUnreachable) {
                                                      sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                                  }
+                                                 else {
+                                                     openRequestsDown();
+                                                     log.error("Send message was not successful");
+                                                     executor.execute(listener::handleFault);
+                                                 }
+                                             }
                                          }
 
                                          @Override
                                          public void exceptionCaught(Throwable t) throws Exception {
                                              log.info("sendMessage failed with exception. We will try to send the message to the mailbox. Exception: "
                                                      + t.getMessage());
+                                             if (useMailboxIfUnreachable) {
                                                  sendMailboxMessage(pubKeyRing, (SealedAndSignedMessage) encryptedMessage, listener);
                                              }
+                                             else {
+                                                 openRequestsDown();
+                                                 log.error("Send message was not successful");
+                                                 executor.execute(listener::handleFault);
+                                             }
+                                         }
                                      }
             );
         } catch (Throwable t) {

core/src/main/java/io/bitsquare/trade/offer/OpenOfferManager.java

@@ -268,6 +268,7 @@ public class OpenOfferManager {
             messageService.sendEncryptedMessage(sender,
                     message.getPubKeyRing(),
                     offerAvailabilityResponse,
+                    false,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/availability/tasks/SendOfferAvailabilityRequest.java

@@ -42,6 +42,7 @@ public class SendOfferAvailabilityRequest extends Task<OfferAvailabilityModel> {
             model.messageService.sendEncryptedMessage(model.getPeer(),
                     model.offer.getPubKeyRing(),
                     message,
+                    false,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendDepositTxPublishedMessage.java

@@ -44,6 +44,7 @@ public class SendDepositTxPublishedMessage extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     tradeMessage,
+                    true,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendFiatTransferStartedMessage.java

@@ -46,6 +46,7 @@ public class SendFiatTransferStartedMessage extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     tradeMessage,
+                    true,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayDepositRequest.java

@@ -55,6 +55,7 @@ public class SendPayDepositRequest extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     tradeMessage,
+                    false,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/buyer/SendPayoutTxFinalizedMessage.java

@@ -43,6 +43,7 @@ public class SendPayoutTxFinalizedMessage extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     tradeMessage,
+                    true,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendDepositTxInputsRequest.java

@@ -53,6 +53,7 @@ public class SendDepositTxInputsRequest extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     message,
+                    false,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendFinalizePayoutTxRequest.java

@@ -49,6 +49,7 @@ public class SendFinalizePayoutTxRequest extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     message,
+                    true,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {

core/src/main/java/io/bitsquare/trade/protocol/trade/tasks/seller/SendPublishDepositTxRequest.java

@@ -53,6 +53,7 @@ public class SendPublishDepositTxRequest extends TradeTask {
                     trade.getTradingPeer(),
                     processModel.tradingPeer.getPubKeyRing(),
                     tradeMessage,
+                    false,
                     new SendMessageListener() {
                         @Override
                         public void handleResult() {