Version 0.3.5

bisq-network · Mar 11, 2016 · 62d4d50 · 62d4d50
1 parent 7c63e5a
commit 62d4d50
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 20 deletions.
diff --git a/common/pom.xml b/common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/common/src/main/java/io/bitsquare/app/Log.java b/common/src/main/java/io/bitsquare/app/Log.java
@@ -27,12 +27,10 @@
 import org.slf4j.LoggerFactory;
 
 public class Log {
-    private static boolean PRINT_TRACE_METHOD = true;
     private static SizeBasedTriggeringPolicy triggeringPolicy;
     private static Logger logbackLogger;
 
     public static void setup(String fileName, boolean useDetailedLogging) {
-        Log.PRINT_TRACE_METHOD = useDetailedLogging;
         LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
 
         RollingFileAppender appender = new RollingFileAppender();
@@ -62,9 +60,7 @@ public static void setup(String fileName, boolean useDetailedLogging) {
         appender.start();
 
         logbackLogger = loggerContext.getLogger(org.slf4j.Logger.ROOT_LOGGER_NAME);
-        //TODO for now use always trace 
-        logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.TRACE);
-        // logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.DEBUG);
+        logbackLogger.setLevel(useDetailedLogging ? Level.TRACE : Level.INFO);
         logbackLogger.addAppender(appender);
     }
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
 
     <artifactId>core</artifactId>

diff --git a/core/src/main/java/io/bitsquare/alert/Alert.java b/core/src/main/java/io/bitsquare/alert/Alert.java
@@ -36,14 +36,16 @@ public final class Alert implements StoragePayload {
     private static final long TTL = TimeUnit.DAYS.toMillis(10);
 
     public final String message;
+    public final String version;
     public final boolean isUpdateInfo;
     private String signatureAsBase64;
     private transient PublicKey storagePublicKey;
     private byte[] storagePublicKeyBytes;
 
-    public Alert(String message, boolean isUpdateInfo) {
+    public Alert(String message, boolean isUpdateInfo, String version) {
         this.message = message;
         this.isUpdateInfo = isUpdateInfo;
+        this.version = version;
     }
 
     private void readObject(java.io.ObjectInputStream in) throws IOException, ClassNotFoundException {

diff --git a/core/src/main/java/io/bitsquare/trade/BuyerTrade.java b/core/src/main/java/io/bitsquare/trade/BuyerTrade.java
@@ -64,7 +64,7 @@ public void onFiatPaymentStarted(ResultHandler resultHandler, ErrorMessageHandle
     public void setState(State state) {
         super.setState(state);
 
-        if (state == State.WITHDRAW_COMPLETED)
+        if (state == State.WITHDRAW_COMPLETED && tradeProtocol != null)
             tradeProtocol.completed();
     }
 

diff --git a/core/src/main/java/io/bitsquare/trade/SellerTrade.java b/core/src/main/java/io/bitsquare/trade/SellerTrade.java
@@ -64,9 +64,7 @@ public void onFiatPaymentReceived(ResultHandler resultHandler, ErrorMessageHandl
     public void setState(State state) {
         super.setState(state);
 
-        if (state == State.WITHDRAW_COMPLETED)
+        if (state == State.WITHDRAW_COMPLETED && tradeProtocol != null)
             tradeProtocol.completed();
     }
-
-
 }
diff --git a/gui/pom.xml b/gui/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
@@ -19,6 +19,7 @@
 
 import io.bitsquare.alert.Alert;
 import io.bitsquare.app.BitsquareApp;
+import io.bitsquare.app.Version;
 import io.bitsquare.common.util.Tuple2;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.overlays.Overlay;
@@ -106,7 +107,7 @@ private void addContent() {
         sendButton.setOnAction(e -> {
             if (alertMessageTextArea.getText().length() > 0 && keyInputTextField.getText().length() > 0) {
                 if (sendAlertMessageHandler.handle(
-                        new Alert(alertMessageTextArea.getText(), isUpdateCheckBox.isSelected()),
+                        new Alert(alertMessageTextArea.getText(), isUpdateCheckBox.isSelected(), Version.VERSION),
                         keyInputTextField.getText()))
                     hide();
                 else

diff --git a/jsocks/pom.xml b/jsocks/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/network/pom.xml b/network/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>io.bitsquare</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.3.5-SNAPSHOT</version>
+    <version>0.3.5</version>
     <description>Bitsquare - The decentralized bitcoin exchange</description>
     <url>https://bitsquare.io</url>
 

diff --git a/seednode/pom.xml b/seednode/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bitsquare</groupId>
-        <version>0.3.5-SNAPSHOT</version>
+        <version>0.3.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>