Add null check in CalendarActivity to prevent IllegalArgumentException (

#1089)

This commit checks whether the list of events, as returned by the TUMonline API, is null. Only if it is not, it will invoke the methods that perform the scheduling of the corresponding notifications.

app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/TUMOnlineAPIService.kt

@@ -4,7 +4,7 @@ import de.tum.`in`.tumcampusapp.api.tumonline.model.AccessToken
 import de.tum.`in`.tumcampusapp.api.tumonline.model.TokenConfirmation
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.CreateEventResponse
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.DeleteEventResponse
-import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.Events
+import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.EventsResponse
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.component.tumui.lectures.model.LectureAppointmentsResponse
 import de.tum.`in`.tumcampusapp.component.tumui.lectures.model.LectureDetailsResponse
@@ -25,7 +25,7 @@ interface TUMOnlineAPIService {
             @Query("pMonateVor") start: Int,
             @Query("pMonateNach") end: Int,
             @Header("Cache-Control") cacheControl: String
-    ): Call<Events>
+    ): Call<EventsResponse>
 
     @GET("wbservicesbasic.terminCreate")
     fun createCalendarEvent(

app/src/main/java/de/tum/in/tumcampusapp/api/tumonline/TUMOnlineClient.kt

@@ -13,7 +13,7 @@ import de.tum.`in`.tumcampusapp.api.tumonline.model.TokenConfirmation
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.CalendarItem
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.CreateEventResponse
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.DeleteEventResponse
-import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.Events
+import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.EventsResponse
 import de.tum.`in`.tumcampusapp.component.tumui.grades.model.ExamList
 import de.tum.`in`.tumcampusapp.component.tumui.lectures.model.LectureAppointmentsResponse
 import de.tum.`in`.tumcampusapp.component.tumui.lectures.model.LectureDetailsResponse
@@ -30,7 +30,7 @@ import retrofit2.Retrofit
 
 class TUMOnlineClient(private val apiService: TUMOnlineAPIService) {
 
-    fun getCalendar(cacheControl: CacheControl): Call<Events> {
+    fun getCalendar(cacheControl: CacheControl): Call<EventsResponse> {
         return apiService.getCalendar(
                 Const.CALENDAR_MONTHS_BEFORE, Const.CALENDAR_MONTHS_AFTER, cacheControl.header)
     }

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarActivity.java

@@ -1,7 +1,6 @@
 package de.tum.in.tumcampusapp.component.tumui.calendar;
 
 import android.Manifest;
-import android.arch.lifecycle.Lifecycle;
 import android.content.ContentUris;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
@@ -25,8 +24,6 @@
 import com.alamkanak.weekview.WeekView;
 import com.alamkanak.weekview.WeekViewDisplayable;
 import com.alamkanak.weekview.WeekViewEvent;
-import com.trello.lifecycle2.android.lifecycle.AndroidLifecycle;
-import com.trello.rxlifecycle2.LifecycleProvider;
 
 import org.jetbrains.annotations.NotNull;
 import org.joda.time.DateTime;
@@ -44,7 +41,7 @@
 import de.tum.in.tumcampusapp.component.other.generic.activity.ActivityForAccessingTumOnline;
 import de.tum.in.tumcampusapp.component.tumui.calendar.model.CalendarItem;
 import de.tum.in.tumcampusapp.component.tumui.calendar.model.Event;
-import de.tum.in.tumcampusapp.component.tumui.calendar.model.Events;
+import de.tum.in.tumcampusapp.component.tumui.calendar.model.EventsResponse;
 import de.tum.in.tumcampusapp.component.ui.transportation.TransportController;
 import de.tum.in.tumcampusapp.database.TcaDb;
 import de.tum.in.tumcampusapp.utils.Const;
@@ -59,7 +56,7 @@
 /**
  * Activity showing the user's calendar. Calendar items (events) are fetched from TUMOnline and displayed as blocks on a timeline.
  */
-public class CalendarActivity extends ActivityForAccessingTumOnline<Events>
+public class CalendarActivity extends ActivityForAccessingTumOnline<EventsResponse>
         implements OnClickListener, MonthLoader.MonthChangeListener, WeekView.EventClickListener,
         CalendarDetailsFragment.OnEventInteractionListener {
 
@@ -131,18 +128,24 @@ public void onRefresh() {
     }
 
     private void loadEvents(CacheControl cacheControl) {
-        Call<Events> apiCall = apiClient.getCalendar(cacheControl);
+        Call<EventsResponse> apiCall = apiClient.getCalendar(cacheControl);
         fetch(apiCall);
     }
 
     @Override
-    protected void onDownloadSuccessful(@NonNull Events response) {
+    protected void onDownloadSuccessful(@NonNull EventsResponse response) {
         isFetched = true;
-        scheduleNotifications(response.getEvents());
+
+        List<Event> events = response.getEvents();
+        if (events == null) {
+            return;
+        }
+
+        scheduleNotifications(events);
 
         mDisposable.add(
                 Completable
-                        .fromAction(() -> calendarController.importCalendar(response))
+                        .fromAction(() -> calendarController.importCalendar(events))
                         .subscribeOn(Schedulers.io())
                         .observeOn(AndroidSchedulers.mainThread())
                         .subscribe(() -> {
@@ -155,7 +158,7 @@ protected void onDownloadSuccessful(@NonNull Events response) {
         );
     }
 
-    private void scheduleNotifications(List<Event> events) {
+    private void scheduleNotifications(@NonNull List<Event> events) {
         if (calendarController.hasNotificationsEnabled()) {
             calendarController.scheduleNotifications(events);
         }

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/CalendarController.java

@@ -34,7 +34,6 @@
 import de.tum.in.tumcampusapp.component.other.locations.model.Geo;
 import de.tum.in.tumcampusapp.component.tumui.calendar.model.CalendarItem;
 import de.tum.in.tumcampusapp.component.tumui.calendar.model.Event;
-import de.tum.in.tumcampusapp.component.tumui.calendar.model.Events;
 import de.tum.in.tumcampusapp.component.tumui.calendar.model.WidgetsTimetableBlacklist;
 import de.tum.in.tumcampusapp.component.tumui.lectures.model.RoomLocations;
 import de.tum.in.tumcampusapp.component.ui.overview.card.Card;
@@ -212,18 +211,15 @@ void scheduleNotifications(List<Event> events) {
         scheduler.schedule(notifications);
     }
 
-    public void importCalendar(Events newEvents) {
+    public void importCalendar(@NonNull List<Event> events) {
         // Cleanup cache before importing
         removeCache();
 
         // Import the new events
-        List<Event> events = newEvents.getEvents();
-        if (events != null) {
-            try {
-                replaceIntoDb(events);
-            } catch (Exception e) {
-                Utils.log(e);
-            }
+        try {
+            replaceIntoDb(events);
+        } catch (Exception e) {
+            Utils.log(e);
         }
 
         new SyncManager(mContext).replaceIntoDb(Const.SYNC_CALENDAR_IMPORT);

app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/Events.kt → app/src/main/java/de/tum/in/tumcampusapp/component/tumui/calendar/model/EventsResponse.kt

@@ -10,4 +10,4 @@ import com.tickaroo.tikxml.annotation.Xml
  * @see LecturesSearchRow
  */
 @Xml(name = "events")
-data class Events(@Element val events: List<Event>? = null)
+data class EventsResponse(@Element val events: List<Event>? = null)

app/src/main/java/de/tum/in/tumcampusapp/utils/CacheManager.kt

@@ -5,7 +5,7 @@ import de.tum.`in`.tumcampusapp.api.tumonline.AccessTokenManager
 import de.tum.`in`.tumcampusapp.api.tumonline.CacheControl
 import de.tum.`in`.tumcampusapp.api.tumonline.TUMOnlineClient
 import de.tum.`in`.tumcampusapp.component.tumui.calendar.CalendarController
-import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.Events
+import de.tum.`in`.tumcampusapp.component.tumui.calendar.model.EventsResponse
 import de.tum.`in`.tumcampusapp.component.tumui.lectures.model.LecturesResponse
 import de.tum.`in`.tumcampusapp.component.ui.chat.ChatRoomController
 import okhttp3.Cache
@@ -32,14 +32,15 @@ class CacheManager(private val context: Context) {
         TUMOnlineClient
                 .getInstance(context)
                 .getCalendar(CacheControl.USE_CACHE)
-                .enqueue(object : Callback<Events> {
-                    override fun onResponse(call: Call<Events>, response: Response<Events>) {
-                        val events = response.body() ?: return
+                .enqueue(object : Callback<EventsResponse> {
+                    override fun onResponse(call: Call<EventsResponse>, response: Response<EventsResponse>) {
+                        val eventsResponse = response.body() ?: return
+                        val events = eventsResponse.events ?: return
                         CalendarController(context).importCalendar(events)
                         loadRoomLocations()
                     }
 
-                    override fun onFailure(call: Call<Events>, t: Throwable) {
+                    override fun onFailure(call: Call<EventsResponse>, t: Throwable) {
                         Utils.log(t, "Error while loading calendar in CacheManager")
                     }
                 })