From 62d4d50392d68887ab54e5cb1e0ca96cdc412f96 Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Fri, 11 Mar 2016 17:20:58 +0100 Subject: [PATCH] Version 0.3.5 --- common/pom.xml | 2 +- common/src/main/java/io/bitsquare/app/Log.java | 6 +----- core/pom.xml | 2 +- core/src/main/java/io/bitsquare/alert/Alert.java | 4 +++- core/src/main/java/io/bitsquare/trade/BuyerTrade.java | 2 +- core/src/main/java/io/bitsquare/trade/SellerTrade.java | 4 +--- gui/pom.xml | 2 +- .../gui/main/overlays/windows/SendAlertMessageWindow.java | 3 ++- jsocks/pom.xml | 2 +- jtorctl/pom.xml | 2 +- jtorproxy/pom.xml | 2 +- network/pom.xml | 2 +- pom.xml | 2 +- seednode/pom.xml | 2 +- 14 files changed, 17 insertions(+), 20 deletions(-) diff --git a/common/pom.xml b/common/pom.xml index 29edb2ea411..fdaa3ee10fe 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 diff --git a/common/src/main/java/io/bitsquare/app/Log.java b/common/src/main/java/io/bitsquare/app/Log.java index f7dc0ef6242..c1153b4ac7e 100644 --- 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 index 61121b2e2f5..c73abc8db72 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 core diff --git a/core/src/main/java/io/bitsquare/alert/Alert.java b/core/src/main/java/io/bitsquare/alert/Alert.java index bb1a615d19d..0727d68425b 100644 --- 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 index 32f0805e600..3fd76ed79f8 100644 --- 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 index f00664767f6..8ba6225ff0c 100644 --- 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 index 4d5e748719b..a2803e2ae70 100644 --- a/gui/pom.xml +++ b/gui/pom.xml @@ -22,7 +22,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 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 index daabc7dc815..2b80f3dacd7 100644 --- 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 index 2a95fc51644..f13633289c3 100644 --- a/jsocks/pom.xml +++ b/jsocks/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 diff --git a/jtorctl/pom.xml b/jtorctl/pom.xml index 3ba855c31e4..2939d98e03d 100644 --- a/jtorctl/pom.xml +++ b/jtorctl/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 diff --git a/jtorproxy/pom.xml b/jtorproxy/pom.xml index 2a9f54be940..563d10ae865 100644 --- a/jtorproxy/pom.xml +++ b/jtorproxy/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 diff --git a/network/pom.xml b/network/pom.xml index d735db7b5cf..0a0c3fa9123 100644 --- a/network/pom.xml +++ b/network/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0 diff --git a/pom.xml b/pom.xml index 59d9e18e4a3..b18bc319b48 100755 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.bitsquare parent pom - 0.3.5-SNAPSHOT + 0.3.5 Bitsquare - The decentralized bitcoin exchange https://bitsquare.io diff --git a/seednode/pom.xml b/seednode/pom.xml index a98bd1a12da..a820cebea32 100644 --- a/seednode/pom.xml +++ b/seednode/pom.xml @@ -5,7 +5,7 @@ parent io.bitsquare - 0.3.5-SNAPSHOT + 0.3.5 4.0.0