From dbf7d8b6ce5a074b8de1a07fd3e6003c39ce61b4 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Wed, 4 Apr 2012 14:57:24 -0700
Subject: [PATCH] Version bump and upgrade message

---
 astrid/AndroidManifest.xml                    |  4 ++--
 .../astrid/service/UpgradeService.java        | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index 6e34fb61c..c1713497e 100644
--- a/astrid/AndroidManifest.xml
+++ b/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="4.0.6"
-          android:versionCode="262">
+          android:versionName="4.0.6.1"
+          android:versionCode="263">
           
   <!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
   <!--    android:installLocation="internalOnly"> -->
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 589486af7..68a2a4355 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -43,6 +43,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V4_0_6_1 = 263;
     public static final int V4_0_6 = 262;
     public static final int V4_0_5_1 = 261;
     public static final int V4_0_5 = 260;
@@ -194,12 +195,22 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
-        newVersionString(changeLog, "4.0.6 (3/29/12)", new String[] {
-               "Fixes and performance improvements to Astrid.com and Google Tasks sync",
-               "Google TV support! (Beta)",
-               "Fixed a bug that could put duetimes on tasks when changing timezones",
-               "Fixed a rare crash when starting a task timer"
-        });
+        if (from >= V4_0_6 && from < V4_0_6_1) {
+            newVersionString(changeLog, "4.0.6 (4/03/12)", new String[] {
+                "Fixed a bug where old tasks could become uncompleted. Sorry to those of you" +
+                        " who were affected by this! To recover, you can try reinstalling and restoring your" +
+                        " tasks from the backup file."
+            });
+        }
+
+        if (from < V4_0_6) {
+            newVersionString(changeLog, "4.0.6 (4/02/12)", new String[] {
+                    "Fixes and performance improvements to Astrid.com and Google Tasks sync",
+                    "Google TV support! (Beta)",
+                    "Fixed a bug that could put duetimes on tasks when changing timezones",
+                    "Fixed a rare crash when starting a task timer"
+            });
+        }
 
         if (from >= V4_0_5 && from < V4_0_5_1) {
             newVersionString(changeLog, "4.0.5.1 (3/23/12)", new String[] {