From 7f5028c40d56873862ee10c3f113f705138dbeac Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Fri, 22 Oct 2010 02:18:39 -0700
Subject: [PATCH] Adding new gtasks login activity for logging in

---
 astrid/AndroidManifest.xml                    |   2 +
 astrid/libs/todoroo-g.jar                     | Bin 31172 -> 31313 bytes
 .../gtasks/auth/GtasksLoginActivity.java      | 159 ++++++++++++++++++
 .../gtasks/sync/GtasksSyncProvider.java       |  65 +------
 astrid/res/drawable/gtasks_logo.png           | Bin 0 -> 6711 bytes
 astrid/res/layout/gtasks_login_activity.xml   |  59 +++++++
 astrid/res/values/strings-gtasks.xml          |  52 +++---
 astrid/res/values/styles.xml                  |   4 +
 8 files changed, 256 insertions(+), 85 deletions(-)
 create mode 100644 astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
 create mode 100644 astrid/res/drawable/gtasks_logo.png
 create mode 100644 astrid/res/layout/gtasks_login_activity.xml

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index a5ff91bfa..2889818e0 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -253,6 +253,8 @@
         <category android:name="android.intent.category.DEFAULT" />
       </intent-filter>
     </activity>
+    <activity android:name="com.todoroo.astrid.gtasks.auth.GtasksLoginActivity" 
+              android:theme="@style/White"/>
     <receiver android:name="com.todoroo.astrid.gtasks.GtasksFilterExposer">
       <intent-filter>
         <action android:name="com.todoroo.astrid.REQUEST_FILTERS" />
diff --git a/astrid/libs/todoroo-g.jar b/astrid/libs/todoroo-g.jar
index f89c99c7744262bbcd8c683336fd44c6b31719c5..2269e89f93b1e82845cf491639ac08f54f1839ce 100644
GIT binary patch
delta 4955
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

