commit f01fcbf53d9ac06f6b63bbf016972a0c119d5cad
author Maarten Derks <maarten@fairphone.com> Fri Oct 16 16:24:05 2015 +0200
committer worker <worker@fairphone.com> Mon Oct 19 11:10:37 2015 +0200
tree deb9c36236db12ac783cedd37e64d4c1b6b7688b
parent 6dc4c0d181155eb2350a8ad69603b1ea3fb54b3c

FPII-1489: Fix Updater crash

FPII-1489: [ST_2][Updater]'Unfortunately,Fairphone Updater has stopped' pops up
when try to launch Updater app.

Implemented fix for reading old shared Updater preferences.

Change-Id: I04f10b1bd1a3fa8192114771d47d80f8d4ffe323

src/com/fairphone/updater/FairphoneUpdater.java

diff --git a/src/com/fairphone/updater/FairphoneUpdater.java b/src/com/fairphone/updater/FairphoneUpdater.java
index 3976b89..2afa176 100644
--- a/src/com/fairphone/updater/FairphoneUpdater.java
+++ b/src/com/fairphone/updater/FairphoneUpdater.java
@@ -200,13 +200,23 @@
     void getSelectedVersionFromSharedPreferences()
     {
         String versionImageType = mSharedPreferences.getString(PREFERENCE_SELECTED_VERSION_TYPE, "");
-        String versionNumber = mSharedPreferences.getString(PREFERENCE_SELECTED_VERSION_NUMBER, "0");
+        String versionNumber = "0";
+        try {
+            versionNumber = mSharedPreferences.getString(PREFERENCE_SELECTED_VERSION_NUMBER, "0");
+        } catch (ClassCastException e) {
+            versionNumber = Integer.toString(mSharedPreferences.getInt(PREFERENCE_SELECTED_VERSION_NUMBER, 0));
+        }
         mSelectedVersion = UpdaterData.getInstance().getVersion(versionImageType, versionNumber);
     }
 
     void getSelectedStoreFromSharedPreferences()
     {
-        String storeNumber = mSharedPreferences.getString(PREFERENCE_SELECTED_STORE_NUMBER, "-1");
+        String storeNumber = "-1";
+        try {
+            storeNumber = mSharedPreferences.getString(PREFERENCE_SELECTED_STORE_NUMBER, "-1");
+        } catch (ClassCastException e) {
+            storeNumber = Integer.toString(mSharedPreferences.getInt(PREFERENCE_SELECTED_STORE_NUMBER, -1));
+        }
         mSelectedStore = UpdaterData.getInstance().getStore(storeNumber);
     }