From eda4b9ce0a6a9b732241f662012a1e7e5750e193 Mon Sep 17 00:00:00 2001 From: Guy Carmeli Date: Wed, 6 Feb 2019 18:32:20 +0200 Subject: [PATCH] Null check when parsing strings Mostly relevant to malformed icons where for some reason, requiring an image results in null. --- .../com/reactnativenavigation/parse/parsers/TextParser.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/TextParser.java b/lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/TextParser.java index 6970430a82b..577ac2bc7bb 100644 --- a/lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/TextParser.java +++ b/lib/android/app/src/main/java/com/reactnativenavigation/parse/parsers/TextParser.java @@ -5,8 +5,10 @@ import org.json.JSONObject; +import javax.annotation.*; + public class TextParser { - public static Text parse(JSONObject json, String text) { - return json.has(text) ? new Text(json.optString(text)) : new NullText(); + public static Text parse(@Nullable JSONObject json, String text) { + return json != null && json.has(text) ? new Text(json.optString(text)) : new NullText(); } }