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

Version 0.3.2.2

Browse source
This commit is contained in:
Manfred Karrer 2015-12-28 13:33:58 +01:00
parent c5ea60c2fe
commit 2701af82bc
14 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
core/pom.xml
View file

@ -6,7 +6,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<artifactId>core</artifactId> <artifactId>core</artifactId>

7
core/src/main/java/io/bitsquare/trade/protocol/trade/TradeProtocol.java
View file

@ -17,7 +17,6 @@
package io.bitsquare.trade.protocol.trade; package io.bitsquare.trade.protocol.trade;
import io.bitsquare.arbitration.Arbitrator;
import io.bitsquare.common.crypto.PubKeyRing; import io.bitsquare.common.crypto.PubKeyRing;
import io.bitsquare.common.util.Utilities; import io.bitsquare.common.util.Utilities;
import io.bitsquare.p2p.Address; import io.bitsquare.p2p.Address;
@ -36,7 +35,6 @@ import org.slf4j.LoggerFactory;
import java.security.PublicKey; import java.security.PublicKey;
import java.time.Duration; import java.time.Duration;
import java.util.Optional;
import static io.bitsquare.util.Validator.nonEmptyStringOf; import static io.bitsquare.util.Validator.nonEmptyStringOf;
@ -69,15 +67,16 @@ public abstract class TradeProtocol {
} }
} }
} else { } else {
//TODO not clear anymore what case is handled here
// it might be that we received a msg from the arbitrator, we don't handle that here but we don't want to log an error // it might be that we received a msg from the arbitrator, we don't handle that here but we don't want to log an error
Optional<Arbitrator> arbitratorOptional = processModel.getArbitratorManager().getArbitratorsObservableMap().values().stream() /*Optional<Arbitrator> arbitratorOptional = processModel.getArbitratorManager().getArbitratorsObservableMap().values().stream()
.filter(e -> e.getArbitratorAddress().equals(trade.getArbitratorAddress())).findFirst(); .filter(e -> e.getArbitratorAddress().equals(trade.getArbitratorAddress())).findFirst();
PubKeyRing arbitratorPubKeyRing = null; PubKeyRing arbitratorPubKeyRing = null;
if (arbitratorOptional.isPresent()) if (arbitratorOptional.isPresent())
arbitratorPubKeyRing = arbitratorOptional.get().getPubKeyRing(); arbitratorPubKeyRing = arbitratorOptional.get().getPubKeyRing();
if ((arbitratorPubKeyRing != null && !signaturePubKey.equals(arbitratorPubKeyRing.getSignaturePubKey()))) if ((arbitratorPubKeyRing != null && !signaturePubKey.equals(arbitratorPubKeyRing.getSignaturePubKey())))
log.error("Signature used in seal message does not match the one stored with that trade for the trading peer or arbitrator."); log.error("Signature used in seal message does not match the one stored with that trade for the trading peer or arbitrator.");*/
} }
}; };
processModel.getP2PService().addDecryptedMailListener(decryptedMailListener); processModel.getP2PService().addDecryptedMailListener(decryptedMailListener);

2
gui/pom.xml
View file

@ -22,7 +22,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

