From 0c0d353dc9b41542d7c5b3fcca4337f025b7f8aa Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 2 Mar 2016 14:03:58 -0600
Subject: [PATCH] RequestLogin whenever enabling google task sync

---
 .../java/com/todoroo/astrid/gtasks/GtasksPreferences.java      | 3 ---
 .../com/todoroo/astrid/gtasks/GtasksPreferenceService.java     | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java
index 076e2fcb6..409867c29 100644
--- a/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java
+++ b/src/googleplay/java/com/todoroo/astrid/gtasks/GtasksPreferences.java
@@ -44,9 +44,6 @@ public class GtasksPreferences extends InjectingPreferenceActivity {
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 if ((boolean) newValue) {
-                    if (gtasksPreferenceService.isLoggedIn()) {
-                        return true;
-                    }
                     if (permissionRequestor.requestAccountPermissions()) {
                         requestLogin();
                     }
diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
index 4fa5077ef..2058f4ce2 100644
--- a/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
+++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksPreferenceService.java
@@ -68,6 +68,7 @@ public class GtasksPreferenceService {
      */
     public boolean isLoggedIn() {
         return context.getResources().getBoolean(R.bool.sync_enabled) &&
+                preferences.getBoolean(R.string.sync_gtasks, false) &&
                 preferences.getStringValue(PREF_USER_NAME) != null &&
                 permissionChecker.canAccessAccounts();
     }