From d09987bbfdfb031ffbfe3cad5b97e330045d969c Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 1 Nov 2012 15:32:56 -0700
Subject: [PATCH] Restart launching activity after upgrade

---
 .../todoroo/astrid/subtasks/SubtasksMetadataMigration.java    | 2 --
 .../com/todoroo/astrid/subtasks/SubtasksUpdater.java          | 3 ---
 astrid/src/com/todoroo/astrid/activity/TaskListActivity.java  | 2 ++
 astrid/src/com/todoroo/astrid/service/UpgradeService.java     | 4 +++-
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
index 8611bd533..8bb942e55 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java
@@ -77,7 +77,6 @@ public class SubtasksMetadataMigration {
                 td.setValue(TagData.TAG_ORDERING, newTree);
                 tagDataService.save(td);
             } else {
-                Log.e("MIGRATION", "WRITE SERIALIZATION: " + newTree, new Throwable());
                 Preferences.setString(SubtasksUpdater.ACTIVE_TASKS_ORDER, newTree);
             }
         }
@@ -102,7 +101,6 @@ public class SubtasksMetadataMigration {
             Node parent = findNextParentForIndent(root, indent);
             Node newNode = new Node(item.getValue(Metadata.TASK), parent, parent.indent + 1);
             parent.children.add(newNode);
-            System.err.println("INDENT FOR " + title + ": " + indent);
         }
 
         try {
diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
index 32f96572d..7cf2c523f 100644
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java
@@ -5,8 +5,6 @@
  */
 package com.todoroo.astrid.subtasks;
 
-import android.util.Log;
-
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.sql.Criterion;
 import com.todoroo.andlib.utility.Preferences;
@@ -62,7 +60,6 @@ public class SubtasksUpdater extends AstridOrderedListUpdater<TagData> {
     @Override
     protected void writeSerialization(TagData list, String serialized) {
         if (list == null) {
-            Log.e("SUBTASKS", "WRITE SERIALIZATION: " + serialized, new Throwable());
             Preferences.setString(ACTIVE_TASKS_ORDER, serialized);
         } else {
             list.setValue(TagData.TAG_ORDERING, serialized);
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index 85c8e22f6..72b94eb93 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -95,6 +95,8 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     public static final int FILTER_MODE_PEOPLE = 1;
     public static final int FILTER_MODE_FEATURED = 2;
 
+    public static final int REQUEST_CODE_RESTART = 10;
+
     @Autowired private ABTestEventReportingService abTestEventReportingService;
 
     private View listsNav;
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index f9df9c850..0787ce85e 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -30,6 +30,7 @@ import com.todoroo.andlib.utility.DateUtilities;
 import com.todoroo.andlib.utility.DialogUtilities;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
+import com.todoroo.astrid.activity.AstridActivity;
 import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.api.AstridApiConstants;
 import com.todoroo.astrid.core.SortHelper;
@@ -179,7 +180,7 @@ public final class UpgradeService {
         if(from < maxWithUpgrade) {
             Intent upgrade = new Intent(context, UpgradeActivity.class);
             upgrade.putExtra(UpgradeActivity.TOKEN_FROM_VERSION, from);
-            context.startActivity(upgrade);
+            context.startActivityForResult(upgrade, 0);
         }
     }
 
@@ -224,6 +225,7 @@ public final class UpgradeService {
                         } finally {
                             DialogUtilities.dismissDialog(UpgradeActivity.this, dialog);
                             sendBroadcast(new Intent(AstridApiConstants.BROADCAST_EVENT_REFRESH));
+                            setResult(AstridActivity.RESULT_RESTART_ACTIVITY);
                             finish();
                         }
                     };