Fixes #9: Check for the description being a JSON object and grab the …

…text field from it if it is.
justdave · Mar 5, 2016 · ca33554 · ca33554
1 parent 6eb61e7
commit ca33554
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/src/main/java/net/justdave/mcstatus/MinecraftServer.java b/app/src/main/java/net/justdave/mcstatus/MinecraftServer.java
@@ -121,6 +121,9 @@ public String serverVersion() {
 	public String description() {
 		StringBuilder result = new StringBuilder();
 		String desc = serverJSON.optString("description");
+		if (serverJSON.optJSONObject("description") != null) {
+            desc = serverJSON.optJSONObject("description").optString("text");
+        }
 		result.append("<body style='background-color: transparent; color: white; margin: 0; padding: 0;'><span>");
 		int curChar = 0;
 		String color = "";