AstralTransRocketries/minosoft
1
0
Fork 0
mirror of https://gitlab.bixilon.de/bixilon/minosoft.git synced 2025-09-10 16:01:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

properly warn if update checking failed

Browse Source
This commit is contained in:
Moritz Zwerger 2023-12-22 23:15:38 +01:00
parent f61a6a5981
commit d77bb34162
No known key found for this signature in database
GPG Key ID: 5CAD791931B09AC4
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/de/bixilon/minosoft/gui/eros/main/about/AboutController.kt
View File

@ -68,7 +68,7 @@ class AboutController : EmbeddedJavaFXController<HBox>() {
checkUpdatesFX.isDisable = true checkUpdatesFX.isDisable = true
DefaultThreadPool += { DefaultThreadPool += {
try { try {
val update = MinosoftUpdater.check() val update = MinosoftUpdater.check(error = true)
if (update == null) { if (update == null) {
InfoDialog(i18n("updater.none.title"), i18n("updater.none.header")).show() InfoDialog(i18n("updater.none.title"), i18n("updater.none.header")).show()
} }

15
src/main/java/de/bixilon/minosoft/updater/MinosoftUpdater.kt
View File

@ -54,13 +54,13 @@ object MinosoftUpdater {
} }
} }
fun check(): MinosoftUpdate? { fun check(error: Boolean = false): MinosoftUpdate? {
val profile = OtherProfileManager.selected.updater 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 commit = MinosoftProperties.git?.commit ?: ""
val version = MinosoftProperties.general.name val version = MinosoftProperties.general.name
val stable = MinosoftProperties.general.stable val stable = MinosoftProperties.general.stable
@ -77,17 +77,18 @@ object MinosoftUpdater {
) )
validateURL(request.toURL()) validateURL(request.toURL())
val update = request(request) val update = request(request, error)
this.update = update this.update = update
return update return update
} }
private fun request(url: String): MinosoftUpdate? { private fun request(url: String, error: Boolean): MinosoftUpdate? {
val response: HTTPResponse<String> val response: HTTPResponse<String>
try { try {
response = url.get({ it }) response = url.get({ it })
} catch (error: Throwable) { } catch (exception: Throwable) {
Log.log(LogMessageType.OTHER, LogLevels.WARN) { "Could not check for updates: $error" } Log.log(LogMessageType.OTHER, LogLevels.WARN) { "Could not check for updates: $exception" }
if (error) throw exception
return null return null
} }