Merge pull request #8 from alexstyl/fix_crash

Fix NPE crash on NamedayDatabaseRefresher#loadSpecialNamedays()
alexstyl · Sep 2, 2016 · 6e9eb74 · 6e9eb74
2 parents 9c9ddcc + c1bbdde
commit 6e9eb74
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/mobile/src/main/java/com/alexstyl/specialdates/events/NamedayDatabaseRefresher.java b/mobile/src/main/java/com/alexstyl/specialdates/events/NamedayDatabaseRefresher.java
@@ -77,6 +77,9 @@ private void initialiseNamedaysIfEnabled() {
     private List<ContactEvent> loadDeviceStaticNamedays() {
         List<ContactEvent> namedayEvents = new ArrayList<>();
         Cursor cursor = DeviceContactsQuery.query(contentResolver);
+        if (isInvalidCursor(cursor)) {
+            return namedayEvents;
+        }
 
         Set<Long> contactIDs = new HashSet<>();
 
@@ -126,6 +129,9 @@ private List<ContactEvent> loadDeviceStaticNamedays() {
     private List<ContactEvent> loadSpecialNamedays() {
         List<ContactEvent> namedayEvents = new ArrayList<>();
         Cursor cursor = DeviceContactsQuery.query(contentResolver);
+        if (isInvalidCursor(cursor)) {
+            return namedayEvents;
+        }
 
         Set<Long> contactIDs = new HashSet<>();
 
@@ -164,6 +170,10 @@ private List<ContactEvent> loadSpecialNamedays() {
         return namedayEvents;
     }
 
+    private boolean isInvalidCursor(Cursor cursor) {
+        return cursor == null;
+    }
+
     private String getDisplayName(Cursor cursor) {
         return cursor.getString(DeviceContactsQuery.DISPLAY_NAME);
     }