Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-04-19 23:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Version 0.3.5

Browse Source
This commit is contained in:
Manfred Karrer 2016-03-11 17:20:58 +01:00
parent 7c63e5ab00
commit 62d4d50392
14 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/pom.xml
View File

@ -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>

6
common/src/main/java/io/bitsquare/app/Log.java
View File

@ -27,12 +27,10 @@ import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
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 class Log {
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);
}

2
core/pom.xml
View File

@ -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>

4
core/src/main/java/io/bitsquare/alert/Alert.java
View File

@ -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 {

2
core/src/main/java/io/bitsquare/trade/BuyerTrade.java
View File

@ -64,7 +64,7 @@ public abstract class BuyerTrade extends Trade {
public void setState(State state) {
super.setState(state);
if (state == State.WITHDRAW_COMPLETED)
if (state == State.WITHDRAW_COMPLETED && tradeProtocol != null)
tradeProtocol.completed();
}

4
core/src/main/java/io/bitsquare/trade/SellerTrade.java
View File

@ -64,9 +64,7 @@ public abstract class SellerTrade extends Trade {
public void setState(State state) {
super.setState(state);
if (state == State.WITHDRAW_COMPLETED)
if (state == State.WITHDRAW_COMPLETED && tradeProtocol != null)
tradeProtocol.completed();
}
}

2
gui/pom.xml
View File

@ -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>

3
gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
View File

@ -19,6 +19,7 @@ package io.bitsquare.gui.main.overlays.windows;
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 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
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

2
jsocks/pom.xml
View File

@ -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>

2
jtorctl/pom.xml
View File

@ -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>

2
jtorproxy/pom.xml
View File

@ -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>

2
network/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>

2
seednode/pom.xml
View File

@ -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>