restored account getting class

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksPreferences.java

@@ -1,15 +1,10 @@
 package com.todoroo.astrid.gtasks;
 
-import android.content.Intent;
-import android.os.Build;
 import android.os.Bundle;
 
-import com.google.android.googlelogin.GoogleLoginServiceConstants;
-import com.google.android.googlelogin.GoogleLoginServiceHelper;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
-import com.todoroo.astrid.gtasks.auth.ModernAuthManager;
 import com.todoroo.astrid.gtasks.sync.GtasksSyncProvider;
 import com.todoroo.astrid.sync.SyncProviderPreferences;
 import com.todoroo.astrid.sync.SyncProviderUtilities;
@@ -25,8 +20,6 @@ public class GtasksPreferences extends SyncProviderPreferences {
 
     @Autowired private GtasksPreferenceService gtasksPreferenceService;
 
-    private static final int REQUEST_CODE_GOOGLE = 1;
-
     public GtasksPreferences() {
         super();
         DependencyInjectionService.getInstance().inject(this);
@@ -37,15 +30,6 @@ public class GtasksPreferences extends SyncProviderPreferences {
         super.onCreate(savedInstanceState);
     }
 
-    @Override
-    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-        if(requestCode == REQUEST_CODE_GOOGLE){
-            String accounts[] = data.getExtras().getStringArray(GoogleLoginServiceConstants.ACCOUNTS_KEY);
-            credentialsListener.getCredentials(accounts);
-        }
-    }
-
     @Override
     public int getPreferenceResource() {
         return R.xml.preferences_gtasks;
@@ -67,18 +51,4 @@ public class GtasksPreferences extends SyncProviderPreferences {
         return gtasksPreferenceService;
     }
 
-    public interface OnGetCredentials {
-        public void getCredentials(String[] accounts);
-    }
-
-    private OnGetCredentials credentialsListener;
-
-    public void getCredentials(OnGetCredentials onGetCredentials) {
-        credentialsListener = onGetCredentials;
-        if(Integer.parseInt(Build.VERSION.SDK) >= 7)
-            credentialsListener.getCredentials(ModernAuthManager.getAccounts(this));
-        else
-            GoogleLoginServiceHelper.getAccount(this, REQUEST_CODE_GOOGLE, false);
-    }
-
 }

astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java

@@ -26,6 +26,7 @@ import org.json.JSONException;
 import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.Editable;
 import android.util.Log;
@@ -36,6 +37,8 @@ import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.TextView;
 
+import com.google.android.googlelogin.GoogleLoginServiceConstants;
+import com.google.android.googlelogin.GoogleLoginServiceHelper;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.ContextManager;
@@ -95,6 +98,15 @@ public class GtasksLoginActivity extends Activity {
             }
 
         });
+
+        getCredentials(new OnGetCredentials() {
+            @Override
+            public void getCredentials(String[] accounts) {
+                if(accounts != null && accounts.length > 0)
+                    emailEditText.setText(accounts[0]);
+            }
+        });
+
     }
 
 
@@ -167,4 +179,31 @@ public class GtasksLoginActivity extends Activity {
         StatisticsService.sessionStop(this);
     }
 
+    // --- account management
+
+
+    private static final int REQUEST_CODE_GOOGLE = 1;
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        if(requestCode == REQUEST_CODE_GOOGLE){
+            String accounts[] = data.getExtras().getStringArray(GoogleLoginServiceConstants.ACCOUNTS_KEY);
+            credentialsListener.getCredentials(accounts);
+        }
+    }
+    public interface OnGetCredentials {
+        public void getCredentials(String[] accounts);
+    }
+
+    private OnGetCredentials credentialsListener;
+
+    public void getCredentials(OnGetCredentials onGetCredentials) {
+        credentialsListener = onGetCredentials;
+        if(Integer.parseInt(Build.VERSION.SDK) >= 7)
+            credentialsListener.getCredentials(ModernAuthManager.getAccounts(this));
+        else
+            GoogleLoginServiceHelper.getAccount(this, REQUEST_CODE_GOOGLE, false);
+    }
+
 }