Cleaned up some debug code

astrid/plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java

@@ -1,5 +1,7 @@
 package com.todoroo.astrid.tags;
 
+import android.util.Log;
+
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
@@ -14,6 +16,7 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.TaskToTag;
 import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.service.TagDataService;
+import com.todoroo.astrid.utility.Constants;
 
 public class TagsTableMigrator {
 
@@ -27,6 +30,7 @@ public class TagsTableMigrator {
         DependencyInjectionService.getInstance().inject(this);
     }
 
+    @SuppressWarnings("nls")
     public void migrateTagMetadataToTable() {
         if (Preferences.getBoolean(PREF_MIGRATED_TASKS_TO_TAGS, false))
             return;
@@ -36,14 +40,14 @@ public class TagsTableMigrator {
                 MetadataCriteria.withKey(TagService.KEY),
                 Criterion.not(TagService.TAG.in(Query.select(TagData.NAME).from(TagData.TABLE))))).groupBy(TagService.TAG);
 
-        System.err.println("QUERY1 " + noTagDataQuery.toString());
         TodorooCursor<Metadata> noTagData = metadataService.query(noTagDataQuery);
         try {
             Metadata tag = new Metadata();
             for (noTagData.moveToFirst(); !noTagData.isAfterLast(); noTagData.moveToNext()) {
                 tag.readFromCursor(noTagData);
 
-                System.err.println("CREATING TAG DATA " + tag.getValue(TagService.TAG));
+                if (Constants.DEBUG)
+                    Log.w("tag-link-migrate", "CREATING TAG DATA " + tag.getValue(TagService.TAG));
 
                 TagData newTagData = new TagData();
                 newTagData.setValue(TagData.NAME, tag.getValue(TagService.TAG));
@@ -58,8 +62,6 @@ public class TagsTableMigrator {
                 .join(Join.left(TagData.TABLE,
                         Criterion.and(MetadataCriteria.withKey(TagService.KEY), TagService.TAG.eq(TagData.NAME))));
 
-        System.err.println("QUERY2 " + joinedTagData.toString());
-
         TodorooCursor<Metadata> allTagLinks = metadataService.query(joinedTagData);
         try {
             Metadata tag = new Metadata();
@@ -68,7 +70,10 @@ public class TagsTableMigrator {
 
                 // Create new tag links
                 TaskToTag link = new TaskToTag();
-                System.err.println("LINK from task " + tag.getValue(Metadata.TASK) + " to " + tag.getValue(TagService.TAG));
+
+                if (Constants.DEBUG)
+                    Log.w("tag-link-migrate", "LINK FROM TASK " + tag.getValue(Metadata.TASK) + " TO TAG " + tag.getValue(TagService.TAG));
+
                 link.setValue(TaskToTag.TASK_ID, tag.getValue(Metadata.TASK));
                 link.setValue(TaskToTag.TAG_ID, tag.getValue(TagData.ID));
 

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

@@ -147,7 +147,6 @@ public class TaskListActivity extends AstridActivity implements MainMenuListener
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         ThemeService.applyTheme(this);
-        AndroidUtilities.copyDatabases(this, "/sdcard/databases");
         super.onCreate(savedInstanceState);
         DependencyInjectionService.getInstance().inject(this);
 

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

@@ -31,6 +31,7 @@ import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.activity.Eula;
 import com.todoroo.astrid.api.AstridApiConstants;
+import com.todoroo.astrid.backup.TasksXmlExporter;
 import com.todoroo.astrid.core.SortHelper;
 import com.todoroo.astrid.dao.Database;
 import com.todoroo.astrid.data.Metadata;
@@ -179,7 +180,7 @@ public final class UpgradeService {
             public void run() {
                 try {
                     // NOTE: This line should be uncommented whenever any new version requires a data migration
-                    // TasksXmlExporter.exportTasks(context, TasksXmlExporter.ExportType.EXPORT_TYPE_ON_UPGRADE, null, null, lastSetVersionName);
+                    TasksXmlExporter.exportTasks(context, TasksXmlExporter.ExportType.EXPORT_TYPE_ON_UPGRADE, null, null, lastSetVersionName);
 
                     if(from < V3_0_0)
                         new Astrid2To3UpgradeHelper().upgrade2To3(context, from);
@@ -196,7 +197,8 @@ public final class UpgradeService {
                     if (from < V4_0_6)
                         new DueDateTimeMigrator().migrateDueTimes();
 
-                    new TagsTableMigrator().migrateTagMetadataToTable();
+                    if (from < V4_4_0)
+                        new TagsTableMigrator().migrateTagMetadataToTable();
 
                 } finally {
                     DialogUtilities.dismissDialog((Activity)context, dialog);