Updated upgrade message and version bump

astrid/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.timsu.astrid"
-          android:versionName="3.5.0" 
+          android:versionName="3.5.0 (Google Tasks sync beta, fixes for force close issues)" 
-          android:versionCode="164">
+          android:versionCode="165">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->

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

@@ -18,6 +18,7 @@ import com.todoroo.astrid.dao.Database;
 
 public final class UpgradeService {
 
+    public static final int V3_5_0 = 165;
     public static final int V3_4_0 = 162;
     public static final int V3_3_0 = 155;
     public static final int V3_2_0 = 147;
@@ -96,8 +97,8 @@ public final class UpgradeService {
 
         StringBuilder changeLog = new StringBuilder();
 
-        if(from <= V2_14_4)
+        if(from <= V2_14_4) {
-            newVersionString(changeLog, "3.3.0 (9/12/10)", new String[] {
+            newVersionString(changeLog, "3.5.0 (10/25/10)", new String[] {
                     "Astrid is brand new inside and out! In addition to a new " +
                     "look and feel, a new add-on system allows Astrid to become " +
                     "more powerful, while other improvements have made it faster " +
@@ -105,11 +106,13 @@ public final class UpgradeService {
                     "If you liked the old version, you can also go back by " +
                     "<a href='http://bit.ly/oldastrid'>clicking here</a>",
             });
-        newVersionString(changeLog, "3.5.0 beta", new String[] {
+        } else {
-                "Google Tasks (experimental!)",
+            newVersionString(changeLog, "3.5.0", new String[] {
-                "Power Pack 4x2 and 4x4 Widgets (beta!)",
+                    "Google Tasks Sync (beta!)",
+                    "Bug fix with RMilk & new tasks not getting synced",
+                    "Fixed Force Closes and other bugs",
             });
-        if(from >= V3_3_0)
+            if(from >= V3_3_0 && from < V3_4_0)
                 newVersionString(changeLog, "3.4.0 (10/08/10)", new String[] {
                         "End User License Agreement",
                         "Option to disable usage statistics",
@@ -142,6 +145,7 @@ public final class UpgradeService {
                         "FROYO: disabled moving app to SD card, it would break alarms and widget",
                         "Also gone: a couple force closes, bugs with repeating tasks",
                 });
+        }
 
         if(changeLog.length() == 0)
             return;