From 2950307dc8f7145032341fb4284fad5f7c76f09f Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 8 Jan 2013 12:37:49 -0800
Subject: [PATCH] Fixed a crash with the simple login page

---
 .../com/todoroo/astrid/actfm/ActFmLoginActivity.java   |  2 +-
 astrid/res/layout/welcome_walkthrough_simple_login.xml | 10 ++++++++++
 .../astrid/welcome/tutorial/WelcomeWalkthrough.java    |  2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
index b632c4c0c..66311dd59 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@@ -95,7 +95,7 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
 
     private Facebook facebook;
     private AsyncFacebookRunner facebookRunner;
-    private TextView errors;
+    protected TextView errors;
 
     public static final String SHOW_TOAST = "show_toast"; //$NON-NLS-1$
 
diff --git a/astrid/res/layout/welcome_walkthrough_simple_login.xml b/astrid/res/layout/welcome_walkthrough_simple_login.xml
index 9c16e55f1..ecd69cc33 100644
--- a/astrid/res/layout/welcome_walkthrough_simple_login.xml
+++ b/astrid/res/layout/welcome_walkthrough_simple_login.xml
@@ -31,5 +31,15 @@
         android:layout_marginBottom="70dip"
         android:textSize="16sp"
         android:textColor="@android:color/white"/>
+    
+    <TextView
+      android:id="@+id/error"
+      android:layout_width="fill_parent"
+      android:layout_height="45dip"
+      android:gravity="center"
+      android:visibility="gone"
+      android:textColor="#ff0000"
+      android:textSize="16sp"
+      android:textStyle="bold" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
index f26129003..41df09096 100644
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@@ -157,6 +157,8 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                 switchToLoginPage();
             }
         });
+
+        errors = (TextView) findViewById(R.id.error);
     }
 
     private void onAuthTokenSuccess(final String email, final String authToken) {