delta 4823
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
It{;Q{0Y%dTbpQYW

diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
new file mode 100644
index 000000000..3d33c48cd
--- /dev/null
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@@ -0,0 +1,159 @@
+/*
+ * ASTRID: Android's Simple Task Recording Dashboard
+ *
+ * Copyright (c) 2009 Tim Su
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+package com.todoroo.astrid.gtasks.auth;
+
+import java.io.IOException;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.os.Bundle;
+import android.text.Editable;
+import android.util.Log;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
+
+import com.timsu.astrid.R;
+import com.todoroo.andlib.service.Autowired;
+import com.todoroo.andlib.service.ContextManager;
+import com.todoroo.andlib.service.DependencyInjectionService;
+import com.todoroo.andlib.utility.DialogUtilities;
+import com.todoroo.astrid.gtasks.GtasksBackgroundService;
+import com.todoroo.astrid.gtasks.GtasksPreferenceService;
+import com.todoroo.astrid.service.StatisticsService;
+import com.todoroo.astrid.sync.SyncBackgroundService;
+import com.todoroo.gtasks.GoogleConnectionManager;
+import com.todoroo.gtasks.GoogleLoginException;
+
+/**
+ * This activity allows users to sign in or log in to Producteev
+ *
+ * @author arne.jans
+ *
+ */
+public class GtasksLoginActivity extends Activity {
+
+    @Autowired private GtasksPreferenceService gtasksPreferenceService;
+
+    // --- ui initialization
+
+    public GtasksLoginActivity() {
+        super();
+        DependencyInjectionService.getInstance().inject(this);
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        ContextManager.setContext(this);
+
+        setContentView(R.layout.gtasks_login_activity);
+        setTitle(R.string.gtasks_GLA_title);
+
+        final TextView errors = (TextView) findViewById(R.id.error);
+        final EditText emailEditText = (EditText) findViewById(R.id.email);
+        final EditText passwordEditText = (EditText) findViewById(R.id.password);
+        final CheckBox isDomain = (CheckBox) findViewById(R.id.isDomain);
+
+        Button signIn = (Button) findViewById(R.id.signIn);
+        signIn.setOnClickListener(new OnClickListener() {
+            public void onClick(View v) {
+                errors.setVisibility(View.GONE);
+                Editable email = emailEditText.getText();
+                Editable password = passwordEditText.getText();
+                if(email.length() == 0 || password.length() == 0) {
+                    errors.setVisibility(View.VISIBLE);
+                    errors.setText(R.string.producteev_PLA_errorEmpty);
+                    return;
+                }
+
+                performLogin(email.toString(), password.toString(), isDomain.isChecked());
+            }
+
+        });
+    }
+
+
+    private void performLogin(final String email, final String password, final boolean isDomain) {
+        final ProgressDialog dialog = DialogUtilities.progressDialog(this,
+                getString(R.string.DLG_wait));
+        final TextView errors = (TextView) findViewById(R.id.error);
+        dialog.show();
+        new Thread() {
+            @SuppressWarnings("nls")
+            @Override
+            public void run() {
+                final StringBuilder errorMessage = new StringBuilder();
+                GoogleConnectionManager gcm = new GoogleConnectionManager(email.toString(),
+                        password.toString(), !isDomain);
+                try {
+                    gcm.authenticate(false);
+                    String token = gcm.getToken();
+                    gtasksPreferenceService.setToken(token);
+                    StatisticsService.reportEvent("gtasks-login");
+                    synchronize();
+                } catch (GoogleLoginException e) {
+                    errorMessage.append(getString(R.string.gtasks_GLA_errorAuth));
+                    Log.e("gtasks", "login", e);
+                    return;
+                } catch (IOException e) {
+                    errorMessage.append(getString(R.string.SyP_ioerror));
+                    Log.e("gtasks", "login", e);
+                } finally {
+                    runOnUiThread(new Runnable() {
+                        public void run() {
+                            dialog.dismiss();
+                            if(errorMessage.length() > 0) {
+                                errors.setVisibility(View.VISIBLE);
+                                errors.setText(errorMessage);
+                            }
+                        }
+                    });
+                }
+            }
+        }.start();
+    }
+
+    /**
+     * Perform synchronization
+     */
+    protected void synchronize() {
+        startService(new Intent(SyncBackgroundService.SYNC_ACTION, null,
+                this, GtasksBackgroundService.class));
+        finish();
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
+        StatisticsService.sessionStart(this);
+    }
+
+    @Override
+    protected void onStop() {
+        super.onStop();
+        StatisticsService.sessionStop(this);
+    }
+
+}
\ No newline at end of file
diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
index e57f09917..28b50d408 100644
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncProvider.java
@@ -15,17 +15,9 @@ import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.DialogInterface.OnClickListener;
 import android.text.TextUtils;
-import android.text.method.PasswordTransformationMethod;
 import android.util.Log;
-import android.widget.EditText;
-import android.widget.LinearLayout;
-import android.widget.ScrollView;
-import android.widget.TextView;
-import android.widget.Toast;
 
 import com.timsu.astrid.R;
 import com.todoroo.andlib.data.AbstractModel;
@@ -50,7 +42,7 @@ import com.todoroo.astrid.gtasks.GtasksMetadataService;
 import com.todoroo.astrid.gtasks.GtasksPreferenceService;
 import com.todoroo.astrid.gtasks.GtasksPreferences;
 import com.todoroo.astrid.gtasks.GtasksTaskListUpdater;
-import com.todoroo.astrid.gtasks.GtasksPreferences.OnGetCredentials;
+import com.todoroo.astrid.gtasks.auth.GtasksLoginActivity;
 import com.todoroo.astrid.service.AstridDependencyInjector;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.sync.SyncBackgroundService;
@@ -188,40 +180,8 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
 
         // check if we have a token & it works
         if(authToken == null) {
-            final GtasksPreferences preferenceActivity = (GtasksPreferences)activity;
-            preferenceActivity.getCredentials(new OnGetCredentials() {
-                @Override
-                public void getCredentials(String[] accounts) {
-                    ScrollView layoutScroller = new ScrollView(activity);
-                    LinearLayout layout = new LinearLayout(activity);
-                    layoutScroller.addView(layout);
-                    layout.setPadding(5, -5, 5, 0);
-                    layout.setOrientation(LinearLayout.VERTICAL);
-                    TextView textView = new TextView(activity);
-                    textView.setText(R.string.producteev_PLA_email);
-                    layout.addView(textView);
-                    final EditText email = new EditText(activity);
-                    if(accounts != null && accounts.length > 0)
-                        email.setText(accounts[0]);
-                    layout.addView(email);
-                    textView = new TextView(activity);
-                    textView.setText(R.string.producteev_PLA_password);
-                    layout.addView(textView);
-                    final EditText password = new EditText(activity);
-                    password.setTransformationMethod(new PasswordTransformationMethod());
-                    layout.addView(password);
-
-                    DialogUtilities.viewDialog(activity,
-                            activity.getString(R.string.gtasks_login), layoutScroller,
-                            new OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface arg0, int arg1) {
-                                    trySynchronizing(activity, email.getText(), password.getText());
-                                }
-
-                            }, null);
-                }
-            });
+            Intent intent = new Intent(activity, GtasksLoginActivity.class);
+            activity.startActivityForResult(intent, 0);
         } else {
             activity.startService(new Intent(SyncBackgroundService.SYNC_ACTION, null,
                 activity, GtasksBackgroundService.class));
@@ -229,25 +189,6 @@ public class GtasksSyncProvider extends SyncProvider<GtasksTaskContainer> {
         }
     }
 
