Try to fix 4

Signed-off-by: Mario Danic <mario@lovelyhq.com>

src/main/java/com/owncloud/android/MainApp.java

@@ -217,49 +217,55 @@ public class MainApp extends MultiDexApplication {
 
     private void fixStoragePath() {
         if (!PreferenceManager.getStoragePathFix(this)) {
-            StoragePoint[] storagePoints = DataStorageProvider.getInstance().getAvailableStoragePoints();
-            String storagePath = appPrefs.getString(Preferences.PreferenceKeys.STORAGE_PATH, "");
-            if (TextUtils.isEmpty(storagePath)) {
-                if (appPrefs.getInt(WhatsNewActivity.KEY_LAST_SEEN_VERSION_CODE, 0) != 0) {
-                    // We already used the app, but no storage is set - fix that!
-                    appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
-                            Environment.getExternalStorageDirectory().getAbsolutePath()).commit();
-                    appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
-                } else {
-                    // find internal storage path that's indexable
-                    boolean set = false;
-                    for (StoragePoint storagePoint : storagePoints) {
-                        if (storagePoint.getStorageType().equals(StoragePoint.StorageType.INTERNAL) &&
-                                storagePoint.getPrivacyType().equals(StoragePoint.PrivacyType.PUBLIC)) {
-                            appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
-                                    storagePoint.getPath()).commit();
-                            appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
-                            set = true;
-                            break;
-                        }
-                    }
-
-                    if (!set) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                StoragePoint[] storagePoints = DataStorageProvider.getInstance().getAvailableStoragePoints();
+                String storagePath = appPrefs.getString(Preferences.PreferenceKeys.STORAGE_PATH, "");
+                if (TextUtils.isEmpty(storagePath)) {
+                    if (appPrefs.getInt(WhatsNewActivity.KEY_LAST_SEEN_VERSION_CODE, 0) != 0) {
+                        // We already used the app, but no storage is set - fix that!
+                        appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
+                                Environment.getExternalStorageDirectory().getAbsolutePath()).commit();
+                        appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
+                    } else {
+                        // find internal storage path that's indexable
+                        boolean set = false;
                         for (StoragePoint storagePoint : storagePoints) {
-                            if (storagePoint.getPrivacyType().equals(StoragePoint.PrivacyType.PUBLIC)) {
+                            if (storagePoint.getStorageType().equals(StoragePoint.StorageType.INTERNAL) &&
+                                    storagePoint.getPrivacyType().equals(StoragePoint.PrivacyType.PUBLIC)) {
                                 appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
-                                        Environment.getExternalStorageDirectory().getAbsolutePath()).commit();
+                                        storagePoint.getPath()).commit();
                                 appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
                                 set = true;
                                 break;
                             }
                         }
 
+                        if (!set) {
+                            for (StoragePoint storagePoint : storagePoints) {
+                                if (storagePoint.getPrivacyType().equals(StoragePoint.PrivacyType.PUBLIC)) {
+                                    appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
+                                            storagePoint.getPath()).commit();
+                                    appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
+                                    set = true;
+                                    break;
+                                }
+                            }
+
+                        }
                     }
+                    PreferenceManager.setStoragePathFix(this, true);
+                } else {
+                    appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
+                    PreferenceManager.setStoragePathFix(this, true);
                 }
-                PreferenceManager.setStoragePathFix(this, true);
             } else {
+                if (TextUtils.isEmpty(storagePath)) {
+                    appPrefs.edit().putString(Preferences.PreferenceKeys.STORAGE_PATH,
+                            Environment.getExternalStorageDirectory().getAbsolutePath()).commit();
+                }
                 appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
                 PreferenceManager.setStoragePathFix(this, true);
             }
-        } else {
-            appPrefs.edit().remove(PreferenceManager.PREF__KEYS_MIGRATION).commit();
-            PreferenceManager.setStoragePathFix(this, true);
         }
     }