Merge tag '6.6.4'

CHANGELOG.md

@@ -1,5 +1,9 @@
 Change Log
 ---
+### 6.6.5 (2019-05-21)
+
+* Handle [breaking change](https://issuetracker.google.com/issues/133254108) in Google Tasks API
+
 ### 6.6.3 (2019-05-08)
 
 * Fix backup import crash

app/build.gradle

@@ -21,8 +21,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 579
+        versionCode 581
-        versionName "6.6.3"
+        versionName "6.6.4"
         targetSdkVersion 28
         minSdkVersion 16
         multiDexEnabled true

app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java

@@ -199,7 +199,7 @@ public class GoogleTaskSynchronizer {
         gtaskLists.addAll(items);
       }
       nextPageToken = remoteLists.getNextPageToken();
-    } while (nextPageToken != null);
+    } while (!Strings.isNullOrEmpty(nextPageToken));
     gtasksListService.updateLists(account, gtaskLists);
     Filter defaultRemoteList = defaultFilterProvider.getDefaultRemoteList();
     if (defaultRemoteList instanceof GtasksFilter) {
@@ -372,7 +372,7 @@ public class GoogleTaskSynchronizer {
         tasks.addAll(items);
       }
       nextPageToken = taskList.getNextPageToken();
-    } while (nextPageToken != null);
+    } while (!Strings.isNullOrEmpty(nextPageToken));
 
     Collections.sort(tasks, PARENTS_FIRST);