-    private void trySynchronizing(Activity activity, CharSequence email, CharSequence password) {
-        GoogleConnectionManager gcm = new GoogleConnectionManager(email.toString(), password.toString());
-        try {
-            gcm.authenticate(false);
-        } catch (GoogleLoginException e) {
-            Toast.makeText(activity, R.string.gtasks_login_error, Toast.LENGTH_LONG).show();
-            Log.e("gtasks", "login", e);
-            return;
-        } catch (IOException e) {
-            Toast.makeText(activity, R.string.SyP_ioerror, Toast.LENGTH_LONG).show();
-            Log.e("gtasks", "login", e);
-        }
-        String token = gcm.getToken();
-        gtasksPreferenceService.setToken(token);
-        activity.startService(new Intent(SyncBackgroundService.SYNC_ACTION, null,
-            activity, GtasksBackgroundService.class));
-        activity.finish();
-    }
-
     // ----------------------------------------------------------------------
     // ----------------------------------------------------- synchronization!
     // ----------------------------------------------------------------------
diff --git a/astrid/res/drawable/gtasks_logo.png b/astrid/res/drawable/gtasks_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..a365ddf14470f1e5733aaa5451643ef840f64e56
GIT binary patch
literal 6711
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
IG8SR~2d#h>6#xJL

literal 0
HcmV?d00001

diff --git a/astrid/res/layout/gtasks_login_activity.xml b/astrid/res/layout/gtasks_login_activity.xml
new file mode 100644
index 000000000..e06f157cc
--- /dev/null
+++ b/astrid/res/layout/gtasks_login_activity.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:layout_width="fill_parent"
+  android:layout_height="fill_parent"
+  android:background="#ffffff">
+  <LinearLayout
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <ImageView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:paddingTop="5dip"
+      android:paddingBottom="5dip"
+      android:scaleType="fitCenter"
+      android:src="@drawable/gtasks_logo" />
+    <TextView
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center"
+      android:paddingBottom="10dip"
+      android:textSize="16sp"
+      android:text="@string/gtasks_GLA_body" />
+    <TextView
+      android:id="@+id/error"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:gravity="center_horizontal"
+      android:paddingBottom="20dip"
+      android:textColor="#ff0000"
+      android:textSize="16sp"
+      android:textStyle="bold"
+      android:visibility="gone" />
+    <EditText
+      android:id="@+id/email"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:hint="@string/gtasks_GLA_email"
+      android:inputType="textEmailAddress" />
+    <EditText
+      android:id="@+id/password"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:hint="@string/gtasks_GLA_password"
+      android:inputType="textPassword" />
+    <CheckBox
+      android:id="@+id/isDomain"
+      android:layout_height="wrap_content"
+      android:layout_width="fill_parent"
+      android:text="@string/gtasks_GLA_domain" />
+    <Button
+      android:id="@+id/signIn"
+      android:layout_width="fill_parent"
+      android:layout_height="wrap_content"
+      android:layout_weight="1"
+      android:text="@string/gtasks_GLA_signIn" />
+  </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/astrid/res/values/strings-gtasks.xml b/astrid/res/values/strings-gtasks.xml
index 1371c9006..df4ac5150 100644
--- a/astrid/res/values/strings-gtasks.xml
+++ b/astrid/res/values/strings-gtasks.xml
@@ -2,7 +2,7 @@
 <!-- See the file "LICENSE" for the full license governing this code. -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- =========================================================== UI == -->
