New UpdateFX and new signing key that is password protected, will tra…

…nsition to it completely once test users are upgraded.

client/client.iml

@@ -27,7 +27,7 @@
     <orderEntry type="library" name="Maven: net.sf.jopt-simple:jopt-simple:4.5" level="project" />
     <orderEntry type="library" name="Maven: org.fxmisc.easybind:easybind:1.0.2" level="project" />
     <orderEntry type="library" name="Maven: org.controlsfx:controlsfx:8.0.6_20" level="project" />
-    <orderEntry type="library" name="Maven: com.vinumeris:updatefx:1.0" level="project" />
+    <orderEntry type="library" name="Maven: com.vinumeris:updatefx:1.2" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.6" level="project" />
     <orderEntry type="library" name="Maven: net.sf.trove4j:trove4j:3.0.3" level="project" />
     <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.51" level="project" />

client/pom.xml

@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.vinumeris</groupId>
             <artifactId>updatefx</artifactId>
-            <version>1.0</version>
+            <version>1.2</version>
         </dependency>
         <dependency>
             <groupId>com.vinumeris</groupId>

client/src/main/java/lighthouse/Main.java

@@ -75,12 +75,17 @@
 public class Main extends Application {
     public static final Logger log = LoggerFactory.getLogger(Main.class);
 
-    // This is an UpdateFX version code. It's incremented monotonically after a new version is released via
-    // auto update.
-    public static final int VERSION = 17;
     public static final String APP_NAME = "Lighthouse";
+
+    // UpdateFX stuff. Version is incremented monotonically after a new version is released.
+    public static final int VERSION = 17;
     public static final String UPDATES_BASE_URL = "https://www.vinumeris.com/lighthouse/updates";
-    public static final List<ECPoint> UPDATE_SIGNING_KEYS = Crypto.decode("02A3CDE5D0EDC281637C67AA67C0CB009EA6573E0F101C6E018ACB91393C08C129");
+    public static final List<ECPoint> UPDATE_SIGNING_KEYS = Crypto.decode(
+            // Two keys during temporary transition from a key that was not password protected to one that is.
+            // At release the old key will be removed.
+            "02A3CDE5D0EDC281637C67AA67C0CB009EA6573E0F101C6E018ACB91393C08C129",   // old
+            "02AA4D7E966BFA942D3BEABD2049A49DB6AE92C417D8837C328BC02F8B50411A97"    // new
+    );
     public static final int UPDATE_SIGNING_THRESHOLD = 1;
 
     public static NetworkParameters params;

client/src/main/java/lighthouse/subwindows/UpdateFXWindow.java

@@ -70,8 +70,8 @@ protected void updateItem(@Nullable UFXProtocol.Update item, boolean empty) {
                     icon.visibleProperty().bind(currentPin.isEqualTo(item != null ? item.getVersion() : 0));
                     setGraphic(icon);
                     // Bold the current version that's running, or latest if we're up to date.
-                    if ((item == null && Main.VERSION == summary.newVersion) ||
-                            (item != null && item.getVersion() == Main.VERSION && item.getVersion() != summary.newVersion))
+                    if ((item == null && Main.VERSION == summary.highestVersion) ||
+                            (item != null && item.getVersion() == Main.VERSION && item.getVersion() != summary.highestVersion))
                         setStyle("-fx-font-weight: bold");
                     else
                         setStyle("");