From b779ca1b94f0b7a3abc5a0a7fc414614d266aa2e Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Tue, 31 Mar 2020 11:02:24 -0500
Subject: [PATCH] Fix multi-account Google Task synchronization

---
 CHANGELOG.md                                       |  4 ++++
 app/build.gradle.kts                               |  4 ++--
 .../todoroo/astrid/gtasks/api/GtasksInvoker.java   | 14 +++++++++-----
 fastlane/metadata/android/en-US/changelogs/713.txt |  3 +++
 4 files changed, 18 insertions(+), 7 deletions(-)
 create mode 100644 fastlane/metadata/android/en-US/changelogs/713.txt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77d84ab77..e43ce93d5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Change Log
 ---
+### 8.7.1 (2020-03-31)
+
+* Fix multi-account Google Task synchronization
+
 ### 8.7 (2020-03-19)
 
 * Places are now lists
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 2731611a2..03ebcd528 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -35,8 +35,8 @@ android {
     defaultConfig {
         testApplicationId = "org.tasks.test"
         applicationId = "org.tasks"
-        versionCode = 712
-        versionName = "8.7"
+        versionCode = 713
+        versionName = "8.7.1"
         targetSdkVersion(Versions.targetSdk)
         minSdkVersion(Versions.minSdk)
         multiDexEnabled = true
diff --git a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
index 60937bc5e..6a104bb04 100644
--- a/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
+++ b/app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java
@@ -17,6 +17,7 @@ import java.io.IOException;
 import javax.inject.Inject;
 import org.tasks.BuildConfig;
 import org.tasks.DebugNetworkInterceptor;
+import org.tasks.gtasks.GoogleAccountManager;
 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.Preferences;
 import timber.log.Timber;
@@ -30,6 +31,7 @@ import timber.log.Timber;
 public class GtasksInvoker {
 
   private final Context context;
+  private final GoogleAccountManager googleAccountManager;
   private final Preferences preferences;
   private final DebugNetworkInterceptor interceptor;
   private final String account;
@@ -39,29 +41,31 @@ public class GtasksInvoker {
   @Inject
   public GtasksInvoker(
       @ForApplication Context context,
-      HttpCredentialsAdapter credentialsAdapter,
+      GoogleAccountManager googleAccountManager,
       Preferences preferences,
       DebugNetworkInterceptor interceptor) {
     this.context = context;
-    this.credentialsAdapter = credentialsAdapter;
+    this.googleAccountManager = googleAccountManager;
     this.preferences = preferences;
     this.interceptor = interceptor;
     account = null;
     service = null;
+    credentialsAdapter = null;
   }
 
   private GtasksInvoker(
       Context context,
-      HttpCredentialsAdapter credentialsAdapter,
+      GoogleAccountManager googleAccountManager,
       Preferences preferences,
       DebugNetworkInterceptor interceptor,
       String account) {
     this.context = context;
-    this.credentialsAdapter = credentialsAdapter;
+    this.googleAccountManager = googleAccountManager;
     this.preferences = preferences;
     this.interceptor = interceptor;
     this.account = account;
 
+    credentialsAdapter = new HttpCredentialsAdapter(googleAccountManager);
     service =
         new Tasks.Builder(new NetHttpTransport(), new JacksonFactory(), credentialsAdapter)
             .setApplicationName(String.format("Tasks/%s", BuildConfig.VERSION_NAME))
@@ -69,7 +73,7 @@ public class GtasksInvoker {
   }
 
   public GtasksInvoker forAccount(String account) {
-    return new GtasksInvoker(context, credentialsAdapter, preferences, interceptor, account);
+    return new GtasksInvoker(context, googleAccountManager, preferences, interceptor, account);
   }
 
   public @Nullable TaskLists allGtaskLists(@Nullable String pageToken) throws IOException {
diff --git a/fastlane/metadata/android/en-US/changelogs/713.txt b/fastlane/metadata/android/en-US/changelogs/713.txt
new file mode 100644
index 000000000..5b36a2871
--- /dev/null
+++ b/fastlane/metadata/android/en-US/changelogs/713.txt
@@ -0,0 +1,3 @@
+* Fix multi-account Google Task synchronization
+
+Full release notes: https://tasks.org/changelog