+    <!-- ============================================================= UI == -->
 
     <!-- filters header: GTasks -->
     <string name="gtasks_FEx_header">Google Tasks</string>
@@ -13,6 +13,33 @@
     <!-- filter title for GTasks lists (%s => list name) -->
     <string name="gtasks_FEx_title">Google Tasks: %s</string>
         
+    <!-- ============================================ GtasksLoginActivity == -->
+    
+    <!-- Activity Title: Gtasks Login -->    
+    <string name="gtasks_GLA_title">Log In to Google Tasks</string>
+
+    <!-- Instructions: Gtasks login -->    
+    <string name="gtasks_GLA_body">Please log in to Google Tasks. Astrid will
+    not store your password anywhere.</string>
+
+    <!-- Sign In Button -->    
+    <string name="gtasks_GLA_signIn">Sign In</string>
+
+    <!-- E-mail Address Label -->    
+    <string name="gtasks_GLA_email">E-mail</string>
+
+    <!-- Password Label -->    
+    <string name="gtasks_GLA_password">Password</string>
+    
+    <!-- Google Apps for Domain checkbox -->
+    <string name="gtasks_GLA_domain">Google Apps for Domain account</string>
+
+    <!-- Error Message when fields aren't filled out -->    
+    <string name="gtasks_GLA_errorEmpty">Error: fill out all fields!</string>
+
+    <!-- Error Message when we receive a HTTP 401 Unauthorized -->    
+    <string name="gtasks_GLA_errorAuth">Error: e-mail or password incorrect!</string>
+        
     <!-- ============================================== GtasksPreferences == -->
 
     <!-- GTasks Preferences Title -->    
@@ -22,27 +49,6 @@
     
     <!-- title for notification tray when synchronizing -->
     <string name="gtasks_notification_title">Astrid: Google Tasks</string>
-    
-    <!-- title for picking a google account -->
-    <string name="choose_account_title">Choose Account</string>
-    
-    <!-- title for no google accounts found -->
-    <string name="no_account_found_title">No Accounts Found</string>
-    
-    <!-- message body for no google accounts found -->
-    <string name="no_account_found">We were unable to find a Google account on this phone. You will not be able to synchronize to Google Tasks without one!</string>
-    
-    <!-- E-mail Address Label -->    
-    <string name="gtasks_email">E-mail</string>
-
-    <!-- Password Label -->    
-    <string name="gtasks_password">Password</string>
-
-    <!-- Login Message -->    
-    <string name="gtasks_login">Google Account:</string>
-
-    <!-- Login Message when Error -->    
-    <string name="gtasks_login_error">Please try your e-mail and password again.</string>
-    
+        
 </resources>
 
diff --git a/astrid/res/values/styles.xml b/astrid/res/values/styles.xml
index 2a5da3701..dcea90ae0 100644
--- a/astrid/res/values/styles.xml
+++ b/astrid/res/values/styles.xml
@@ -16,6 +16,10 @@
         <item name="android:windowBackground">@null</item>
     </style>
     
+    <style name="White" parent="android:Theme.Light">
+        <item name="android:windowBackground">@null</item>
+    </style>
+    
     <!--=============================================== TaskListActivity == -->
     
     <style name="TextAppearance.TLA_NoItems">