Merge branch '0.6.7'

# Conflicts: # common/pom.xml # common/src/main/java/io/bisq/common/app/Version.java # common/src/main/resources/i18n/displayStrings.properties # common/src/main/resources/i18n/displayStrings_hu.properties # common/src/main/resources/i18n/displayStrings_ro.properties # consensus/pom.xml # core/pom.xml # core/src/main/java/io/bisq/core/offer/OpenOfferManager.java # core/src/main/java/io/bisq/core/payment/PaymentAccountUtil.java # core/src/main/java/io/bisq/core/provider/fee/FeeService.java # gui/pom.xml # gui/src/main/java/io/bisq/gui/bisq.css # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferDataModel.java # gui/src/main/java/io/bisq/gui/main/offer/createoffer/CreateOfferView.java # gui/src/main/java/io/bisq/gui/main/offer/takeoffer/TakeOfferView.java # gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java # gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersViewModel.java # gui/src/main/java/io/bisq/gui/util/GUIUtil.java # monitor/pom.xml # network/pom.xml # network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET # package/linux/32bitBuild.sh # package/linux/64bitBuild.sh # package/linux/Dockerfile # package/osx/create_app.sh # package/osx/finalize.sh # package/windows/32bitBuild.bat # package/windows/64bitBuild.bat # package/windows/Bisq.iss # pom.xml # seednode/pom.xml # statistics/pom.xml
2025-03-13 11:09:10 +01:00 · 2018-02-26 22:03:47 -05:00 · 2018-02-26 22:03:47 -05:00 · 1d0591084d
commit 1d0591084d
parent cc1da24d42 fd47cefc6c
21 changed files with 42 additions and 29 deletions
--- a/common/pom.xml
+++ b/common/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/common/src/main/java/io/bisq/common/app/Version.java
+++ b/common/src/main/java/io/bisq/common/app/Version.java
@ -27,7 +27,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.6.6";
+    public static final String VERSION = "0.6.7";

    public static int getMajorVersion(String version) {
        return getSubVersion(version, 0);
--- a/consensus/pom.xml
+++ b/consensus/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/core/pom.xml
+++ b/core/pom.xml
@ -6,7 +6,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>

    <artifactId>core</artifactId>
--- a/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
+++ b/core/src/main/java/io/bisq/core/offer/OpenOfferManager.java
@ -47,6 +47,7 @@ import io.bisq.network.p2p.*;
 import io.bisq.network.p2p.peers.PeerManager;
 import javafx.collections.ObservableList;
 import org.bitcoinj.core.Coin;
+import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

@ -353,17 +354,26 @@ public class OpenOfferManager implements PeerManager.Listener, DecryptedDirectMe

    public void removeOpenOffer(OpenOffer openOffer, ResultHandler resultHandler, ErrorMessageHandler errorMessageHandler) {
        Offer offer = openOffer.getOffer();
-        offerBookService.removeOffer(offer.getOfferPayload(),
-                () -> {
-                    offer.setState(Offer.State.REMOVED);
-                    openOffer.setState(OpenOffer.State.CANCELED);
-                    openOffers.remove(openOffer);
-                    closedTradableManager.add(openOffer);
-                    log.debug("removeOpenOffer, offerId={}", offer.getId());
-                    btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
-                    resultHandler.handleResult();
-                },
-                errorMessageHandler);
+        if (openOffer.isDeactivated()) {
+            openOffer.setStorage(openOfferTradableListStorage);
+            onRemoved(openOffer, resultHandler, offer);
+        } else {
+            offerBookService.removeOffer(offer.getOfferPayload(),
+                    () -> {
+                        onRemoved(openOffer, resultHandler, offer);
+                    },
+                    errorMessageHandler);
+        }
+    }
+
+    private void onRemoved(@NotNull OpenOffer openOffer, ResultHandler resultHandler, Offer offer) {
+        offer.setState(Offer.State.REMOVED);
+        openOffer.setState(OpenOffer.State.CANCELED);
+        openOffers.remove(openOffer);
+        closedTradableManager.add(openOffer);
+        log.debug("removeOpenOffer, offerId={}", offer.getId());
+        btcWalletService.resetAddressEntriesForOpenOffer(offer.getId());
+        resultHandler.handleResult();
    }

    // Close openOffer after deposit published
--- a/gui/pom.xml
+++ b/gui/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
+++ b/gui/src/main/java/io/bisq/gui/main/portfolio/openoffer/OpenOffersView.java
@ -171,6 +171,9 @@ public class OpenOffersView extends ActivatableViewAndModel<VBox, OpenOffersView
        model.onRemoveOpenOffer(openOffer,
                () -> {
                    log.debug("Remove offer was successful");
+
+                    tableView.refresh();
+
                    String key = "WithdrawFundsAfterRemoveOfferInfo";
                    if (DontShowAgainLookup.showAgain(key))
                        //noinspection unchecked
--- a/monitor/pom.xml
+++ b/monitor/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/network/pom.xml
+++ b/network/pom.xml
@ -5,7 +5,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
+++ b/network/src/main/resources/PersistableNetworkPayloadMap_BTC_MAINNET
--- a/package/linux/32bitBuild.sh
+++ b/package/linux/32bitBuild.sh
@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e

 # Edit version
-version=0.6.6
+version=0.6.7

 dir="/media/sf_vm_shared_ubuntu14_32bit"

--- a/package/linux/64bitBuild.sh
+++ b/package/linux/64bitBuild.sh
@ -6,7 +6,7 @@ mkdir -p gui/deploy
 set -e

 # Edit version
-version=0.6.6
+version=0.6.7

 dir="/media/sf_vm_shared_ubuntu"

--- a/package/linux/Dockerfile
+++ b/package/linux/Dockerfile
@ -8,7 +8,7 @@

 # pull base image
 FROM openjdk:8-jdk
-ENV version 0.6.6
+ENV version 0.6.7

 RUN apt-get update && apt-get install -y --no-install-recommends openjfx && rm -rf /var/lib/apt/lists/* &&
 apt-get install -y vim fakeroot
--- a/package/osx/create_app.sh
+++ b/package/osx/create_app.sh
@ -5,7 +5,7 @@ mkdir -p gui/deploy

 set -e

-version="0.6.6"
+version="0.6.7"

 mvn clean package verify -DskipTests -Dmaven.javadoc.skip=true

--- a/package/osx/finalize.sh
+++ b/package/osx/finalize.sh
@ -1,6 +1,6 @@
 #!/bin/bash

-version="0.6.6"
+version="0.6.7"

 target_dir="/Users/dev/Documents/__bisq/_releases/$version"
 src_dir="/Users/dev/idea/exchange"
--- a/package/windows/32bitBuild.bat
+++ b/package/windows/32bitBuild.bat
@ -5,7 +5,7 @@
 :: 32 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)

-SET version=0.6.6
+SET version=0.6.7

 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows_32bit
--- a/package/windows/64bitBuild.bat
+++ b/package/windows/64bitBuild.bat
@ -5,7 +5,7 @@
 :: 64 bit build
 :: Needs Inno Setup 5 or later (http://www.jrsoftware.org/isdl.php)

-SET version=0.6.6
+SET version=0.6.7

 :: Private setup
 SET outdir=\\VBOXSVR\vm_shared_windows
--- a/package/windows/Bisq.iss
+++ b/package/windows/Bisq.iss
@ -3,7 +3,7 @@
 [Setup]
 AppId={{bisq}}
 AppName=Bisq
-AppVersion=0.6.6
+AppVersion=0.6.7
 AppVerName=Bisq
 AppPublisher=Bisq
 AppComments=Bisq
--- a/pom.xml
+++ b/pom.xml
@ -6,7 +6,7 @@
    <groupId>io.bisq</groupId>
    <artifactId>parent</artifactId>
    <packaging>pom</packaging>
-    <version>0.6.6</version>
+    <version>0.6.7</version>
    <description>Bisq - The decentralized exchange network</description>
    <url>https://bisq.io</url>

--- a/seednode/pom.xml
+++ b/seednode/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/statistics/pom.xml
+++ b/statistics/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>parent</artifactId>
        <groupId>io.bisq</groupId>
-        <version>0.6.6</version>
+        <version>0.6.7</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>