Moved display logic for upgrade message into the TaskListActivity so it actually shows up.

api/src/com/todoroo/andlib/utility/Preferences.java

@@ -268,4 +268,15 @@ public class Preferences {
         editor.commit();
     }
 
+    /**
+     * Clears a preference
+     * @param key
+     */
+    public static void clear(String key) {
+        Context context = ContextManager.getContext();
+        Editor editor = getPrefs(context).edit();
+        editor.remove(key);
+        editor.commit();
+    }
+
 }

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

@@ -98,6 +98,7 @@ import com.todoroo.astrid.service.StartupService;
 import com.todoroo.astrid.service.StatisticsService;
 import com.todoroo.astrid.service.TaskService;
 import com.todoroo.astrid.service.ThemeService;
+import com.todoroo.astrid.service.UpgradeService;
 import com.todoroo.astrid.utility.AstridPreferences;
 import com.todoroo.astrid.utility.Constants;
 import com.todoroo.astrid.utility.Flags;
@@ -162,6 +163,8 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
 
     @Autowired AddOnService addOnService;
 
+    @Autowired UpgradeService upgradeService;
+
     private final TaskContextActionExposer[] contextItemExposers = new TaskContextActionExposer[] {
             new ReminderDebugContextActions.MakeNotification(),
             new ReminderDebugContextActions.WhenReminder(),
@@ -227,6 +230,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
         setUpUiComponents();
         onNewIntent(getIntent());
 
+        if(Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1) > -1)
+            upgradeService.showChangeLog(this, Preferences.getInt(AstridPreferences.P_UPGRADE_FROM, -1));
+
         if (!Preferences.getBoolean(R.string.p_showed_add_task_help, false)) {
             HelpInfoPopover.showPopover(TaskListActivity.this, quickAddBox, R.string.help_popover_add_task);
             Preferences.setBoolean(R.string.p_showed_add_task_help, true);

astrid/src/com/todoroo/astrid/service/StartupService.java

@@ -303,4 +303,5 @@ public class StartupService {
             }
         }
     }
+
 }

astrid/src/com/todoroo/astrid/service/UpgradeService.java

@@ -23,7 +23,6 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.activity.Eula;
-import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.data.Metadata;
@@ -99,6 +98,7 @@ public final class UpgradeService {
         else
             dialog = null;
 
+        Preferences.setInt(AstridPreferences.P_UPGRADE_FROM, from);
         new Thread(new Runnable() {
             @Override
             public void run() {
@@ -110,18 +110,7 @@ public final class UpgradeService {
                         new Astrid2To3UpgradeHelper().upgrade3To3_1(context, from);
 
                 } finally {
-                    if(context instanceof Activity) {
-                        ((Activity)context).runOnUiThread(new Runnable() {
-                            public void run() {
-                                DialogUtilities.dismissDialog((Activity)context, dialog);
-
-                                // display changelog
-                                showChangeLog(context, from);
-                                if(context instanceof TaskListActivity)
-                                    ((TaskListActivity)context).loadTaskListContent(true);
-                            }
-                        });
-                    }
+                    DialogUtilities.dismissDialog((Activity)context, dialog);
                 }
             }
 
@@ -141,6 +130,7 @@ public final class UpgradeService {
         if(!(context instanceof Activity) || from == 0)
             return;
 
+        Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
         // current message
@@ -267,7 +257,7 @@ public final class UpgradeService {
         if(changeLog.length() == 0)
             return;
 
-        changeLog.append("Astrid thinks you are very special!</body></html>");
+        changeLog.append("Go get 'em, tiger!</body></html>");
         String changeLogHtml = "<html><body style='color: white'>" + changeLog;
 
         DialogUtilities.htmlDialog(context, changeLogHtml,

astrid/src/com/todoroo/astrid/utility/AstridPreferences.java

@@ -16,6 +16,8 @@ public class AstridPreferences {
 
     public static final String P_FIRST_ACTION = "fa"; //$NON-NLS-1$
 
+    public static final String P_UPGRADE_FROM = "uf"; //$NON-NLS-1$
+
     /** Set preference defaults, if unset. called at startup */
     public static void setPreferenceDefaults() {
         Context context = ContextManager.getContext();