Update manager

client/build.gradle.kts

@@ -9,7 +9,9 @@ ktfmt { kotlinLangStyle() }
 dependencies {
     implementation("com.jgoodies:jgoodies-forms:1.6.0")
     implementation("com.miglayout:miglayout-swing:5.2")
+    implementation("com.konghq:unirest-java:3.14.2")
     implementation(project(":core"))
+    testImplementation(project(":test-core"))
 }
 
 application {

client/src/main/java/online/util/DesktopEntropyClient.java

@@ -75,13 +75,6 @@ public void sendAsyncInSingleThread(MessageSenderParams message)
 		senderThread.start();
 	}
 
-	/*public void sendAsync(MessageSenderParams message)
-	{
-		MessageSender senderRunnable = new MessageSender(this, message);
-		Thread senderThread = new Thread(senderRunnable, "MessageSender");
-		senderThread.start();
-	}*/
-
 	@Override
 	public String sendSyncOnDevice(MessageSender runnable)
 	{
@@ -91,6 +84,6 @@ public String sendSyncOnDevice(MessageSender runnable)
 	@Override
 	public void checkForUpdates()
 	{
-		UpdateChecker.checkForUpdates(FILE_NAME_ENTROPY_JAR, SERVER_PORT_NUMBER_DOWNLOAD);
+		UpdateManager.INSTANCE.checkForUpdates(OnlineConstants.ENTROPY_VERSION_NUMBER);
 	}
 }

client/src/main/java/online/util/ResponseHandler.java

@@ -265,28 +265,23 @@ private static void handleConnectFailure(Element root)
 
 		if (failureReason.contains("out of date"))
 		{
-			promptForUpdate(root);
+			promptForUpdate();
 		}
 		else
 		{
 			DialogUtil.showErrorLater(failureReason);
 		}
 	}
 
-	private static void promptForUpdate(final Element rootElement)
+	private static void promptForUpdate()
 	{
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				int answer = DialogUtil.showQuestion("Entropy needs to update in order to connect. \n\nUpdate now?", false);
-				if (answer == JOptionPane.YES_OPTION)
-				{
-					UpdateChecker.startUpdate(rootElement, OnlineConstants.FILE_NAME_ENTROPY_JAR, OnlineConstants.SERVER_PORT_NUMBER_DOWNLOAD);
-				}
-			}
-		});
+		SwingUtilities.invokeLater(() -> {
+            int answer = DialogUtil.showQuestion("Entropy needs to update in order to connect. \n\nUpdate now?", false);
+            if (answer == JOptionPane.YES_OPTION)
+            {
+                UpdateManager.INSTANCE.checkForUpdates(OnlineConstants.ENTROPY_VERSION_NUMBER);
+            }
+        });
 	}
 
 	private static void handleKickOff(Element root)

client/src/main/java/screen/AbstractAboutDialog.java

@@ -14,10 +14,10 @@
 import javax.swing.SwingConstants;
 
 import bean.HyperlinkAdaptor;
-import bean.HyperlinkListener;
+import bean.IHyperlinkListener;
 
 public abstract class AbstractAboutDialog extends JDialog 
-						 		  		  implements HyperlinkListener,
+						 		  		  implements IHyperlinkListener,
 						 		  			         ActionListener
 {
 	public AbstractAboutDialog() 

client/src/main/java/util/DialogUtil.java

@@ -3,13 +3,11 @@
 import javax.swing.JOptionPane;
 import javax.swing.SwingUtilities;
 
-import screen.LoadingDialog;
-
 import static utils.InjectedThings.logger;
 
+@Deprecated()
 public class DialogUtil 
 {
-	private static LoadingDialog loadingDialog = new LoadingDialog();
 	private static boolean shownConnectionLost = false;
 
 	public static void showInfo(String infoText)
@@ -104,14 +102,4 @@ public static void showConnectionLost()
 			shownConnectionLost = true;
 		}
 	}
-
-	public static void showLoadingDialog(String text)
-	{
-		logger.info("loaderShown", text);
-		loadingDialog.showDialog(text);
-	}
-	public static void dismissLoadingDialog()
-	{
-		loadingDialog.dismissDialog();
-	}
 }

client/src/main/kotlin/bean/HyperlinkAdaptor.kt

@@ -0,0 +1,36 @@
+package bean
+
+import java.awt.Component
+import java.awt.Cursor
+import java.awt.event.MouseAdapter
+import java.awt.event.MouseEvent
+
+class HyperlinkAdaptor(private val listener: IHyperlinkListener) : MouseAdapter() {
+    private val listenerWindow = listener as Component
+
+    override fun mouseClicked(arg0: MouseEvent) = listener.linkClicked(arg0)
+
+    override fun mouseMoved(arg0: MouseEvent) {
+        if (listener.isOverHyperlink(arg0)) {
+            listenerWindow.cursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
+        } else {
+            listenerWindow.cursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)
+        }
+    }
+
+    override fun mouseEntered(e: MouseEvent) {
+        if (listener.isOverHyperlink(e)) {
+            listenerWindow.cursor = Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)
+        }
+    }
+
+    override fun mouseDragged(e: MouseEvent?) {
+        if (listenerWindow.cursor.type == Cursor.HAND_CURSOR) {
+            listenerWindow.cursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)
+        }
+    }
+
+    override fun mouseExited(arg0: MouseEvent?) {
+        listenerWindow.cursor = Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)
+    }
+}

client/src/main/kotlin/bean/IHyperlinkListener.kt

@@ -0,0 +1,9 @@
+package bean
+
+import java.awt.event.MouseEvent
+
+interface IHyperlinkListener {
+    fun linkClicked(arg0: MouseEvent)
+
+    fun isOverHyperlink(arg0: MouseEvent): Boolean
+}

client/src/main/kotlin/bean/LinkLabel.kt

@@ -0,0 +1,20 @@
+package bean
+
+import java.awt.Color
+import java.awt.event.MouseEvent
+import javax.swing.JLabel
+
+class LinkLabel(text: String, private val linkClicked: () -> Unit) :
+    JLabel("<html><u>$text</u></html>"), IHyperlinkListener {
+    init {
+        foreground = Color.BLUE
+
+        val adaptor = HyperlinkAdaptor(this)
+        addMouseListener(adaptor)
+        addMouseMotionListener(adaptor)
+    }
+
+    override fun linkClicked(arg0: MouseEvent) = linkClicked()
+
+    override fun isOverHyperlink(arg0: MouseEvent) = true
+}