Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update data stores and dates for v1.1.6 #3255

Merged
merged 2 commits into from
Sep 13, 2019
Merged

Update data stores and dates for v1.1.6 #3255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f28d262
Update data stores
ripcurlx Sep 13, 2019
ac98a61
Update migration dates for v1.1.6 and remove testing code
ripcurlx Sep 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/offer/OfferRestrictions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
public class OfferRestrictions {
// The date when traders who have not updated cannot take offers from updated clients and their offers become
// invisible for updated clients.
private static final Date REQUIRE_UPDATE_DATE = Utilities.getUTCDate(2019, GregorianCalendar.SEPTEMBER, 1);
private static final Date REQUIRE_UPDATE_DATE = Utilities.getUTCDate(2019, GregorianCalendar.SEPTEMBER, 19);

static boolean requiresUpdate() {
return new Date().after(REQUIRE_UPDATE_DATE);
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/bisq/core/support/dispute/mediation/MediationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
public final class MediationManager extends DisputeManager<MediationDisputeList> {

// The date when mediation is activated
private static final Date MEDIATION_ACTIVATED_DATE = Utilities.getUTCDate(2019, GregorianCalendar.SEPTEMBER, 1);
private static final Date MEDIATION_ACTIVATED_DATE = Utilities.getUTCDate(2019, GregorianCalendar.SEPTEMBER, 26);

public static boolean isMediationActivated() {
return new Date().after(MEDIATION_ACTIVATED_DATE);
Expand Down
44 changes: 0 additions & 44 deletions desktop/src/main/java/bisq/desktop/main/portfolio/pendingtrades/steps/TradeStepView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,11 @@
import bisq.core.support.dispute.DisputeResult;
import bisq.core.trade.Contract;
import bisq.core.trade.Trade;
import bisq.core.user.DontShowAgainLookup;
import bisq.core.user.Preferences;

import bisq.common.ClockWatcher;
import bisq.common.UserThread;
import bisq.common.app.Version;
import bisq.common.util.Tuple3;
import bisq.common.util.Utilities;

import de.jensd.fx.fontawesome.AwesomeDude;
import de.jensd.fx.fontawesome.AwesomeIcon;
Expand All @@ -50,8 +47,6 @@
import javafx.scene.control.ProgressBar;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TextField;
import javafx.scene.input.KeyCode;
import javafx.scene.input.KeyEvent;
import javafx.scene.layout.AnchorPane;
import javafx.scene.layout.ColumnConstraints;
import javafx.scene.layout.GridPane;
Expand All @@ -66,8 +61,6 @@

import javafx.beans.value.ChangeListener;

import javafx.event.EventHandler;

import java.util.Optional;

import org.slf4j.Logger;
Expand Down Expand Up @@ -100,8 +93,6 @@ public abstract class TradeStepView extends AnchorPane {
protected Label infoLabel;
private Overlay acceptMediationResultPopup;

// TODO remove before release. Only in for making dev testing easier
private EventHandler<KeyEvent> keyEventEventHandler;
private Scene scene;


Expand Down Expand Up @@ -164,39 +155,9 @@ public void onMinuteTick() {
updateTimeLeft();
}
};

// TODO remove before relase. Only in for making dev testing easier
if (Version.VERSION.equals("1.1.5")) {
keyEventEventHandler = keyEvent -> {
String key;
if (Utilities.isAltOrCtrlPressed(KeyCode.UP, keyEvent)) {
if (trade.getTradePeriodState() == Trade.TradePeriodState.FIRST_HALF) {
trade.setTradePeriodState(Trade.TradePeriodState.SECOND_HALF);
} else if (trade.getTradePeriodState() == Trade.TradePeriodState.SECOND_HALF) {
trade.setTradePeriodState(Trade.TradePeriodState.TRADE_PERIOD_OVER);
}
} else if (Utilities.isAltOrCtrlPressed(KeyCode.DOWN, keyEvent)) {
if (trade.getTradePeriodState() == Trade.TradePeriodState.TRADE_PERIOD_OVER) {
trade.setTradePeriodState(Trade.TradePeriodState.SECOND_HALF);
key = "displayTradePeriodOver" + trade.getId();
DontShowAgainLookup.dontShowAgain(key, false);
} else if (trade.getTradePeriodState() == Trade.TradePeriodState.SECOND_HALF) {
trade.setTradePeriodState(Trade.TradePeriodState.FIRST_HALF);
key = "displayHalfTradePeriodOver" + trade.getId();
DontShowAgainLookup.dontShowAgain(key, false);
}
}
};
}
}

public void activate() {
// TODO remove before relase. Only in for making dev testing easier
scene = getScene();
if (Version.VERSION.equals("1.1.5") && scene != null) {
getScene().addEventHandler(KeyEvent.KEY_RELEASED, keyEventEventHandler);
}

if (txIdTextField != null) {
if (txIdSubscription != null)
txIdSubscription.unsubscribe();
Expand Down Expand Up @@ -247,11 +208,6 @@ private void openSupportTicket() {
}

public void deactivate() {
// TODO remove before relase. Only in for making dev testing easier
if (Version.VERSION.equals("1.1.5") && scene != null) {
scene.removeEventHandler(KeyEvent.KEY_RELEASED, keyEventEventHandler);
}

if (txIdSubscription != null)
txIdSubscription.unsubscribe();

Expand Down
Binary file modified p2p/src/main/resources/AccountAgeWitnessStore_BTC_MAINNET
View file
Open in desktop
Binary file not shown.
Loading