Fix crash if json prop is null in version checker (#30)

Iru21 · Mar 12, 2023 · 1efe038 · 1efe038
1 parent 8b7f58d
commit 1efe038
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
 kotlin.code.style = official
 minecraftVersion = 1.17
 pluginName = Authy
-pluginVersion = 3.2.4
+pluginVersion = 3.2.5
diff --git a/src/main/kotlin/me/iru/utils/versionChecker.kt b/src/main/kotlin/me/iru/utils/versionChecker.kt
@@ -10,9 +10,9 @@ import java.net.http.HttpResponse
 
 
 fun isNewVersionAvailable(): Pair<Boolean, String> {
-    val latestRelease = getLatestRelease()
-    val latestVersion = latestRelease.get("tag_name").asString
-    return Pair(versionToNum(Authy.instance.version) < versionToNum(latestVersion), latestVersion)
+    val current = Authy.instance.version
+    val latestVersion = getLatestRelease().get("tag_name")?.asString ?: current
+    return Pair(versionToNum(current) < versionToNum(latestVersion), latestVersion)
 }
 
 private fun versionToNum(ver: String): Int {
@@ -33,6 +33,5 @@ private fun getLatestRelease(): JsonObject {
         .build()
 
     val res = client.send(request, HttpResponse.BodyHandlers.ofString())
-    val d: String = res.body()
-    return JsonParser().parse(d).asJsonObject
+    return JsonParser().parse(res.body()).asJsonObject
 }