From c1f0f36a17b924d2e0c8ab04d48d75fc64ada5ff Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Tue, 11 Sep 2012 14:39:03 -0700
Subject: [PATCH] Save temporary debug changes

---
 astrid/AndroidManifest.xml                                    | 4 ++--
 .../plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java | 3 +++
 astrid/src/com/todoroo/astrid/activity/TaskListActivity.java  | 1 +
 astrid/src/com/todoroo/astrid/service/UpgradeService.java     | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index f1f156946..b403c0895 100644
--- a/astrid/AndroidManifest.xml
+++ b/astrid/AndroidManifest.xml
@@ -6,8 +6,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="4.3.4"
-          android:versionCode="282">
+          android:versionName="4.4.0-beta"
+          android:versionCode="285">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java
index 31120093e..1b374a3f0 100644
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsTableMigrator.java
@@ -36,6 +36,7 @@ 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();
@@ -57,6 +58,8 @@ 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();
diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
index e41e4a68d..9f0b765af 100644
--- a/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
@@ -147,6 +147,7 @@ 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);
 
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 8d16329a2..34d2785d6 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -47,6 +47,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V4_4_0 = 285;
     public static final int V4_3_4 = 282;
     public static final int V4_3_3 = 281;
     public static final int V4_3_2 = 280;