6
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -73,7 +73,7 @@ import static io.bitsquare.app.BitsquareEnvironment.APP_NAME_KEY;
public class BitsquareApp extends Application { public class BitsquareApp extends Application {
private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class); private static final Logger log = (ch.qos.logback.classic.Logger) LoggerFactory.getLogger(BitsquareApp.class);
public static final boolean DEV_MODE = true; public static final boolean DEV_MODE = false;
public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true; public static final boolean IS_RELEASE_VERSION = !DEV_MODE && true;
private static Environment env; private static Environment env;
@ -155,14 +155,14 @@ public class BitsquareApp extends Application {
primaryStage.setOnCloseRequest(e -> { primaryStage.setOnCloseRequest(e -> {
e.consume(); e.consume();
if (BitsquareApp.IS_RELEASE_VERSION) if (BitsquareApp.IS_RELEASE_VERSION)
systemTray.hideStage(); stop(); // systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)
else else
stop(); stop();
}); });
scene.setOnKeyReleased(keyEvent -> { scene.setOnKeyReleased(keyEvent -> {
if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) { if (new KeyCodeCombination(KeyCode.W, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {
if (BitsquareApp.IS_RELEASE_VERSION) if (BitsquareApp.IS_RELEASE_VERSION)
systemTray.hideStage(); stop(); //systemTray.hideStage(); TODO issues with some linux systems (https://github.com/bitsquare/bitsquare/issues/350)
else else
stop(); stop();
} else if (new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) { } else if (new KeyCodeCombination(KeyCode.Q, KeyCombination.SHORTCUT_DOWN).match(keyEvent)) {

2
jsocks/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorctl/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
jtorproxy/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

2
network/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

5
package/linux/create_app.sh
View file

@ -8,12 +8,15 @@ set -e
# Edit versions # Edit versions
fullVersion=0.3.2.2 fullVersion=0.3.2.2
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
cp gui/target/shaded.jar gui/deploy/Bitsquare.jar
# Copy jar file from mac build (1.jar from processed folder) to linux box # Copy jar file from mac build (1.jar from processed folder) to linux box
# Note: fakeroot needs to be installed on linux # Note: fakeroot needs to be installed on linux
$JAVA_HOME/bin/javapackager \ $JAVA_HOME/bin/javapackager \
-deploy \ -deploy \
-BappVersion=$fullVersion \ -BappVersion=$fullVersion \
-Bcategory=Finance \ -Bcategory=Office,Finance \
-Bemail=team@bitsquare.io \ -Bemail=team@bitsquare.io \
-BlicenseType=GPLv3 \ -BlicenseType=GPLv3 \
-BlicenseFile=LICENSE \ -BlicenseFile=LICENSE \

4
package/mac/Info.plist
View file

@ -54,5 +54,9 @@
<dict> <dict>
</dict> </dict>
<!-- /Applications/Utilities/defaults write io.bitsquare.Bitsquare NSAppSleepDisabled -bool YES -->
<key>NSAppSleepDisabled</key>
<bool>YES</bool>
</dict> </dict>
</plist> </plist>

8
package/windows/create_app.bat
View file

@ -1,6 +1,8 @@
cd ..\..\ cd ..\..\
mkdir gui\deploy mkdir gui\deploy
mvn clean package -DskipTests -Dmaven.javadoc.skip=true
:: edit iss file -> AppVersion=0.3.2.2 :: edit iss file -> AppVersion=0.3.2.2
:: Copy gui/deploy.Bitsquare.jar file from mac build to windows :: Copy gui/deploy.Bitsquare.jar file from mac build to windows
@ -8,10 +10,10 @@ mkdir gui\deploy
:: 64 bit build :: 64 bit build
:: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php) :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
:: Build with jdk1.8.0_40 fails but jdk1.8.0_3 works :: Build with jdk1.8.0_25 fails but jdk1.8.0_3 works
call "C:\Program Files\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_31\jre" call "C:\Program Files\Java\jdk1.8.0_25\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\target\shaded.jar" -outfile Bitsquare -Bruntime="C:\Program Files\Java\jdk1.8.0_25\jre"
:: 32 bit build :: 32 bit build
:: call "C:\Program Files (x86)\Java\jdk1.8.0_31\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\deploy\Bitsquare.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_31\jre" :: call "C:\Program Files (x86)\Java\jdk1.8.0_25\bin\javapackager.exe" -deploy -BappVersion=0.3.2.2 -native exe -name Bitsquare -title Bitsquare -vendor Bitsquare -outdir gui\deploy -appclass io.bitsquare.app.BitsquareAppMain -srcfiles "gui\target\shaded.jar" -outfile Bitsquare -Bruntime="C:\Program Files (x86)\Java\jdk1.8.0_25\jre"
cd package\windows cd package\windows

2
pom.xml
View file

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

2
seednode/pom.xml
View file

@ -5,7 +5,7 @@
<parent> <parent>
<artifactId>parent</artifactId> <artifactId>parent</artifactId>
<groupId>io.bitsquare</groupId> <groupId>io.bitsquare</groupId>
<version>0.3.2.2-SNAPSHOT</version> <version>0.3.2.2</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>