improved handling of invalid JSON files

This also fixes an exception which was thrown if the url points to a non existing file.

Author: kaiwinter

android-remote-notifications/build.gradle

@@ -18,6 +18,9 @@ android {
     compileOptions {
         encoding "UTF-8"
     }
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {

android-remote-notifications/src/main/java/com/github/kaiwinter/androidremotenotifications/json/UnMarshaller.java

@@ -1,5 +1,8 @@
 package com.github.kaiwinter.androidremotenotifications.json;
 
+import android.util.Log;
+
+import com.github.kaiwinter.androidremotenotifications.RemoteNotifications;
 import com.github.kaiwinter.androidremotenotifications.model.UserNotification;
 import com.github.kaiwinter.androidremotenotifications.model.buttonaction.ButtonAction;
 import com.github.kaiwinter.androidremotenotifications.model.buttonaction.impl.ExitAppButtonAction;
@@ -10,6 +13,8 @@
 import com.github.kaiwinter.androidremotenotifications.model.impl.ToastNotification;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonIOException;
+import com.google.gson.JsonSyntaxException;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.typeadapters.RuntimeTypeAdapterFactory;
 
@@ -18,6 +23,7 @@
 import java.io.Reader;
 import java.lang.reflect.Type;
 import java.net.URL;
+import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -65,6 +71,9 @@ public static Set<UserNotification> getNotificationsFromJson(URL url) throws IOE
             Type listType = new TypeToken<Set<UserNotification>>() {
             }.getType();
             return createGson().fromJson(reader, listType);
+        } catch (JsonSyntaxException | JsonIOException e) {
+            Log.e(RemoteNotifications.TAG, e.getMessage() + ": " + url);
+            return Collections.emptySet();
         } finally {
             if (reader != null) {
                 reader.close();

android-remote-notifications/src/test/java/com/github/kaiwinter/androidremotenotifications/json/Notification2Json2NotificationTest.java

@@ -26,6 +26,13 @@ public void testNotificationFromURL() throws IOException {
         assertEquals(1, notificationsFromJson.size());
     }
 
+    @Test
+    public void testNotificationFromURLInvalidAnswer() throws IOException {
+        URL url = Notification2Json2NotificationTest.class.getResource("/com/github/kaiwinter/androidremotenotifications/invalid_answer");
+        Set<UserNotification> notificationsFromJson = UnMarshaller.getNotificationsFromJson(url);
+        assertEquals(0, notificationsFromJson.size());
+    }
+
     @Test
     public void testPersistentNotification() {
         NotificationConfiguration notificationConfiguration = new NotificationConfiguration();

android-remote-notifications/src/test/resources/com/github/kaiwinter/androidremotenotifications/invalid_answer

@@ -0,0 +1 @@
+404 - not found