From cc0855237641b645b229f9c78541dfbb1070a842 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 21 May 2019 15:45:10 -0500
Subject: [PATCH 1/2] Check if next page token is empty string

https://issuetracker.google.com/issues/133254108
---
 app/build.gradle                                              | 4 ++--
 .../main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index bc473a19b..b4378c22d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,8 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 579
-        versionName "6.6.3"
+        versionCode 580
+        versionName "6.6.4"
         targetSdkVersion 28
         minSdkVersion 16
         multiDexEnabled true
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index 52d677024..3944fe345 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -346,7 +346,7 @@ public class GoogleTaskSynchronizer {
           tasks.addAll(items);
         }
         nextPageToken = taskList.getNextPageToken();
-      } while (nextPageToken != null);
+      } while (!Strings.isNullOrEmpty(nextPageToken));
 
       for (com.google.api.services.tasks.model.Task gtask : tasks) {
         String remoteId = gtask.getId();

From 6a6f550ed09b2a1650543e673060dd81442b6f49 Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 21 May 2019 16:15:51 -0500
Subject: [PATCH 2/2] Missed nextPageToken check

---
 CHANGELOG.md                                                  | 4 ++++
 app/build.gradle                                              | 2 +-
 .../main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 14b6839ca..dc817ee01 100644
--- a/CHANGELOG.md
+++ b/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
diff --git a/app/build.gradle b/app/build.gradle
index b4378c22d..b19dac225 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,7 +21,7 @@ android {
     defaultConfig {
         testApplicationId "org.tasks.test"
         applicationId "org.tasks"
-        versionCode 580
+        versionCode 581
         versionName "6.6.4"
         targetSdkVersion 28
         minSdkVersion 16
diff --git a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
index 3944fe345..6ffaba485 100644
--- a/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
+++ b/app/src/main/java/org/tasks/gtasks/GoogleTaskSynchronizer.java
@@ -198,7 +198,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) {