Skip to content

Commit

Permalink
Version 0.3.5
Browse files Browse the repository at this point in the history
  • Loading branch information
ManfredKarrer committed Mar 11, 2016
1 parent 7c63e5a commit 62d4d50
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 20 deletions.
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 1 addition & 5 deletions common/src/main/java/io/bitsquare/app/Log.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/java/io/bitsquare/alert/Alert.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/io/bitsquare/trade/BuyerTrade.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}

Expand Down
4 changes: 1 addition & 3 deletions core/src/main/java/io/bitsquare/trade/SellerTrade.java
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}


}
2 changes: 1 addition & 1 deletion gui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion jsocks/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jtorctl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jtorproxy/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion network/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion seednode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down

0 comments on commit 62d4d50

Please sign in to comment.