Killed welcome graphic

astrid/AndroidManifest.xml

@@ -73,22 +73,16 @@
     <!-- ====================================================== Activities = -->
         
     <!-- Activity that displays task list -->
-    <activity android:name="com.todoroo.astrid.welcome.SplashScreenLauncher"
-              android:windowSoftInputMode="stateHidden">    
-      <intent-filter>
-        <action android:name="android.intent.action.MAIN" />
-        <category android:name="android.intent.category.LAUNCHER" />
-      </intent-filter>              
-    </activity>
     <activity android:name="com.todoroo.astrid.welcome.WelcomeLogin"
               android:windowSoftInputMode="stateHidden"
               android:screenOrientation="portrait">
     </activity>
-    <activity android:name="com.todoroo.astrid.welcome.WelcomeGraphic"
-              android:windowSoftInputMode="stateHidden">    
-    </activity>
     <activity android:name="com.todoroo.astrid.activity.TaskListActivity"
               android:windowSoftInputMode="stateHidden">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
       <intent-filter>
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />

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

@@ -124,10 +124,6 @@ public class ActFmLoginActivity extends Activity implements AuthListener {
         DependencyInjectionService.getInstance().inject(this);
     }
 
-    protected void finishAndShowNext() {
-        finish();
-    }
-
     @SuppressWarnings("nls")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -464,7 +460,7 @@ public class ActFmLoginActivity extends Activity implements AuthListener {
                 result.optString("picture"));
 
         setResult(RESULT_OK);
