From 96764394bdc02f60d8431ff87055ba141221602f Mon Sep 17 00:00:00 2001 From: Manfred Karrer Date: Tue, 26 Apr 2016 21:34:03 +0200 Subject: [PATCH] Fix display for update popup --- core/src/main/java/io/bitsquare/alert/Alert.java | 6 ++++++ .../main/java/io/bitsquare/gui/main/MainViewModel.java | 9 ++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/core/src/main/java/io/bitsquare/alert/Alert.java b/core/src/main/java/io/bitsquare/alert/Alert.java index 8a44c1974c..a6cb079a9d 100644 --- a/core/src/main/java/io/bitsquare/alert/Alert.java +++ b/core/src/main/java/io/bitsquare/alert/Alert.java @@ -67,6 +67,12 @@ public final class Alert implements StoragePayload { return signatureAsBase64; } + public boolean isNewVersion() { + int versionNum = Integer.valueOf(Version.VERSION.replace(".", "")); + int alertVersionNum = Integer.valueOf(version.replace(".", "")); + return versionNum < alertVersionNum; + } + @Override public long getTTL() { return TTL; diff --git a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java index 9ebf26d9de..f5c4821d07 100644 --- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java +++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java @@ -823,11 +823,10 @@ public class MainViewModel implements ViewModel { private void displayAlertIfPresent(Alert alert) { boolean alreadyDisplayed = alert != null && alert.equals(user.getDisplayedAlert()); user.setDisplayedAlert(alert); - - if (alert != null && !alreadyDisplayed) { - if (!alert.isUpdateInfo || !alert.version.equals(Version.VERSION)) - new DisplayAlertMessageWindow().alertMessage(alert).show(); - } + if (alert != null && + !alreadyDisplayed && + (!alert.isUpdateInfo || alert.isNewVersion())) + new DisplayAlertMessageWindow().alertMessage(alert).show(); } private void swapPendingOfferFundingEntries() {