From 35be9f14e4ff185d75639344f6a2cedeb4a5636a Mon Sep 17 00:00:00 2001 From: schroda <50052685+schroda@users.noreply.github.com> Date: Mon, 4 Sep 2023 00:11:06 +0200 Subject: [PATCH] Return correct latest compatible webUI version (#677) The function always returned the PREVIEW version as the latest compatible version. This was caused by incorrectly selecting the version from the json object, which resulted in the version to be wrapped in '"'. --- .../suwayomi/tachidesk/server/util/WebInterfaceManager.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt index 0b3dfde7..3e2f57ff 100644 --- a/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt +++ b/server/src/main/kotlin/suwayomi/tachidesk/server/util/WebInterfaceManager.kt @@ -452,7 +452,7 @@ object WebInterfaceManager { for (i in 0 until webUIToServerVersionMappings.size) { val webUIToServerVersionEntry = webUIToServerVersionMappings[i].jsonObject - var webUIVersion = webUIToServerVersionEntry["uiVersion"].toString() + var webUIVersion = webUIToServerVersionEntry["uiVersion"]?.jsonPrimitive?.content ?: throw Exception("Invalid mappingFile") val minServerVersionString = webUIToServerVersionEntry["serverVersion"]?.jsonPrimitive?.content ?: throw Exception("Invalid mappingFile") val minServerVersionNumber = extractVersion(minServerVersionString)