Check if google task items are null before adding

pull/384/head
Alex Baker 10 years ago
parent b5d455f84b
commit a5871503e4

@ -131,7 +131,13 @@ public class GtasksSyncV2Provider {
String nextPageToken = null; String nextPageToken = null;
do { do {
remoteLists = gtasksInvoker.allGtaskLists(nextPageToken); remoteLists = gtasksInvoker.allGtaskLists(nextPageToken);
gtaskLists.addAll(remoteLists.getItems()); if (remoteLists == null) {
break;
}
List<TaskList> items = remoteLists.getItems();
if (items != null) {
gtaskLists.addAll(items);
}
nextPageToken = remoteLists.getNextPageToken(); nextPageToken = remoteLists.getNextPageToken();
} while (nextPageToken != null); } while (nextPageToken != null);
gtasksListService.updateLists(gtaskLists); gtasksListService.updateLists(gtaskLists);
@ -252,10 +258,14 @@ public class GtasksSyncV2Provider {
do { do {
Tasks taskList = invoker.getAllGtasksFromListId(listId, includeDeletedAndHidden, Tasks taskList = invoker.getAllGtasksFromListId(listId, includeDeletedAndHidden,
includeDeletedAndHidden, lastSyncDate + 1000L, nextPageToken); includeDeletedAndHidden, lastSyncDate + 1000L, nextPageToken);
if (taskList != null) { if (taskList == null) {
tasks.addAll(taskList.getItems()); break;
nextPageToken = taskList.getNextPageToken(); }
List<com.google.api.services.tasks.model.Task> items = taskList.getItems();
if (items != null) {
tasks.addAll(items);
} }
nextPageToken = taskList.getNextPageToken();
} while (nextPageToken != null); } while (nextPageToken != null);
if (!tasks.isEmpty()) { if (!tasks.isEmpty()) {

Loading…
Cancel
Save