Fixed potential NPE on error reading json

kaiwinter · Jun 23, 2018 · 789274c · 789274c
1 parent 098141c
commit 789274c
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/...ions/src/main/java/com/github/kaiwinter/androidremotenotifications/json/UnMarshaller.java b/...ions/src/main/java/com/github/kaiwinter/androidremotenotifications/json/UnMarshaller.java
@@ -24,6 +24,7 @@
 import java.lang.reflect.Type;
 import java.net.URL;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.Set;
 
 /**
@@ -70,7 +71,11 @@ public static Set<UserNotification> getNotificationsFromJson(URL url) throws IOE
 
             Type listType = new TypeToken<Set<UserNotification>>() {
             }.getType();
-            return createGson().fromJson(reader, listType);
+            Set<UserNotification> notifications = createGson().fromJson(reader, listType);
+            if (notifications == null) {
+                notifications = new HashSet<>();
+            }
+            return notifications;
         } catch (JsonSyntaxException | JsonIOException e) {
             Log.e(RemoteNotifications.TAG, e.getMessage() + ": " + url);
             return Collections.emptySet();
@@ -90,7 +95,11 @@ public static Set<UserNotification> getNotificationsFromJson(URL url) throws IOE
     public static Set<PersistentNotification> getPersistentNotificationsFromJson(String json) {
         Type listType = new TypeToken<Set<PersistentNotification>>() {
         }.getType();
-        return createGson().fromJson(json, listType);
+        Set<PersistentNotification> notifications = createGson().fromJson(json, listType);
+        if (notifications == null) {
+            notifications = new HashSet<>();
+        }
+        return notifications;
     }
 
     private static Gson createGson() {