Fix Google API credentials

app/src/main/java/com/todoroo/astrid/gtasks/api/GtasksInvoker.java

@@ -4,8 +4,6 @@ import android.accounts.AccountManager;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
 import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.GenericJson;
@@ -16,6 +14,7 @@ import com.google.api.services.tasks.TasksScopes;
 import com.google.api.services.tasks.model.Task;
 import com.google.api.services.tasks.model.TaskList;
 import com.google.api.services.tasks.model.TaskLists;
+import com.google.common.base.Strings;
 import java.io.IOException;
 import org.tasks.BuildConfig;
 import org.tasks.gtasks.GoogleAccountManager;
@@ -31,25 +30,25 @@ public class GtasksInvoker {
 
   private final String account;
   private final GoogleAccountManager googleAccountManager;
-  private Tasks service;
+  private final Tasks service;
-  private GoogleCredential credential;
+  private final GoogleCredential credential = new GoogleCredential();
 
   public GtasksInvoker(String account, GoogleAccountManager googleAccountManager) {
     this.account = account;
     this.googleAccountManager = googleAccountManager;
-    initializeService();
-  }
-
-  private void initializeService() {
-    Bundle bundle = googleAccountManager.getAccessToken(account, TasksScopes.TASKS);
-    String token = bundle.getString(AccountManager.KEY_AUTHTOKEN);
-    credential = new GoogleCredential().setAccessToken(token);
     service =
         new Tasks.Builder(new NetHttpTransport(), new JacksonFactory(), credential)
             .setApplicationName(String.format("Tasks/%s", BuildConfig.VERSION_NAME))
             .build();
   }
 
+  private void checkToken() {
+    if (Strings.isNullOrEmpty(credential.getAccessToken())) {
+      Bundle bundle = googleAccountManager.getAccessToken(account, TasksScopes.TASKS);
+      credential.setAccessToken(bundle.getString(AccountManager.KEY_AUTHTOKEN));
+    }
+  }
+
   public @Nullable TaskLists allGtaskLists(@Nullable String pageToken) throws IOException {
     return execute(service.tasklists().list().setMaxResults(100L).setPageToken(pageToken));
   }
@@ -116,23 +115,21 @@ public class GtasksInvoker {
 
   private synchronized @Nullable <T> T execute(TasksRequest<T> request, boolean retry)
       throws IOException {
-    String caller = getCaller();
+    checkToken();
-    Timber.d("%s request: %s", caller, request);
+    Timber.d("%s request: %s", getCaller(), request);
-    HttpRequest httpRequest = request.buildHttpRequest();
+    T response;
-    HttpResponse httpResponse;
     try {
-      httpResponse = httpRequest.execute();
+      response = request.execute();
     } catch (HttpResponseException e) {
       if (e.getStatusCode() == 401 && !retry) {
         googleAccountManager.invalidateToken(credential.getAccessToken());
-        initializeService();
+        credential.setAccessToken(null);
         return execute(request, true);
       } else {
         throw e;
       }
     }
-    T response = httpResponse.parseAs(request.getResponseClass());
+    Timber.d("%s response: %s", getCaller(), prettyPrint(response));
-    Timber.d("%s response: %s", caller, prettyPrint(response));
     return response;
   }
 

app/src/main/java/org/tasks/drive/DriveInvoker.java

@@ -1,17 +1,20 @@
 package org.tasks.drive;
 
+import android.accounts.AccountManager;
 import android.content.Context;
 import android.net.Uri;
-import com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential;
+import android.os.Bundle;
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.HttpResponseException;
 import com.google.api.client.http.InputStreamContent;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.jackson2.JacksonFactory;
-import com.google.api.client.util.ExponentialBackOff;
 import com.google.api.services.drive.Drive;
 import com.google.api.services.drive.DriveRequest;
 import com.google.api.services.drive.DriveScopes;
 import com.google.api.services.drive.model.File;
+import com.google.common.base.Strings;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
@@ -19,6 +22,7 @@ import javax.inject.Inject;
 import org.tasks.BuildConfig;
 import org.tasks.R;
 import org.tasks.files.FileHelper;
+import org.tasks.gtasks.GoogleAccountManager;
 import org.tasks.injection.ForApplication;
 import org.tasks.preferences.Preferences;
 import timber.log.Timber;
@@ -27,25 +31,31 @@ public class DriveInvoker {
 
   private static final String MIME_FOLDER = "application/vnd.google-apps.folder";
 
-  private final Drive service;
   private final Context context;
+  private final Preferences preferences;
+  private final GoogleAccountManager googleAccountManager;
+  private final Drive service;
+  private final GoogleCredential credential = new GoogleCredential();
 
   @Inject
-  public DriveInvoker(@ForApplication Context context, Preferences preferences) {
+  public DriveInvoker(
+      @ForApplication Context context,
+      Preferences preferences,
+      GoogleAccountManager googleAccountManager) {
     this.context = context;
-    if (preferences.getBoolean(R.string.p_google_drive_backup, false)) {
+    this.preferences = preferences;
-      GoogleAccountCredential credential =
+    this.googleAccountManager = googleAccountManager;
-          GoogleAccountCredential.usingOAuth2(
-                  context, Collections.singletonList(DriveScopes.DRIVE_FILE))
-              .setBackOff(new ExponentialBackOff.Builder().build())
-              .setSelectedAccountName(
-                  preferences.getStringValue(R.string.p_google_drive_backup_account));
     service =
         new Drive.Builder(new NetHttpTransport(), new JacksonFactory(), credential)
             .setApplicationName(String.format("Tasks/%s", BuildConfig.VERSION_NAME))
             .build();
-    } else {
+  }
-      service = null;
+
+  private void checkToken() {
+    if (Strings.isNullOrEmpty(credential.getAccessToken())) {
+      String account = preferences.getStringValue(R.string.p_google_drive_backup_account);
+      Bundle bundle = googleAccountManager.getAccessToken(account, DriveScopes.DRIVE_FILE);
+      credential.setAccessToken(bundle.getString(AccountManager.KEY_AUTHTOKEN));
     }
   }
 
@@ -91,10 +101,25 @@ public class DriveInvoker {
   }
 
   private synchronized <T> T execute(DriveRequest<T> request) throws IOException {
-    String caller = getCaller();
+    return execute(request, false);
-    Timber.d("%s request: %s", caller, request);
+  }
-    T response = request.execute();
+
-    Timber.d("%s response: %s", caller, prettyPrint(response));
+  private synchronized <T> T execute(DriveRequest<T> request, boolean retry) throws IOException {
+    checkToken();
+    Timber.d("%s request: %s", getCaller(), request);
+    T response;
+    try {
+      response = request.execute();
+    } catch (HttpResponseException e) {
+      if (e.getStatusCode() == 401 && !retry) {
+        googleAccountManager.invalidateToken(credential.getAccessToken());
+        credential.setAccessToken(null);
+        return execute(request, true);
+      } else {
+        throw e;
+      }
+    }
+    Timber.d("%s response: %s", getCaller(), prettyPrint(response));
     return response;
   }