From ea76c0577e3de0976f343e21987f1a62a9892e60 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Wed, 25 May 2016 15:53:29 +0200
Subject: [PATCH] Dont remove listener on fault

---
 common/src/main/java/io/bitsquare/app/DevFlags.java  |  2 +-
 .../trade/protocol/trade/TradeProtocol.java          |  9 ++++-----
 .../portfolio/pendingtrades/steps/TradeStepView.java | 12 +++++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/common/src/main/java/io/bitsquare/app/DevFlags.java b/common/src/main/java/io/bitsquare/app/DevFlags.java
index b7349c9311..2e76ee79a6 100644
--- a/common/src/main/java/io/bitsquare/app/DevFlags.java
+++ b/common/src/main/java/io/bitsquare/app/DevFlags.java
@@ -6,7 +6,7 @@ import org.slf4j.LoggerFactory;
 public class DevFlags {
     private static final Logger log = LoggerFactory.getLogger(DevFlags.class);
 
-    public static final boolean STRESS_TEST_MODE = true;
+    public static final boolean STRESS_TEST_MODE = false;
     public static final boolean DEV_MODE = STRESS_TEST_MODE || false;
     public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
 
diff --git a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
index 93b14caa21..0a2d0acf9e 100644
--- a/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
+++ b/core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
@@ -60,9 +60,8 @@ public abstract class TradeProtocol {
                     TradeMessage tradeMessage = (TradeMessage) message;
                     nonEmptyStringOf(tradeMessage.tradeId);
 
-                    if (tradeMessage.tradeId.equals(processModel.getId())) {
+                    if (tradeMessage.tradeId.equals(processModel.getId()))
                         doHandleDecryptedMessage(tradeMessage, peersNodeAddress);
-                    }
                 }
             } else {
                 //TODO not clear anymore what case is handled here
@@ -82,14 +81,14 @@ public abstract class TradeProtocol {
 
     public void completed() {
         cleanup();
+        processModel.getP2PService().removeDecryptedDirectMessageListener(decryptedDirectMessageListener);
     }
 
     private void cleanup() {
         log.debug("cleanup " + this);
         stopTimeout();
-
-        processModel.getP2PService().removeDecryptedDirectMessageListener(decryptedDirectMessageListener);
-
+        // Don't remove removeDecryptedDirectMessageListener as it might be a non critical bug and it would prevent 
+        // that we get further messages
     }
 
     public void applyMailboxMessage(DecryptedMsgWithPubKey decryptedMsgWithPubKey, Trade trade) {
diff --git a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
index 6126efcbde..53efa0b35b 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/portfolio/pendingtrades/steps/TradeStepView.java
@@ -225,9 +225,8 @@ public abstract class TradeStepView extends AnchorPane {
     }
 
     private void showDisputeInfoLabel() {
-        if (notificationGroup != null) {
+        if (notificationGroup != null)
             notificationGroup.setLabelAndHeadlineVisible(true);
-        }
     }
 
     private void showOpenDisputeButton() {
@@ -308,6 +307,10 @@ public abstract class TradeStepView extends AnchorPane {
             notificationGroup.label.setText(getWarningText());
     }
 
+    private void removeWarning() {
+        hideNotificationGroup();
+    }
+
     protected String getWarningText() {
         return "";
     }
@@ -402,7 +405,10 @@ public abstract class TradeStepView extends AnchorPane {
                 case NORMAL:
                     break;
                 case HALF_REACHED:
-                    showWarning();
+                    if (trade.getState().getPhase().ordinal() < Trade.Phase.FIAT_RECEIVED.ordinal())
+                        showWarning();
+                    else
+                        removeWarning();
                     break;
                 case TRADE_PERIOD_OVER:
                     onOpenForDispute();