Do not use request restrictions alongside the sync token

sama-app · Nov 17, 2021 · 647d7f8 · 647d7f8
1 parent a956365
commit 647d7f8
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/app/src/main/java/com/sama/integration/google/calendar/domain/CalendarApiExtensions.kt b/app/src/main/java/com/sama/integration/google/calendar/domain/CalendarApiExtensions.kt
@@ -156,9 +156,13 @@ fun Calendar.findAllCalendars(syncToken: String?): GoogleCalendarListResponse {
 private fun Calendar.findCalendarsPage(nextPageToken: String?, syncToken: String? = null): Calendar.CalendarList.List {
     val requestBuilder = this.calendarList().list()
     requestBuilder.maxResults = 250
-    requestBuilder.syncToken = syncToken
-    requestBuilder.showDeleted = true
-    requestBuilder.showHidden = false
+    if (syncToken != null) {
+        requestBuilder.syncToken = syncToken
+    } else {
+        requestBuilder.showDeleted = true
+        requestBuilder.showHidden = false
+    }
+
     requestBuilder.fields =
         """
             nextPageToken,nextSyncToken,items(id,timeZone,accessRole,primary,selected,summary,summaryOverride,backgroundColor,foregroundColor,deleted)