Merge commit '5c5e31b'

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>

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 {
+            latestSetVersion = AstridPreferences.getCurrentVersion();
+        } catch (Exception e) {
+            exceptionService.reportError("astrid-startup-version-read", e); //$NON-NLS-1$
+        }
+
         int version = 0;
         try {
             PackageManager pm = context.getPackageManager();

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);
-            return Preferences.getInt(P_CURRENT_VERSION, 0);
-        } catch (Exception e) {
-            return 0;
-        }
     }
 
     /** CurrentVersion: the currently installed version of Astrid */