From 0e2ccbcdb98a1d9041b186efc186fd6e5c0d7784 Mon Sep 17 00:00:00 2001
From: Manfred Karrer <mk@nucleo.io>
Date: Sun, 20 Mar 2016 14:04:13 +0100
Subject: [PATCH] Show update notification msg only if client version is older.

---
 core/src/main/java/io/bitsquare/alert/Alert.java          | 2 +-
 .../main/java/io/bitsquare/gui/main/MainViewModel.java    | 3 ++-
 .../gui/main/overlays/windows/SendAlertMessageWindow.java | 8 +++++---
 3 files changed, 8 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 0727d68425..d3abbc19da 100644
--- a/core/src/main/java/io/bitsquare/alert/Alert.java
+++ b/core/src/main/java/io/bitsquare/alert/Alert.java
@@ -33,7 +33,7 @@ public final class Alert implements StoragePayload {
     // That object is sent over the wire, so we need to take care of version compatibility.
     private static final long serialVersionUID = Version.P2P_NETWORK_VERSION;
     private static final Logger log = LoggerFactory.getLogger(Alert.class);
-    private static final long TTL = TimeUnit.DAYS.toMillis(10);
+    private static final long TTL = TimeUnit.DAYS.toMillis(21);
 
     public final String message;
     public final String version;
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 dc2c39f077..e3bac2e616 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/MainViewModel.java
@@ -671,7 +671,8 @@ public class MainViewModel implements ViewModel {
         user.setDisplayedAlert(alert);
 
         if (alert != null && !alreadyDisplayed) {
-            new DisplayAlertMessageWindow().alertMessage(alert).show();
+            if (!alert.isUpdateInfo || !alert.version.equals(Version.VERSION))
+                new DisplayAlertMessageWindow().alertMessage(alert).show();
         }
     }
 
diff --git a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
index 2b80f3dacd..23a3b086e6 100644
--- a/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
+++ b/gui/src/main/java/io/bitsquare/gui/main/overlays/windows/SendAlertMessageWindow.java
@@ -19,7 +19,6 @@ package io.bitsquare.gui.main.overlays.windows;
 
 import io.bitsquare.alert.Alert;
 import io.bitsquare.app.BitsquareApp;
-import io.bitsquare.app.Version;
 import io.bitsquare.common.util.Tuple2;
 import io.bitsquare.gui.components.InputTextField;
 import io.bitsquare.gui.main.overlays.Overlay;
@@ -100,6 +99,9 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
         CheckBox isUpdateCheckBox = addLabelCheckBox(gridPane, ++rowIndex, "Is update notification:", "").second;
         isUpdateCheckBox.setSelected(true);
 
+        InputTextField versionInputTextField = addLabelInputTextField(gridPane, ++rowIndex, "New version nr.:").second;
+        versionInputTextField.disableProperty().bind(isUpdateCheckBox.selectedProperty().not());
+        
         if (BitsquareApp.DEV_MODE)
             keyInputTextField.setText("2e41038992f89eef2e4634ff3586e342c68ad9a5a7ffafee866781687f77a9b1");
 
@@ -107,7 +109,7 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
         sendButton.setOnAction(e -> {
             if (alertMessageTextArea.getText().length() > 0 && keyInputTextField.getText().length() > 0) {
                 if (sendAlertMessageHandler.handle(
-                        new Alert(alertMessageTextArea.getText(), isUpdateCheckBox.isSelected(), Version.VERSION),
+                        new Alert(alertMessageTextArea.getText(), isUpdateCheckBox.isSelected(), versionInputTextField.getText()),
                         keyInputTextField.getText()))
                     hide();
                 else
@@ -125,7 +127,7 @@ public class SendAlertMessageWindow extends Overlay<SendAlertMessageWindow> {
             }
         });
 
-        closeButton = new Button("Cancel");
+        closeButton = new Button("Close");
         closeButton.setOnAction(e -> {
             hide();
             closeHandlerOptional.ifPresent(closeHandler -> closeHandler.run());