-        finishAndShowNext();
+        finish();
 
         if (!noSync) {
             new ActFmSyncProvider().synchronize(ActFmLoginActivity.this);

astrid/src/com/todoroo/astrid/activity/TaskListActivity.java

@@ -109,6 +109,7 @@ import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
 import com.todoroo.astrid.voice.VoiceInputAssistant;
 import com.todoroo.astrid.welcome.HelpInfoPopover;
+import com.todoroo.astrid.welcome.WelcomeLogin;
 import com.todoroo.astrid.widget.TasksWidget;
 
 /**
@@ -576,6 +577,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
                 new IntentFilter(AstridApiConstants.BROADCAST_SEND_SYNC_ACTIONS));
         setUpBackgroundJobs();
 
+        if (!Preferences.getBoolean(WelcomeLogin.KEY_SHOWED_WELCOME_LOGIN, false)) {
+            Intent showWelcomeLogin = new Intent(this, WelcomeLogin.class);
+            startActivity(showWelcomeLogin);
+            Preferences.setBoolean(WelcomeLogin.KEY_SHOWED_WELCOME_LOGIN, true);
+            return;
+        }
+
         if (filter.title.equals(getString(R.string.BFE_Active))) {
             initiateAutomaticSync();
         }

astrid/src/com/todoroo/astrid/welcome/SplashScreenLauncher.java

@@ -1,64 +0,0 @@
-package com.todoroo.astrid.welcome;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.Window;
-
-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.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.service.AstridDependencyInjector;
-import com.todoroo.astrid.service.StartupService;
-import com.todoroo.astrid.service.StatisticsService;
-import com.todoroo.astrid.service.abtesting.ABChooser;
-import com.todoroo.astrid.utility.AstridPreferences;
-
-public class SplashScreenLauncher extends Activity {
-
-    @Autowired ABChooser abChooser;
-
-    static {
-        AstridDependencyInjector.initialize();
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        super.onCreate(savedInstanceState);
-        DependencyInjectionService.getInstance().inject(this);
-        setContentView(R.layout.splash_screen_launcher);
-        int latestSetVersion = AstridPreferences.getCurrentVersion();
-        boolean isNewUser = (latestSetVersion == 0);
-        ContextManager.setContext(this);
-        new StartupService().onStartupApplication(this);
-        StatisticsService.sessionStart(this);
-        finishAndShowNext(isNewUser);
-        StatisticsService.sessionStop(this);
-    }
-
-    private void finishAndShowNext(boolean isNewUser) {
-        if (isNewUser) {
-            welcomeLoginPath();
-        } else {
-            mainActivityPath();
-        }
-    }
-
-    private void welcomeLoginPath() {
-        Intent intent = new Intent();
-        intent.setClass(this, WelcomeLogin.class);
-        startActivity(intent);
-        finish();
-    }
-
-    private void mainActivityPath() {
-        Intent intent = new Intent();
-        intent.setClass(this, TaskListActivity.class); // Go to task list activity
-        startActivity(intent);
-        finish();
-    }
-
-}

astrid/src/com/todoroo/astrid/welcome/WelcomeGraphic.java

@@ -1,103 +0,0 @@
-package com.todoroo.astrid.welcome;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.Window;
-import android.widget.ImageView;
-
-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.AndroidUtilities;
-import com.todoroo.astrid.actfm.sync.ActFmSyncProvider;
-import com.todoroo.astrid.activity.Eula;
-import com.todoroo.astrid.activity.TaskListActivity;
-import com.todoroo.astrid.service.StartupService;
-import com.todoroo.astrid.service.StatisticsService;
-import com.todoroo.astrid.service.abtesting.ABChooser;
-
-public class WelcomeGraphic extends Activity {
-
-    public static final String KEY_SHOW_EULA = "show_eula"; //$NON-NLS-1$
-
-    public static final String START_SYNC = "start_sync"; //$NON-NLS-1$
-
-    @Autowired ABChooser abChooser;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ContextManager.setContext(this);
-        requestWindowFeature(Window.FEATURE_NO_TITLE);
-        DependencyInjectionService.getInstance().inject(this);
-
-        super.onCreate(savedInstanceState);
-        new StartupService().onStartupApplication(this);
-        setContentView(R.layout.welcome_screen);
-
-        if (getIntent().getBooleanExtra(KEY_SHOW_EULA, false))
-            Eula.showEula(this);
-
-
-        final ImageView image = (ImageView)findViewById(R.id.welcome_image);
-        image.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                image.setOnClickListener(null); // Prevent double click
-                new Thread() {
-                    @Override
-                    public void run() {
-                        AndroidUtilities.sleepDeep(1000L);
-                        runOnUiThread(new Runnable() {
-                            @Override
-                            public void run() {
-                                finishAndStartNext();
-                            }
-                        });
-                    }
-                }.start();
-            }
-        });
-
-        if (getIntent().getBooleanExtra(START_SYNC, false))
-            new ActFmSyncProvider().synchronize(this);
-    }
-
-    @Override
-    protected void onPause() {
-        StatisticsService.sessionPause();
-        super.onPause();
-    }
-
-    @Override
-    protected void onStart() {
-        super.onStart();
-    }
-
-    @Override
-    protected void onResume() {
-        super.onResume();
-        StatisticsService.sessionStart(this);
-    }
-
-    @Override
-    protected void onStop() {
-        StatisticsService.sessionStop(this);
-        super.onStop();
-    }
-
-    private void finishAndStartNext() {
-        Intent nextActivity = getNextIntent();
-        startActivity(nextActivity);
-        finish();
-    }
-
-    private Intent getNextIntent() {
-        Intent intent = new Intent();
-        intent.setClass(this, TaskListActivity.class);
-        return intent;
-    }
-}

astrid/src/com/todoroo/astrid/welcome/WelcomeLogin.java

@@ -3,7 +3,6 @@ package com.todoroo.astrid.welcome;
 import org.json.JSONObject;
 
 import android.content.DialogInterface;
-import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
 import android.text.SpannableString;
@@ -20,7 +19,6 @@ import com.facebook.android.AuthListener;
 import com.timsu.astrid.R;
 import com.todoroo.andlib.service.ContextManager;
 import com.todoroo.andlib.utility.DialogUtilities;
-import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.ActFmLoginActivity;
 import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.data.Task;
@@ -51,25 +49,10 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
         requestWindowFeature(Window.FEATURE_NO_TITLE);
         super.onCreate(savedInstanceState);
         ContextManager.setContext(this);
-        if (Preferences.getBoolean(KEY_SHOWED_WELCOME_LOGIN, false)) {
-            finishAndShowNext();
-        }
 
         initializeUI();
     }
 
-    @Override
-    protected void finishAndShowNext() {
-        Intent welcomeScreen = new Intent(this, WelcomeGraphic.class);
-        if (actFmPreferenceService.isLoggedIn()) {
-            welcomeScreen.putExtra(WelcomeGraphic.START_SYNC, true);
-            noSync = true; // For superclass
-        }
-        startActivity(welcomeScreen);
-        finish();
-        Preferences.setBoolean(KEY_SHOWED_WELCOME_LOGIN, true);
-    }
-
     @Override
     protected void initializeUI() {
         findViewById(R.id.gg_login).setOnClickListener(googleListener);
@@ -155,7 +138,7 @@ public class WelcomeLogin extends ActFmLoginActivity implements AuthListener {
         private final DialogInterface.OnClickListener confirmLaterListener = new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
-                finishAndShowNext();
+                finish();
             }
         };
     };