From 8996af1d39725948c616c1246dcbf010d0f65a3c Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Fri, 13 May 2011 17:37:53 +0200
Subject: [PATCH 1/2] Error reporting for cause-search of Galaxy S default
 tasks. It seems Preferences-read/save isnt working.

---
 astrid/.classpath                                         | 2 +-
 astrid/src/com/todoroo/astrid/service/StartupService.java | 8 +++++++-
 .../src/com/todoroo/astrid/utility/AstridPreferences.java | 6 +-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/astrid/.classpath b/astrid/.classpath
index 5e1a35c02..3e5239912 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -15,8 +15,8 @@
 	<classpathentry exported="true" kind="lib" path="libs/locale_platform.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/todoroo-g.jar"/>
 	<classpathentry kind="lib" path="libs/framework.jar"/>
-	<classpathentry kind="src" path="GreenDroid_src"/>
 	<classpathentry kind="src" path="astridApi_src"/>
 	<classpathentry kind="src" path="facebook_src"/>
+	<classpathentry kind="src" path="GreenDroid_src"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>
diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index 30436041e..c0ffdb4ea 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -107,7 +107,13 @@ public class StartupService {
         }
 
         // read current version
-        int latestSetVersion = AstridPreferences.getCurrentVersion();
+        int latestSetVersion = 0;
+        try {
+            AstridPreferences.getCurrentVersion();
+        } catch (Exception e) {
+            exceptionService.reportError("astrid-startup-version-read", e); //$NON-NLS-1$
+        }
+
         int version = 0;
         try {
             PackageManager pm = context.getPackageManager();
diff --git a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
index bd5c42ce4..44ba6f489 100644
--- a/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
+++ b/astrid/src/com/todoroo/astrid/utility/AstridPreferences.java
@@ -49,11 +49,7 @@ public class AstridPreferences {
 
 	/** CurrentVersion: the currently installed version of Astrid */
     public static int getCurrentVersion() {
-        try {
-            return Preferences.getInt(P_CURRENT_VERSION, 0);
-        } catch (Exception e) {
-            return 0;
-        }
+        return Preferences.getInt(P_CURRENT_VERSION, 0);
     }
 
     /** CurrentVersion: the currently installed version of Astrid */

From 5c5e31bf39c0c88738571fcbce96b59573b40463 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Tue, 17 May 2011 00:52:19 +0200
Subject: [PATCH 2/2] forgot to actually set the latestSetVersion. Oops...

---
 astrid/src/com/todoroo/astrid/service/StartupService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/astrid/src/com/todoroo/astrid/service/StartupService.java b/astrid/src/com/todoroo/astrid/service/StartupService.java
index c0ffdb4ea..28225760c 100644
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@@ -109,7 +109,7 @@ public class StartupService {
         // read current version
         int latestSetVersion = 0;
         try {
-            AstridPreferences.getCurrentVersion();
+            latestSetVersion = AstridPreferences.getCurrentVersion();
         } catch (Exception e) {
             exceptionService.reportError("astrid-startup-version-read", e); //$NON-NLS-1$
         }