From b5cba0528854ddd357d2bcb31878032962d06729 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 4 Dec 2012 16:53:42 -0800
Subject: [PATCH] Handle google auth errors on simple login page better

---
 .../welcome/tutorial/WelcomePagerAdapter.java |  2 ++
 .../welcome/tutorial/WelcomeWalkthrough.java  | 23 +++++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
index ac624def8..732b7b424 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomePagerAdapter.java
@@ -75,6 +75,8 @@ public class WelcomePagerAdapter extends PagerAdapter implements TitleProvider
             title[title.length - 1] = R.string.welcome_title_7_return;
             images[images.length - 1] = R.drawable.welcome_walkthrough_1;
             body[body.length - 1] = R.string.welcome_body_7_return;
+        } else {
+            // Setup login page from AB tests
         }
     }
 
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index 373662171..b7b8612bd 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -129,6 +129,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                                             Toast.makeText(WelcomeWalkthrough.this,
                                                     error,
                                                     Toast.LENGTH_LONG).show();
+                                            onAuthError();
                                         }
                                     });
                                 } finally {
@@ -147,17 +148,13 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         rejectQuickLogin.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                mAdapter.changeLoginPage(getLoginPageLayout());
-                mPager.setAdapter(mAdapter);
-                mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
-                initializeUI();
+                switchToLoginPage();
             }
         });
     }
 
     private void onAuthTokenSuccess(final String email, final String authToken) {
         runOnUiThread(new Runnable() {
-
             @Override
             public void run() {
                 authenticate(email, email, "", "google", authToken); //$NON-NLS-1$ //$NON-NLS-2$
@@ -165,6 +162,22 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
         });
     }
 
+    private void onAuthError() {
+        runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                switchToLoginPage();
+            }
+        });
+    }
+
+    private void switchToLoginPage() {
+        mAdapter.changeLoginPage(getLoginPageLayout());
+        mPager.setAdapter(mAdapter);
+        mPager.setCurrentItem(mAdapter.layouts.length - 1, false);
+        initializeUI();
+    }
+
     public void onPageChanged(View view, int position) {
         currentPage = position;
         currentView = view;