Fix server status json parse

layou233 · Jan 9, 2024 · 9c52bbf · 9c52bbf
1 parent 4218c61
commit 9c52bbf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/src/main/java/com/launium/mcping/server/MinecraftClient.kt b/app/src/main/java/com/launium/mcping/server/MinecraftClient.kt
@@ -42,14 +42,20 @@ class MinecraftClient(private val connection: Socket) :
         val statusObject =
             JSON.parse(statusArray, JSONReader.Feature.InitStringFieldAsEmpty) as JSONObject
         val serverFavicon = statusObject["favicon"] as String
-        val serverDescriptionObject = statusObject["description"] as JSONObject
-        var serverDescriptionText = serverDescriptionObject["text"] as String
-        serverDescriptionObject["extra"]?.let {
-            (it as JSONArray).forEach { item ->
-                if (item is JSONObject) {
-                    serverDescriptionText += item["text"] as String
+        var serverDescriptionText = ""
+        when (val description = statusObject["description"]) {
+            is JSONObject -> {
+                serverDescriptionText = description["text"] as String
+                description["extra"]?.let {
+                    (it as JSONArray).forEach { item ->
+                        if (item is JSONObject) {
+                            serverDescriptionText += item["text"] as String
+                        }
+                    }
                 }
             }
+
+            is String -> serverDescriptionText = description
         }
 
         // https://wiki.vg/Server_List_Ping#Ping_Request

diff --git a/app/src/main/res/layout/server_sheet.xml b/app/src/main/res/layout/server_sheet.xml
@@ -91,6 +91,7 @@
                 android:layout_height="wrap_content"
                 android:editable="false"
                 android:text="mc.example.com"
+                android:textIsSelectable="true"
                 tools:ignore="HardcodedText" />
 
         </com.google.android.material.textfield.TextInputLayout>