From d77bb34162c6ec90f058b7686f314421dde7098d Mon Sep 17 00:00:00 2001
From: Moritz Zwerger <bixilon@bixilon.de>
Date: Fri, 22 Dec 2023 23:15:38 +0100
Subject: [PATCH] properly warn if update checking failed

---
 .../gui/eros/main/about/AboutController.kt        |  2 +-
 .../bixilon/minosoft/updater/MinosoftUpdater.kt   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt
index 815d4d8e7..9ad688dc7 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt
@@ -68,7 +68,7 @@ class AboutController : EmbeddedJavaFXController<HBox>() {
         checkUpdatesFX.isDisable = true
         DefaultThreadPool += {
             try {
-                val update = MinosoftUpdater.check()
+                val update = MinosoftUpdater.check(error = true)
                 if (update == null) {
                     InfoDialog(i18n("updater.none.title"), i18n("updater.none.header")).show()
                 }
diff --git a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt
index 4d91abb8d..e230e655d 100644
--- a/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt
+++ b/src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt
@@ -54,13 +54,13 @@ object MinosoftUpdater {
         }
     }
 
-    fun check(): MinosoftUpdate? {
+    fun check(error: Boolean = false): MinosoftUpdate? {
         val profile = OtherProfileManager.selected.updater
-        return check(profile.url, profile.channel)
+        return check(profile.url, profile.channel, error)
     }
 
 
-    fun check(url: String, channel: String): MinosoftUpdate? {
+    fun check(url: String, channel: String, error: Boolean): MinosoftUpdate? {
         val commit = MinosoftProperties.git?.commit ?: ""
         val version = MinosoftProperties.general.name
         val stable = MinosoftProperties.general.stable
@@ -77,17 +77,18 @@ object MinosoftUpdater {
         )
 
         validateURL(request.toURL())
-        val update = request(request)
+        val update = request(request, error)
         this.update = update
         return update
     }
 
-    private fun request(url: String): MinosoftUpdate? {
+    private fun request(url: String, error: Boolean): MinosoftUpdate? {
         val response: HTTPResponse<String>
         try {
             response = url.get({ it })
-        } catch (error: Throwable) {
-            Log.log(LogMessageType.OTHER, LogLevels.WARN) { "Could not check for updates: $error" }
+        } catch (exception: Throwable) {
+            Log.log(LogMessageType.OTHER, LogLevels.WARN) { "Could not check for updates: $exception" }
+            if (error) throw exception
             return null
         }