Version 0.5.3 with hotfix for fixing wrong app data name (bisq was re…

…named to Bisq -> we rename the app data dir).

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/io/bisq/common/app/Version.java

@@ -29,7 +29,7 @@ public class Version {
     // VERSION = 0.5.0 introduces proto buffer for the P2P network and local DB and is a not backward compatible update
     // Therefore all sub versions start again with 1
     // We use semantic versioning with major, minor and patch
-    public static final String VERSION = "0.5.2"; 
+    public static final String VERSION = "0.5.3"; 
 
     public static int getMajorVersion(String version) {
         return getSubVersion(version, 0);

common/src/main/resources/i18n/displayStrings.properties

@@ -1532,7 +1532,7 @@ If you have not fulfilled the above requirements you would lose your security de
 to get in contact with the {1} buyer by using the provided email address or mobile number to verify that he or she \
   is really the owner of the Zelle (ClearXchange) account.
 
-popup.info.revertIdCheckRequirement=With version 0.5.2 we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
+popup.info.revertIdCheckRequirement=With this version we remove the requirement introduced in version 0.5.0 for verifying the peers ID by email when payment methods \
   with bank transfer or Faster Payment was used.\n\n\
   The email address is not exposed anymore in Sepa, Faster Payment and national bank transfer payment methods.\n\n\
   Please see the discussion on the Bisq Forum for further background:\n\

core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
 
     <artifactId>core</artifactId>

core/src/main/java/io/bisq/core/app/BisqEnvironment.java

@@ -44,6 +44,8 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Properties;
 
@@ -107,6 +109,38 @@ else if (Utilities.isOSX())
     }
 
     private static String appDataDir(String userDataDir, String appName) {
+        //TODO fix for changing app name form bisq to Bisq (add dir renamed as well)
+        final String newAppName = "Bisq";
+        if (appName.equals(newAppName)) {
+            final String oldAppName = "bisq";
+            Path oldPath = Paths.get(Paths.get(userDataDir, oldAppName).toString());// bisq 
+            Path newPath = Paths.get(Paths.get(userDataDir, appName).toString());//Bisq
+            File oldDir = new File(oldPath.toString()); // bisq 
+            File newDir = new File(newPath.toString()); //Bisq
+            try {
+                if (Files.exists(oldPath) && oldDir.getCanonicalPath().endsWith(oldAppName)) {
+                    if (Files.exists(newPath) && newDir.getCanonicalPath().endsWith(newAppName)) {
+                        // we have both bisq and Bisq and rename Bisq to Bisq_backup
+                        File newDirBackup = new File(newDir.toString() + "_backup"); // Bisq
+                        log.info("Rename Bisq data dir {} to {}", newPath.toString(), newDirBackup.toString());
+                        if (!newDir.renameTo(newDirBackup))
+                            throw new RuntimeException("Cannot rename dir");
+
+                        log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
+                        if (!oldDir.renameTo(newDir))
+                            throw new RuntimeException("Cannot rename dir");
+                    } else {
+                        log.info("Rename old data dir {} to {}", oldDir.toString(), newPath.toString());
+                        if (!oldDir.renameTo(newDir))
+                            throw new RuntimeException("Cannot rename dir");
+
+                    }
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
         return Paths.get(userDataDir, appName).toString();
     }
 

gui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

gui/src/main/java/io/bisq/gui/main/MainViewModel.java

@@ -306,7 +306,6 @@ private void showRevertIdCheckRequirement() {
         //TODO remove after v0.5.2
         String key = "revertIdCheckRequirement";
         if (preferences.showAgain(key) &&
-                Version.VERSION.equals("0.5.2") &&
                 user.getPaymentAccounts() != null &&
                 user.getPaymentAccounts().stream()
                         .filter(e -> e.getPaymentMethod().getId().equals(PaymentMethod.SEPA_ID) ||

jsocks/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jtorctl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jtorproxy/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

network/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

package/linux/32bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e
 
 # Edit version
-version=0.5.2
+version=0.5.3
 
 jarFile="/media/sf_vm_shared_ubuntu14_32bit/Bisq-$version.jar"
 

package/linux/64bitBuild.sh

@@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e
 
 # Edit version
-version=0.5.2
+version=0.5.3
 
 jarFile="/media/sf_vm_shared_ubuntu/Bisq-$version.jar"
 

package/linux/Dockerfile

@@ -8,7 +8,7 @@
 
 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.5.2
+ENV version 0.5.3
 
 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot

package/osx/create_app.sh

@@ -5,7 +5,7 @@ mkdir -p gui/deploy
 
 set -e
 
-version="0.5.2"
+version="0.5.3"
 
 mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true
 

package/osx/finalize.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-version="0.5.2"
+version="0.5.3"
 
 target_dir="/Users/dev/Documents/__bisq/_releases/$version"
 src_dir="/Users/dev/Documents/intellij/bisq"

package/win/32bitBuild.bat

@@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.5.2
+SET version=0.5.3
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit

package/win/64bitBuild.bat

@@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)
 
-SET version=0.5.2
+SET version=0.5.3
 
 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows

package/win/Bisq.iss

@@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.5.2
+AppVersion=0.5.3
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq

pom.xml

@@ -6,7 +6,7 @@
     <groupId>io.bisq</groupId>
     <artifactId>parent</artifactId>
     <packaging>pom</packaging>
-    <version>0.5.2</version>
+    <version>0.5.3</version>
     <description>Bisq - The decentralized exchange network</description>
     <url>https://bisq.io</url>
 
@@ -66,7 +66,7 @@
             <plugin>
                 <groupId>org.xolstice.maven.plugins</groupId>
                 <artifactId>protobuf-maven-plugin</artifactId>
-                <version>0.5.2</version>
+                <version>0.5.3</version>
                 <configuration>
                     <protocExecutable>/usr/local/bin/protoc</protocExecutable>
                 </configuration>

provider/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

seednode/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

statistics/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>parent</artifactId>
         <groupId>io.bisq</groupId>
-        <version>0.5.2</version>
+        <version>0.5.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>