From eee12621459418568d294d6e2570c39fc8107fb7 Mon Sep 17 00:00:00 2001
From: Brad Hesse <nightsd01@gmail.com>
Date: Wed, 12 Sep 2018 13:48:40 -0700
Subject: [PATCH] Fix Android No Tags Null Pointer Exception
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

• In cases where a user had no tags and the app called getTags(), the serializer wrapper would attempt to iterate through keys on a null object causing a null pointer exception
• Fixed issue by adding an early return in the serializer
---
 .../main/java/com/onesignal/flutter/OneSignalSerializer.java   | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java b/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java
index 498bd29c..472b52b2 100644
--- a/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java
+++ b/android/src/main/java/com/onesignal/flutter/OneSignalSerializer.java
@@ -199,6 +199,9 @@ static private HashMap<String, Object> convertAndroidBackgroundImageLayoutToMap(
     static public HashMap<String, Object> convertJSONObjectToHashMap(JSONObject object) throws JSONException {
         HashMap<String, Object> hash = new HashMap<>();
 
+        if (object == null)
+           return hash;
+
         Iterator<String> keys = object.keys();
 
         while (keys.hasNext()) {