From f8e11cde0f520a075e0399d28315dd071589e466 Mon Sep 17 00:00:00 2001
From: Sam Bosley <sboz88@gmail.com>
Date: Thu, 22 Mar 2012 13:15:46 -0700
Subject: [PATCH] Version bump and upgrade message

---
 astrid/AndroidManifest.xml                               | 4 ++--
 .../src/com/todoroo/astrid/service/UpgradeService.java   | 9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/astrid/AndroidManifest.xml b/astrid/AndroidManifest.xml
index bdd967c12..66f4248fb 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.4.3"
-          android:versionCode="259">
+          android:versionName="4.0.5"
+          android:versionCode="260">
           
   <!-- 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 b8bd46f09..c347c47c9 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -40,6 +40,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
 
 public final class UpgradeService {
 
+    public static final int V4_0_5 = 260;
     public static final int V4_0_4_3 = 259;
     public static final int V4_0_4_2 = 258;
     public static final int V4_0_4_1 = 257;
@@ -183,6 +184,14 @@ public final class UpgradeService {
         Preferences.clear(AstridPreferences.P_UPGRADE_FROM);
         StringBuilder changeLog = new StringBuilder();
 
+        if (from >= V4_0_0 && from < V4_0_5) {
+            newVersionString(changeLog, "4.0.5 (3/22/12)", new String[] {
+               "Better conflict resolution for Astrid.com sync",
+               "Fixes and improvements to Gtasks sync",
+               "Added option to report sync errors in sync preference screen"
+            });
+        }
+
         if (from >= V4_0_4 && from < V4_0_4_3) {
             newVersionString(changeLog, "4.0.4.3 (3/17/12)", new String[] {
                "Added option to configure widget theme from Settings, including a legacy-style option",