aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
index f331ab3e3..9524836e4 100644
--- a/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
+++ b/src/main/java/at/hannibal2/skyhanni/utils/APIUtils.kt
@@ -181,9 +181,16 @@ object APIUtils {
private fun readResponse(entity: HttpEntity): JsonObject {
val retSrc = EntityUtils.toString(entity) ?: return JsonObject()
- val parsed = parser.parse(retSrc)
- if (parsed.isJsonNull) return JsonObject()
- return parsed as JsonObject
+
+ try {
+ val parsed = parser.parse(retSrc)
+ if (parsed.isJsonNull) return JsonObject()
+
+ return parsed as JsonObject
+ } catch (_: Throwable) {
+ // This causes content types that aren't JSON to be ignored
+ return JsonObject()
+ }
}
fun postJSONIsSuccessful(url: String, body: String, silentError: Boolean = false): Boolean {