fix: Add null check before sorting events (#1494)

* Added null check before sorting * Used return statement on null
fossasia · Feb 14, 2019 · 42c3e7f · 42c3e7f
1 parent c4e1f76
commit 42c3e7f
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/app/src/main/java/com/eventyay/organizer/core/event/list/EventsViewModel.java b/app/src/main/java/com/eventyay/organizer/core/event/list/EventsViewModel.java
@@ -44,14 +44,21 @@ public EventsViewModel(EventRepository eventsDataRepository) {
 
     public LiveData<List<Event>> getEvents(int position) {
         switch (position) {
-            case 0: return liveEvents;
-            case 1: return pastEvents;
-            case 2: return draftEvents;
-            default: return events;
+            case 0:
+                return liveEvents;
+            case 1:
+                return pastEvents;
+            case 2:
+                return draftEvents;
+            default:
+                return events;
         }
     }
 
     public void sortBy(int criteria) {
+        if (events.getValue() == null) {
+            return;
+        }
         if (criteria == SORTBYNAME)
             Collections.sort(events.getValue(), (e1, e2) -> e1.getName().compareToIgnoreCase(e2.getName()));
         else {