From 04fe20ca95e4f3d0ed202e02bd289f21e3c6d615 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Tue, 27 Sep 2022 12:46:53 +0200 Subject: [PATCH] Fix possible IllegalStateException in MatchList.fromJson --- .../java/com/emanuelef/remote_capture/model/MatchList.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java b/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java index 763eaeca..8480bd95 100644 --- a/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java +++ b/app/src/main/java/com/emanuelef/remote_capture/model/MatchList.java @@ -435,8 +435,11 @@ public class MatchList { public boolean fromJson(String json_str) { try { - JsonObject obj = JsonParser.parseString(json_str).getAsJsonObject(); - return deserialize(obj); + JsonElement el = JsonParser.parseString(json_str); + if(!el.isJsonObject()) + return false; + + return deserialize(el.getAsJsonObject()); } catch (JsonSyntaxException e) { e.printStackTrace(); return false;