Fix for login later not showing in walkthrough

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java

@@ -238,6 +238,9 @@ public class ActFmLoginActivity extends FragmentActivity implements AuthListener
 
         errors = (TextView) findViewById(R.id.error);
         LoginButton loginButton = (LoginButton) findViewById(R.id.fb_login);
+        if(loginButton == null)
+            return;
+
         loginButton.init(this, facebook, this, new String[] { "email",
                 "offline_access", "publish_stream" });
 

astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java

@@ -70,24 +70,18 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                 position == mAdapter.getCount()-1 ? View.GONE : View.VISIBLE);
 
         if(currentPage == mAdapter.getCount()-1) {
-            OnClickListener done = new OnClickListener() {
-                @Override
-                public void onClick(View arg0) {
-                    finish();
-                }
-            };
-            currentView.findViewById(R.id.welcome_walkthrough_title).setOnClickListener(done);
-            currentView.findViewById(R.id.welcome_walkthrough_image).setOnClickListener(done);
-        }
-    }
-
-    @Override
-    protected void initializeUI() {
-        if(mAdapter == null)
-            return;
-        if(currentPage == mAdapter.getCount()-1 && findViewById(R.id.fb_login) != null) {
-                super.initializeUI();
+            if(findViewById(R.id.fb_login) != null) {
                 setupLoginLater();
+            } else {
+                OnClickListener done = new OnClickListener() {
+                    @Override
+                    public void onClick(View arg0) {
+                        finish();
+                    }
+                };
+                currentView.findViewById(R.id.welcome_walkthrough_title).setOnClickListener(done);
+                currentView.findViewById(R.id.welcome_walkthrough_image).setOnClickListener(done);
+            }
         }
     }