From b1963aed50b5dbe67b8b3eb347e6af1dcd257680 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 9 Oct 2015 17:20:47 +0200
Subject: [PATCH 01/25] Prepare preferences and project to use user defined
 storage path

---
 res/values/strings.xml                        |  2 +
 res/xml/preferences.xml                       |  9 ++++
 src/com/owncloud/android/MainApp.java         | 19 ++++++-
 .../android/ui/activity/Preferences.java      | 52 +++++++++++++++++--
 .../android/utils/FileStorageUtils.java       |  3 +-
 5 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index eb98378fa249..4e45a83f34d6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -422,6 +422,8 @@
     <string name="pref_behaviour_entries_keep_file">kept in original folder</string>
     <string name="pref_behaviour_entries_move">moved to app folder</string>
     <string name="pref_behaviour_entries_delete_file">deleted</string>
+    <string name="prefs_storage_path">Storage path</string>
+    <string name="prefs_common">Common</string>
 
     <string name="share_dialog_title">Sharing</string>
     <string name="share_file">Share %1$s</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 67b089dca4f7..c441435cf664 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,6 +19,15 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
+	<PreferenceCategory android:title="@string/prefs_common">
+		<EditTextPreference
+			android:title="@string/prefs_storage_path"
+			android:key="storage_path" />
+	</PreferenceCategory>
+    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
+    </PreferenceCategory>
+    
+
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
 		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
 	                        android:title="@string/prefs_instant_upload"
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index c9e2342cd076..13d70367519b 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -23,10 +23,12 @@
 import android.app.Activity;
 import android.app.Application;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Environment;
+import android.preference.PreferenceManager;
 
 import com.owncloud.android.authentication.PassCodeManager;
 import com.owncloud.android.datamodel.ThumbnailsCacheManager;
@@ -54,13 +56,20 @@ public class MainApp extends Application {
 
     private static Context mContext;
 
+    private static String storagePath;
+
     private static boolean mOnlyOnDevice = false;
 
     
     public void onCreate(){
         super.onCreate();
         MainApp.mContext = getApplicationContext();
-        
+
+        SharedPreferences appPrefs =
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        MainApp.storagePath = appPrefs.getString("storage_path", Environment.
+                              getExternalStorageDirectory().getAbsolutePath());
+
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
 
         OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
@@ -132,6 +141,14 @@ public static Context getAppContext() {
         return MainApp.mContext;
     }
 
+    public static String getStoragePath(){
+        return MainApp.storagePath;
+    }
+
+    public static void setStoragePath(String path){
+        MainApp.storagePath = path;
+    }
+
     // Methods to obtain Strings referring app_name 
     //   From AccountAuthenticator 
     //   public static final String ACCOUNT_TYPE = "owncloud";    
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 32ad63a818b5..3cf7076b3cb2 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -31,6 +31,9 @@
 import android.content.res.Configuration;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
+import android.os.Handler;
+import android.os.IBinder;
 import android.preference.CheckBoxPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
@@ -58,6 +61,9 @@
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.services.OperationsService;
+import com.owncloud.android.ui.PreferenceWithLongSummary;
+import com.owncloud.android.ui.RadioButtonPreference;
 import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.IOException;
@@ -106,6 +112,9 @@ public class Preferences extends PreferenceActivity {
     private Preference mPrefInstantVideoUploadOnlyOnCharging;
     private String mUploadVideoPath;
 
+    private PreferenceWithLongSummary mPrefStoragePath;
+    private String mStoragePath;
+
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -327,6 +336,32 @@ public boolean onPreferenceClick(Preference preference) {
             }
         }
 
+        mPrefStoragePath =  (PreferenceWithLongSummary)findPreference("storage_path");
+        if (mPrefStoragePath != null){
+
+                mPrefStoragePath.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(Preference preference, Object newValue) {
+                        MainApp.setStoragePath((String) newValue);
+                        return true;
+                    }
+                });
+
+//            mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+//                @Override
+//                public boolean onPreferenceClick(Preference preference) {
+//
+////                    if (!mUploadPath.endsWith(OCFile.PATH_SEPARATOR)) {
+////                        mUploadPath += OCFile.PATH_SEPARATOR;
+////                    }
+////                    Intent intent = new Intent(Preferences.this, UploadPathActivity.class);
+////                    intent.putExtra(UploadPathActivity.KEY_INSTANT_UPLOAD_PATH, mUploadPath);
+////                    startActivityForResult(intent, ACTION_SELECT_UPLOAD_PATH);
+////                    return true;
+//                }
+//            });
+        }
+
         mPrefInstantUploadPath =  findPreference("instant_upload_path");
         if (mPrefInstantUploadPath != null){
 
@@ -416,6 +451,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
        }
 
        loadInstantUploadPath();
+       loadStoragePath();
        loadInstantUploadVideoPath();
     }
 
@@ -691,6 +727,17 @@ private void loadInstantUploadPath() {
         mPrefInstantUploadPath.setSummary(mUploadPath);
     }
 
+    /**
+     * Load storage path set on preferences
+     */
+    private void loadStoragePath() {
+        SharedPreferences appPrefs =
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        mStoragePath = appPrefs.getString("storage_path", Environment.getExternalStorageDirectory()
+                                                         .getAbsolutePath());
+        mPrefStoragePath.setSummary(mStoragePath);
+    }
+
     /**
      * Save the "Instant Upload Path" on preferences
      */
@@ -706,10 +753,7 @@ private void saveInstantUploadPathOnPreferences() {
      * Load upload video path set on preferences
      */
     private void loadInstantUploadVideoPath() {
-        SharedPreferences appPrefs =
-                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
-        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
+        mPrefInstantVideoUploadPath.setSummary(MainApp.getStoragePath());
     }
 
     /**
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 54e26ce65dc2..9e8f047c18b7 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -79,8 +79,7 @@ public static final String removeDataFolderPath(String fullPath) {
      * Get local owncloud storage path for accountName.
      */
     public static final String getSavePath(String accountName) {
-        File sdCard = Environment.getExternalStorageDirectory();
-        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
+        return MainApp.getStoragePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
         // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
         // that can be in the accountName since 0.1.190B
     }

From 3fc8d999dbc98c7ee1fcd50023fa912e535ad00f Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 15 Aug 2016 16:06:24 +0200
Subject: [PATCH 02/25] rebase

---
 AndroidManifest.xml                           |  1 +
 res/xml/preferences.xml                       |  5 +-
 src/com/owncloud/android/MainApp.java         |  3 +-
 .../LocalDirectorySelectorActivity.java       | 53 ++++++++++++++++++
 .../android/ui/activity/Preferences.java      | 56 ++++++++++++-------
 .../ui/activity/StorageMigrationActivity.java | 31 ++++++++++
 .../ui/activity/UploadFilesActivity.java      |  2 +-
 .../android/utils/FileStorageUtils.java       | 13 ++---
 8 files changed, 130 insertions(+), 34 deletions(-)
 create mode 100644 src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
 create mode 100644 src/com/owncloud/android/ui/activity/StorageMigrationActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f0cc9ff7c33b..ba80e0dad94d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -79,6 +79,7 @@
                   android:taskAffinity=""
                   android:excludeFromRecents="true"
                   android:theme="@style/Theme.ownCloud.NoActionBar">
+        <activity android:name=".ui.activity.LocalDirectorySelectorActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index c441435cf664..10d227bf5e39 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -18,9 +18,8 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-
-	<PreferenceCategory android:title="@string/prefs_common">
-		<EditTextPreference
+	<PreferenceCategory android:title="@string/prefs_category_general">
+		<Preference
 			android:title="@string/prefs_storage_path"
 			android:key="storage_path" />
 	</PreferenceCategory>
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 13d70367519b..9639ebf3b670 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -89,8 +89,7 @@ public void onCreate(){
             // Set folder for store logs
             Log_OC.setLogDataFolder(dataFolder);
 
-            //TODO: to be changed/fixed whenever SD card support gets merged.
-            Log_OC.startLogging(Environment.getExternalStorageDirectory().getAbsolutePath());
+            Log_OC.startLogging(MainApp.storagePath);
             Log_OC.d("Debug", "start logging");
         }
 
diff --git a/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
new file mode 100644
index 000000000000..83b44c594012
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
@@ -0,0 +1,53 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2015 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.ui.activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+
+import com.owncloud.android.R;
+
+/**
+ * Created by Bartosz Przybylski on 07.11.2015.
+ */
+public class LocalDirectorySelectorActivity extends UploadFilesActivity {
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		mUploadBtn.setText(R.string.folder_picker_choose_button_text);
+	}
+
+	@Override
+	public void onClick(View v) {
+		if (v.getId() == R.id.upload_files_btn_cancel) {
+			setResult(RESULT_CANCELED);
+			finish();
+
+		} else if (v.getId() == R.id.upload_files_btn_upload) {
+			Intent resultIntent = new Intent();
+			resultIntent.putExtra(EXTRA_CHOSEN_FILES, getInitialDirectory().getAbsolutePath());
+			setResult(RESULT_OK, resultIntent);
+			finish();
+		}
+	}
+}
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 3cf7076b3cb2..a1805e53a500 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -66,6 +66,7 @@
 import com.owncloud.android.ui.RadioButtonPreference;
 import com.owncloud.android.utils.DisplayUtils;
 
+import java.io.File;
 import java.io.IOException;
 
 
@@ -81,6 +82,8 @@ public class Preferences extends PreferenceActivity {
 
     private static final int ACTION_SELECT_UPLOAD_PATH = 1;
     private static final int ACTION_SELECT_UPLOAD_VIDEO_PATH = 2;
+    private static final int ACTION_SELECT_STORAGE_PATH = 3;
+    private static final int ACTION_PERFORM_MIGRATION = 4;
     private static final int ACTION_REQUEST_PASSCODE = 5;
     private static final int ACTION_CONFIRM_PASSCODE = 6;
 
@@ -336,30 +339,26 @@ public boolean onPreferenceClick(Preference preference) {
             }
         }
 
-        mPrefStoragePath =  (PreferenceWithLongSummary)findPreference("storage_path");
-        if (mPrefStoragePath != null){
+        mPrefStoragePath =  findPreference("storage_path");
+        if (mPrefStoragePath != null) {
 
-                mPrefStoragePath.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+            mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
+                public boolean onPreferenceClick(Preference preference) {
+                    Intent intent = new Intent(Preferences.this, LocalDirectorySelectorActivity.class);
+                    intent.putExtra(UploadFilesActivity.KEY_DIRECTORY_PATH, mStoragePath);
+                    startActivityForResult(intent, ACTION_SELECT_STORAGE_PATH);
+                    return true;
+                }
+            });
+
+            mPrefStoragePath.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
                         MainApp.setStoragePath((String) newValue);
                         return true;
                     }
                 });
-
-//            mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-//                @Override
-//                public boolean onPreferenceClick(Preference preference) {
-//
-////                    if (!mUploadPath.endsWith(OCFile.PATH_SEPARATOR)) {
-////                        mUploadPath += OCFile.PATH_SEPARATOR;
-////                    }
-////                    Intent intent = new Intent(Preferences.this, UploadPathActivity.class);
-////                    intent.putExtra(UploadPathActivity.KEY_INSTANT_UPLOAD_PATH, mUploadPath);
-////                    startActivityForResult(intent, ACTION_SELECT_UPLOAD_PATH);
-////                    return true;
-//                }
-//            });
         }
 
         mPrefInstantUploadPath =  findPreference("instant_upload_path");
@@ -598,7 +597,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
             saveInstantUploadPathOnPreferences();
 
-        } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK){
+        } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK) {
 
             OCFile folderToUploadVideo =
                     (OCFile) data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
@@ -634,9 +633,24 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
                 Toast.makeText(this, R.string.pass_code_removed, Toast.LENGTH_LONG).show();
             }
+        } else if (requestCode == ACTION_SELECT_STORAGE_PATH && resultCode == RESULT_OK) {
+            File currentStorageDir = new File(mStoragePath);
+            File upcomingStorageDir = new File(data.getStringExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES));
+
+            if (currentStorageDir != upcomingStorageDir) {
+                Intent migrationIntent = new Intent(this, StorageMigrationActivity.class);
+                migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_SOURCE_DIR,
+                        currentStorageDir.getAbsolutePath());
+                migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR,
+                        currentStorageDir.getAbsolutePath());
+                startActivityForResult(migrationIntent, ACTION_PERFORM_MIGRATION);
+            }
+        } else if (requestCode == ACTION_PERFORM_MIGRATION && resultCode == RESULT_OK) {
+            String resultStorageDir = data.getStringExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR);
+            mStoragePath = resultStorageDir;
+            mPrefStoragePath.setSummary(mStoragePath);
         } else if (requestCode == ACTION_REQUEST_CODE_DAVDROID_SETUP && resultCode == RESULT_OK) {
-            Toast.makeText(this, R.string.prefs_calendar_contacts_sync_setup_successful, Toast.LENGTH_LONG).show();
-        }
+            Toast.makeText(this, R.string.prefs_calendar_contacts_sync_setup_successful, Toast.LENGTH_LONG).show();        }
     }
 
     public ActionBar getSupportActionBar() {
@@ -735,7 +749,7 @@ private void loadStoragePath() {
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mStoragePath = appPrefs.getString("storage_path", Environment.getExternalStorageDirectory()
                                                          .getAbsolutePath());
-        mPrefStoragePath.setSummary(mStoragePath);
+        mPrefStoragePath.setSummary(mStoragePath + File.separator + MainApp.getDataFolder());
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
new file mode 100644
index 000000000000..c5dc59ba22fa
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -0,0 +1,31 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2015 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.ui.activity;
+
+import android.support.v7.app.AppCompatActivity;
+
+/**
+ * Created by Bartosz Przybylski on 07.11.2015.
+ */
+public class StorageMigrationActivity extends AppCompatActivity {
+	public static final String KEY_MIGRATION_TARGET_DIR = "MIGRATION_TARGET";
+	public static final String KEY_MIGRATION_SOURCE_DIR = "MIGRATION_SOURCE";
+}
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 9cae55a6f9f4..598397202eb2 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -81,7 +81,7 @@ public class UploadFilesActivity extends FileActivity implements
     public static final int RESULT_OK_AND_DO_NOTHING = 2;
     public static final int RESULT_OK_AND_DELETE = 3;
 
-    private static final String KEY_DIRECTORY_PATH =
+    public static final String KEY_DIRECTORY_PATH =
             UploadFilesActivity.class.getCanonicalName() + ".KEY_DIRECTORY_PATH";
     private static final String KEY_ALL_SELECTED =
             UploadFilesActivity.class.getCanonicalName() + ".KEY_ALL_SELECTED";
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 9e8f047c18b7..731e3ba9f7c4 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -79,7 +79,7 @@ public static final String removeDataFolderPath(String fullPath) {
      * Get local owncloud storage path for accountName.
      */
     public static final String getSavePath(String accountName) {
-        return MainApp.getStoragePath() + "/" + MainApp.getDataFolder() + "/" + Uri.encode(accountName, "@");
+        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + Uri.encode(accountName, "@");
         // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
         // that can be in the accountName since 0.1.190B
     }
@@ -97,10 +97,9 @@ public static final String getDefaultSavePathFor(String accountName, OCFile file
      * Get absolute path to tmp folder inside datafolder in sd-card for given accountName.
      */
     public static final String getTemporalPath(String accountName) {
-        File sdCard = Environment.getExternalStorageDirectory();
-        return sdCard.getAbsolutePath() + "/" + MainApp.getDataFolder() + "/tmp/" + Uri.encode(accountName, "@");
-            // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
-            // that can be in the accountName since 0.1.190B
+        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + "tmp" + File.separator + Uri.encode(accountName, "@");
+        // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
+        // that can be in the accountName since 0.1.190B
     }
 
     /**
@@ -110,7 +109,7 @@ public static final String getTemporalPath(String accountName) {
      */
     @SuppressLint("NewApi")
     public static final long getUsableSpace(String accountName) {
-        File savePath = Environment.getExternalStorageDirectory();
+        File savePath = new File(MainApp.getStoragePath());
         if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) {
             return savePath.getUsableSpace();
 
@@ -122,7 +121,7 @@ public static final long getUsableSpace(String accountName) {
     }
     
     public static final String getLogPath()  {
-        return Environment.getExternalStorageDirectory() + File.separator + MainApp.getDataFolder() + File.separator + "log";
+        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + "log";
     }
 
     /**

From b38b3276e2c9d5cf8a605344098aefaf27450c1b Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Sun, 8 Nov 2015 22:42:53 +0100
Subject: [PATCH 03/25] Add more migration stuff. cleanup step is still missing

---
 AndroidManifest.xml                           |   1 +
 res/layout/migration_layout.xml               |  32 ++
 res/values/strings.xml                        |  17 ++
 .../datamodel/FileDataStorageManager.java     |  64 ++++
 .../android/ui/activity/Preferences.java      |  20 +-
 .../ui/activity/StorageMigrationActivity.java | 278 ++++++++++++++++++
 6 files changed, 408 insertions(+), 4 deletions(-)
 create mode 100644 res/layout/migration_layout.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index ba80e0dad94d..26d9b61dd938 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -80,6 +80,7 @@
                   android:excludeFromRecents="true"
                   android:theme="@style/Theme.ownCloud.NoActionBar">
         <activity android:name=".ui.activity.LocalDirectorySelectorActivity" />
+        <activity android:name=".ui.activity.StorageMigrationActivity" />
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
diff --git a/res/layout/migration_layout.xml b/res/layout/migration_layout.xml
new file mode 100644
index 000000000000..84b5c2207b23
--- /dev/null
+++ b/res/layout/migration_layout.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center_vertical">
+
+    <ProgressBar
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/migrationProgress"
+        android:layout_gravity="center_horizontal"
+        android:progress="50"
+        android:paddingLeft="30dp"
+        android:paddingRight="30dp"/>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text=""
+        android:id="@+id/migrationText"
+        android:layout_gravity="center_horizontal"/>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/drawer_close"
+        android:id="@+id/finishButton"
+        android:layout_gravity="center_horizontal"/>
+</LinearLayout>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e45a83f34d6..128b974f946a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -356,6 +356,23 @@
     <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
     <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
+    <string name="file_migration_finish_button">Finish</string>
+    <string name="file_migration_preparing">Preparing for migration...</string>
+    <string name="file_migration_checking_destination">Checking destination...</string>
+    <string name="file_migration_saving_accounts_configuration">Saving accounts configuration...</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Waiting for unfinished synchronizations...</string>
+    <string name="file_migration_migrating">Moving data...</string>
+    <string name="file_migration_updating_index">Updating index...</string>
+    <string name="file_migration_cleaning">Cleaning...</string>
+    <string name="file_migration_restoring_accounts_configuration">Restoring accounts configuration...</string>
+    <string name="file_migration_ok_finished">Finished</string>
+    <string name="file_migration_failed_not_enough_space">ERROR: Not enough space</string>
+    <string name="file_migration_failed_not_writable">ERROR: File is not writable</string>
+    <string name="file_migration_failed_not_readable">ERROR: File is not readable</string>
+    <string name="file_migration_failed_dir_already_exists">ERROR: owncloud directory already exists</string>
+    <string name="file_migration_failed_while_coping">ERROR: While migrating</string>
+    <string name="file_migration_failed_while_updating_index">ERROR: While updating index</string>
+
     <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
     <string name="drawer_manage_accounts">Manage accounts</string>
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 7f324b1e21bc..f7f4c14bda0c 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -32,6 +32,7 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
+import android.provider.BaseColumns;
 import android.provider.MediaStore;
 
 import com.owncloud.android.MainApp;
@@ -765,6 +766,69 @@ private boolean copyFile(File src, File target) {
         return ret;
     }
 
+    public void migrateStoredFiles(String srcPath, String dstPath) throws Exception {
+        Cursor c = null;
+        if (getContentResolver() != null) {
+            c = getContentResolver().query(ProviderTableMeta.CONTENT_URI_FILE,
+                    null,
+                    ProviderTableMeta.FILE_STORAGE_PATH  + " IS NOT NULL",
+                    null,
+                    null);
+
+        } else {
+            try {
+                c = getContentProviderClient().query(ProviderTableMeta.CONTENT_URI_FILE,
+                        new String[]{ProviderTableMeta._ID, ProviderTableMeta.FILE_STORAGE_PATH},
+                        ProviderTableMeta.FILE_STORAGE_PATH + " IS NOT NULL",
+                        null,
+                        null);
+            } catch (RemoteException e) {
+                Log_OC.e(TAG, e.getMessage());
+                throw e;
+            }
+        }
+
+        ArrayList<ContentProviderOperation> operations =
+                new ArrayList<ContentProviderOperation>(c.getCount());
+        if (c.moveToFirst()) {
+            do {
+                ContentValues cv = new ContentValues();
+                long fileId = c.getLong(c.getColumnIndex(ProviderTableMeta._ID));
+                String oldFileStoragePath = c.getString(c.getColumnIndex(ProviderTableMeta.FILE_STORAGE_PATH));
+
+                if (oldFileStoragePath.startsWith(srcPath)) {
+
+                    cv.put(
+                            ProviderTableMeta.FILE_STORAGE_PATH,
+                            oldFileStoragePath.replaceFirst(srcPath, dstPath));
+
+                    operations.add(
+                            ContentProviderOperation.newUpdate(ProviderTableMeta.CONTENT_URI).
+                                    withValues(cv).
+                                    withSelection(
+                                            ProviderTableMeta._ID + "=?",
+                                            new String[]{String.valueOf(fileId)}
+                                    )
+                                    .build());
+                }
+
+            } while (c.moveToNext());
+        }
+        c.close();
+
+        /// 3. apply updates in batch
+        try {
+            if (getContentResolver() != null) {
+                getContentResolver().applyBatch(MainApp.getAuthority(), operations);
+
+            } else {
+                getContentProviderClient().applyBatch(operations);
+            }
+
+        } catch (Exception e) {
+            throw e;
+        }
+    }
 
     private Vector<OCFile> getFolderContent(long parentId, boolean onlyOnDevice) {
 
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index a1805e53a500..3a2736e6e5f2 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -642,13 +642,12 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                 migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_SOURCE_DIR,
                         currentStorageDir.getAbsolutePath());
                 migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR,
-                        currentStorageDir.getAbsolutePath());
+                        upcomingStorageDir.getAbsolutePath());
                 startActivityForResult(migrationIntent, ACTION_PERFORM_MIGRATION);
             }
         } else if (requestCode == ACTION_PERFORM_MIGRATION && resultCode == RESULT_OK) {
             String resultStorageDir = data.getStringExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR);
-            mStoragePath = resultStorageDir;
-            mPrefStoragePath.setSummary(mStoragePath);
+            saveStoragePath(resultStorageDir);
         } else if (requestCode == ACTION_REQUEST_CODE_DAVDROID_SETUP && resultCode == RESULT_OK) {
             Toast.makeText(this, R.string.prefs_calendar_contacts_sync_setup_successful, Toast.LENGTH_LONG).show();        }
     }
@@ -741,6 +740,19 @@ private void loadInstantUploadPath() {
         mPrefInstantUploadPath.setSummary(mUploadPath);
     }
 
+    /**
+     * Save storage path
+     */
+    private void saveStoragePath(String newStoragePath) {
+        SharedPreferences appPrefs =
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        mStoragePath = newStoragePath;
+        MainApp.setStoragePath(mStoragePath);
+        SharedPreferences.Editor editor = appPrefs.edit();
+        editor.putString("storage_path", mStoragePath);
+        mPrefStoragePath.setSummary(mStoragePath);
+    }
+
     /**
      * Load storage path set on preferences
      */
@@ -749,7 +761,7 @@ private void loadStoragePath() {
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mStoragePath = appPrefs.getString("storage_path", Environment.getExternalStorageDirectory()
                                                          .getAbsolutePath());
-        mPrefStoragePath.setSummary(mStoragePath + File.separator + MainApp.getDataFolder());
+        mPrefStoragePath.setSummary(mStoragePath);
     }
 
     /**
diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index c5dc59ba22fa..5ff18c2dbdc7 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -20,12 +20,290 @@
  */
 package com.owncloud.android.ui.activity;
 
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.os.AsyncTask;
+import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 
 /**
  * Created by Bartosz Przybylski on 07.11.2015.
  */
 public class StorageMigrationActivity extends AppCompatActivity {
+	private static final String TAG = StorageMigrationActivity.class.getName();
 	public static final String KEY_MIGRATION_TARGET_DIR = "MIGRATION_TARGET";
 	public static final String KEY_MIGRATION_SOURCE_DIR = "MIGRATION_SOURCE";
+
+	private ProgressBar mProgressBar;
+	private Button mFinishButton;
+	private TextView mFeedbackText;
+
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+
+		setContentView(R.layout.migration_layout);
+		mProgressBar = (ProgressBar)findViewById(R.id.migrationProgress);
+		mFinishButton = (Button)findViewById(R.id.finishButton);
+		mFeedbackText = (TextView)findViewById(R.id.migrationText);
+
+		mProgressBar.setProgress(0);
+		mFinishButton.setVisibility(View.INVISIBLE);
+		mFeedbackText.setText(R.string.file_migration_preparing);
+
+		mFinishButton.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View view) {
+				setResult(RESULT_CANCELED);
+				finish();
+			}
+		});
+
+		String source = getIntent().getStringExtra(KEY_MIGRATION_SOURCE_DIR);
+		String destination = getIntent().getStringExtra(KEY_MIGRATION_TARGET_DIR);
+
+		if (source == null || destination == null) {
+			Log_OC.e(TAG, "source or destination is null");
+			finish();
+		}
+
+		new FileMigrationTask().execute(source, destination);
+	}
+
+	private class FileMigrationTask extends AsyncTask<String, Integer, Integer> {
+
+		private String mStorageTarget;
+		private String mStorageSource;
+
+		private class MigrationException extends Exception {
+			private int mResId;
+			/*
+			 * @param resId resource identifier to use for displaying error
+			 */
+			MigrationException(int resId) {
+				super();
+				this.mResId = resId;
+			}
+
+			int getResId() { return mResId; }
+		}
+
+		@Override
+		protected Integer doInBackground(String... args) {
+
+			mStorageSource = args[0];
+			mStorageTarget = args[1];
+
+			int progress = 0;
+			publishProgress(progress++, R.string.file_migration_preparing);
+
+			Context context = StorageMigrationActivity.this;
+			String ocAuthority = context.getString(R.string.authority);
+
+			Account[] ocAccounts = AccountManager.get(context).getAccountsByType(MainApp.getAccountType());
+			boolean[] oldAutoSync = new boolean[ocAccounts.length];
+
+			try {
+				publishProgress(progress++, R.string.file_migration_checking_destination);
+
+				checkDestinationAvailability();
+
+				publishProgress(progress++, R.string.file_migration_saving_accounts_configuration);
+				saveAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
+
+				publishProgress(progress++, R.string.file_migration_waiting_for_unfinished_sync);
+				stopAccountsSyncing(ocAuthority, ocAccounts);
+				waitForUnfinishedSynchronizations(ocAuthority, ocAccounts);
+
+				publishProgress(progress++, R.string.file_migration_migrating);
+				copyFiles();
+
+				publishProgress(progress++, R.string.file_migration_updating_index);
+				updateIndex(context);
+
+				publishProgress(progress++, R.string.file_migration_cleaning);
+				cleanup();
+
+			} catch (MigrationException e) {
+				return e.getResId();
+			} finally {
+				publishProgress(progress++, R.string.file_migration_restoring_accounts_configuration);
+				restoreAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
+			}
+
+			publishProgress(progress++, R.string.file_migration_ok_finished);
+
+			return 0;
+		}
+
+		@Override
+		protected void onProgressUpdate(Integer... progress) {
+			mProgressBar.setProgress(progress[0]);
+			if (progress.length > 1)
+				mFeedbackText.setText(progress[1]);
+		}
+
+		@Override
+		protected void onPostExecute(Integer code) {
+			mFinishButton.setVisibility(View.VISIBLE);
+			if (code != 0) {
+				mFeedbackText.setText(code);
+			} else {
+				mFeedbackText.setText(R.string.file_migration_ok_finished);
+				mFinishButton.setOnClickListener(new View.OnClickListener() {
+					@Override
+					public void onClick(View view) {
+						Intent resultIntent = new Intent();
+						resultIntent.putExtra(KEY_MIGRATION_TARGET_DIR, mStorageTarget);
+						setResult(RESULT_OK, resultIntent);
+						finish();
+					}
+				});
+			}
+		}
+
+		void checkDestinationAvailability() throws MigrationException {
+			File srcFile = new File(mStorageSource);
+			File dstFile = new File(mStorageTarget);
+
+			if (!dstFile.canRead() || !srcFile.canRead())
+				throw new MigrationException(R.string.file_migration_failed_not_readable);
+
+			if (!dstFile.canWrite() || !srcFile.canWrite())
+				throw new MigrationException(R.string.file_migration_failed_not_writable);
+
+			if (new File(dstFile, MainApp.getDataFolder()).exists())
+				throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
+
+			if (dstFile.getFreeSpace() < calculateUsedSpace(new File(srcFile, MainApp.getDataFolder())))
+				throw new MigrationException(R.string.file_migration_failed_not_enough_space);
+		}
+
+		void copyFiles() throws MigrationException {
+			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+
+			copyDirs(srcFile, dstFile);
+		}
+
+		private boolean copyFile(File src, File target) {
+			boolean ret = true;
+
+			InputStream in = null;
+			OutputStream out = null;
+
+			try {
+				in = new FileInputStream(src);
+				out = new FileOutputStream(target);
+				byte[] buf = new byte[1024];
+				int len;
+				while ((len = in.read(buf)) > 0) {
+					out.write(buf, 0, len);
+				}
+			} catch (IOException ex) {
+				ret = false;
+			} finally {
+				if (in != null) try {
+					in.close();
+				} catch (IOException e) {
+					e.printStackTrace(System.err);
+				}
+				if (out != null) try {
+					out.close();
+				} catch (IOException e) {
+					e.printStackTrace(System.err);
+				}
+			}
+
+			return ret;
+		}
+
+		void copyDirs(File src, File dst) throws MigrationException {
+			if (!dst.mkdirs())
+				throw new MigrationException(R.string.file_migration_failed_while_coping);
+
+			for (File f : src.listFiles()) {
+				if (f.isDirectory())
+					copyDirs(f, new File(dst, f.getName()));
+				else if (!copyFile(f, new File(dst, f.getName())))
+					throw new MigrationException(R.string.file_migration_failed_while_coping);
+			}
+
+		}
+
+		void updateIndex(Context context) throws MigrationException {
+			FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
+
+			try {
+				manager.migrateStoredFiles(mStorageSource, mStorageTarget);
+			} catch (Exception e) {
+				throw new MigrationException(R.string.file_migration_failed_while_updating_index);
+			}
+
+		}
+
+		void cleanup() {
+
+		}
+
+		long calculateUsedSpace(File dir) {
+			long result = 0;
+
+			for (File f : dir.listFiles()) {
+				if (f.isDirectory())
+					result += calculateUsedSpace(f);
+				else
+					result += f.length();
+			}
+
+			return result;
+		}
+
+		void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
+			for (int i = 0; i < accounts.length; ++i) {
+				syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);
+			}
+		}
+
+		void stopAccountsSyncing(String authority, Account accounts[]) {
+			for (int i = 0; i < accounts.length; ++i)
+				ContentResolver.setSyncAutomatically(accounts[i], authority, false);
+		}
+
+		void waitForUnfinishedSynchronizations(String authority, Account accounts[]) {
+			for (int i = 0; i < accounts.length; ++i)
+				while (ContentResolver.isSyncActive(accounts[i], authority))
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException e) {
+						Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
+					}
+		}
+
+
+		void restoreAccountsSyncStatus(String authority, Account accounts[], boolean oldSync[]) {
+			for (int i = 0; i < accounts.length; ++i)
+				ContentResolver.setSyncAutomatically(accounts[i], authority, oldSync[i]);
+		}
+
+	}
 }

From 67bc271265bc7546d463c4cd2bf76d04ed410479 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 17:08:44 +0100
Subject: [PATCH 04/25] Add cleanup and rollback step when migrating. Correctly
 set progress during migration.

---
 .../android/ui/activity/Preferences.java      |  1 +
 .../ui/activity/StorageMigrationActivity.java | 54 +++++++++++++------
 2 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 3a2736e6e5f2..844ddf7e9903 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -750,6 +750,7 @@ private void saveStoragePath(String newStoragePath) {
         MainApp.setStoragePath(mStoragePath);
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString("storage_path", mStoragePath);
+        editor.commit();
         mPrefStoragePath.setSummary(mStoragePath);
     }
 
diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index 5ff18c2dbdc7..dc73fcc63fb5 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -93,6 +93,9 @@ private class FileMigrationTask extends AsyncTask<String, Integer, Integer> {
 
 		private String mStorageTarget;
 		private String mStorageSource;
+		private int mProgress;
+
+		private static final int mProgressCopyUpperBound = 98;
 
 		private class MigrationException extends Exception {
 			private int mResId;
@@ -107,14 +110,18 @@ private class MigrationException extends Exception {
 			int getResId() { return mResId; }
 		}
 
+		private class MigrationCleanupException extends Exception {
+			MigrationCleanupException() {}
+		}
+
 		@Override
 		protected Integer doInBackground(String... args) {
 
 			mStorageSource = args[0];
 			mStorageTarget = args[1];
+			mProgress = 0;
 
-			int progress = 0;
-			publishProgress(progress++, R.string.file_migration_preparing);
+			publishProgress(mProgress++, R.string.file_migration_preparing);
 
 			Context context = StorageMigrationActivity.this;
 			String ocAuthority = context.getString(R.string.authority);
@@ -123,34 +130,38 @@ protected Integer doInBackground(String... args) {
 			boolean[] oldAutoSync = new boolean[ocAccounts.length];
 
 			try {
-				publishProgress(progress++, R.string.file_migration_checking_destination);
+				publishProgress(mProgress++, R.string.file_migration_checking_destination);
 
 				checkDestinationAvailability();
 
-				publishProgress(progress++, R.string.file_migration_saving_accounts_configuration);
+				publishProgress(mProgress++, R.string.file_migration_saving_accounts_configuration);
 				saveAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
 
-				publishProgress(progress++, R.string.file_migration_waiting_for_unfinished_sync);
+				publishProgress(mProgress++, R.string.file_migration_waiting_for_unfinished_sync);
 				stopAccountsSyncing(ocAuthority, ocAccounts);
 				waitForUnfinishedSynchronizations(ocAuthority, ocAccounts);
 
-				publishProgress(progress++, R.string.file_migration_migrating);
+				publishProgress(mProgress++, R.string.file_migration_migrating);
 				copyFiles();
 
-				publishProgress(progress++, R.string.file_migration_updating_index);
+				publishProgress(mProgress++, R.string.file_migration_updating_index);
 				updateIndex(context);
 
-				publishProgress(progress++, R.string.file_migration_cleaning);
+				publishProgress(mProgress++, R.string.file_migration_cleaning);
 				cleanup();
 
 			} catch (MigrationException e) {
+				rollback();
 				return e.getResId();
+			} catch (MigrationCleanupException e) {
+				Log_OC.w(TAG, "Migration mleanup step failed");
+				return 0;
 			} finally {
-				publishProgress(progress++, R.string.file_migration_restoring_accounts_configuration);
+				publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
 				restoreAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
 			}
 
-			publishProgress(progress++, R.string.file_migration_ok_finished);
+			publishProgress(mProgress++, R.string.file_migration_ok_finished);
 
 			return 0;
 		}
@@ -203,6 +214,8 @@ void copyFiles() throws MigrationException {
 			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
 
 			copyDirs(srcFile, dstFile);
+			mProgress = Math.max(mProgress, mProgressCopyUpperBound);
+			publishProgress(mProgress);
 		}
 
 		private boolean copyFile(File src, File target) {
@@ -242,6 +255,10 @@ void copyDirs(File src, File dst) throws MigrationException {
 				throw new MigrationException(R.string.file_migration_failed_while_coping);
 
 			for (File f : src.listFiles()) {
+
+				mProgress = Math.min(mProgress+1, mProgressCopyUpperBound);
+				publishProgress(mProgress);
+
 				if (f.isDirectory())
 					copyDirs(f, new File(dst, f.getName()));
 				else if (!copyFile(f, new File(dst, f.getName())))
@@ -258,11 +275,19 @@ void updateIndex(Context context) throws MigrationException {
 			} catch (Exception e) {
 				throw new MigrationException(R.string.file_migration_failed_while_updating_index);
 			}
-
 		}
 
-		void cleanup() {
+		void cleanup() throws MigrationCleanupException {
+			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+			if (!srcFile.delete())
+				throw new MigrationCleanupException();
+		}
 
+		void rollback() {
+			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+			if (dstFile.exists())
+				if (!dstFile.delete())
+					Log_OC.w(TAG, "Rollback step failed");
 		}
 
 		long calculateUsedSpace(File dir) {
@@ -279,9 +304,8 @@ long calculateUsedSpace(File dir) {
 		}
 
 		void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
-			for (int i = 0; i < accounts.length; ++i) {
+			for (int i = 0; i < accounts.length; ++i)
 				syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);
-			}
 		}
 
 		void stopAccountsSyncing(String authority, Account accounts[]) {
@@ -296,10 +320,10 @@ void waitForUnfinishedSynchronizations(String authority, Account accounts[]) {
 						Thread.sleep(1000);
 					} catch (InterruptedException e) {
 						Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
+						Thread.currentThread().interrupt();
 					}
 		}
 
-
 		void restoreAccountsSyncStatus(String authority, Account accounts[], boolean oldSync[]) {
 			for (int i = 0; i < accounts.length; ++i)
 				ContentResolver.setSyncAutomatically(accounts[i], authority, oldSync[i]);

From ebbab224b2063185ddf2d537b5773141f93cc389 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 17:25:02 +0100
Subject: [PATCH 05/25] Code cleanups

---
 .../datamodel/FileDataStorageManager.java     | 35 +----------
 .../android/ui/activity/Preferences.java      | 12 ++--
 .../ui/activity/StorageMigrationActivity.java | 57 ++----------------
 .../android/utils/FileStorageUtils.java       | 59 ++++++++++++++++---
 4 files changed, 62 insertions(+), 101 deletions(-)

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index f7f4c14bda0c..66167eaf8ac2 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -32,7 +32,6 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.RemoteException;
-import android.provider.BaseColumns;
 import android.provider.MediaStore;
 
 import com.owncloud.android.MainApp;
@@ -728,44 +727,12 @@ public void copyLocalFile(OCFile file, String targetPath) {
                 if (!targetFolder.exists()) {
                     targetFolder.mkdirs();
                 }
-                copied = copyFile(localFile, targetFile);
+                copied = FileStorageUtils.copyFile(localFile, targetFile);
             }
             Log_OC.d(TAG, "Local file COPIED : " + copied);
         }
     }
 
-    private boolean copyFile(File src, File target) {
-        boolean ret = true;
-
-        InputStream in = null;
-        OutputStream out = null;
-
-        try {
-            in = new FileInputStream(src);
-            out = new FileOutputStream(target);
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-        } catch (IOException ex) {
-            ret = false;
-        } finally {
-            if (in != null) try {
-                in.close();
-            } catch (IOException e) {
-                e.printStackTrace(System.err);
-            }
-            if (out != null) try {
-                out.close();
-            } catch (IOException e) {
-                e.printStackTrace(System.err);
-            }
-        }
-
-        return ret;
-    }
-
     public void migrateStoredFiles(String srcPath, String dstPath) throws Exception {
         Cursor c = null;
         if (getContentResolver() != null) {
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 844ddf7e9903..24671199b081 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -218,7 +218,7 @@ public boolean onPreferenceClick(Preference preference) {
         }
         
         boolean helpEnabled = getResources().getBoolean(R.bool.help_enabled);
-        Preference pHelp =  findPreference("help");
+        Preference pHelp = findPreference("help");
         if (pHelp != null ){
             if (helpEnabled) {
                 pHelp.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -264,7 +264,7 @@ public boolean onPreferenceClick(Preference preference) {
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);
                         startActivity(intent);
 
-                        return(true);
+                        return true;
 
                     }
                 });
@@ -442,7 +442,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 ((CheckBoxPreference)mPrefInstantUpload).isChecked());
 
         /* About App */
-       pAboutApp = (Preference) findPreference("about_app");
+       pAboutApp = findPreference("about_app");
        if (pAboutApp != null) { 
                pAboutApp.setTitle(String.format(getString(R.string.about_android),
                        getString(R.string.app_name)));
@@ -585,8 +585,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         if (requestCode == ACTION_SELECT_UPLOAD_PATH && resultCode == RESULT_OK){
 
-            OCFile folderToUpload =
-                    (OCFile) data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
+            OCFile folderToUpload =  data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
 
             mUploadPath = folderToUpload.getRemotePath();
 
@@ -599,8 +598,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
         } else if (requestCode == ACTION_SELECT_UPLOAD_VIDEO_PATH && resultCode == RESULT_OK) {
 
-            OCFile folderToUploadVideo =
-                    (OCFile) data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
+            OCFile folderToUploadVideo = data.getParcelableExtra(UploadPathActivity.EXTRA_FOLDER);
 
             mUploadVideoPath = folderToUploadVideo.getRemotePath();
 
diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index dc73fcc63fb5..bc051799300f 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -37,13 +37,9 @@
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.utils.FileStorageUtils;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 
 /**
  * Created by Bartosz Przybylski on 07.11.2015.
@@ -154,7 +150,7 @@ protected Integer doInBackground(String... args) {
 				rollback();
 				return e.getResId();
 			} catch (MigrationCleanupException e) {
-				Log_OC.w(TAG, "Migration mleanup step failed");
+				Log_OC.w(TAG, "Migration cleanup step failed");
 				return 0;
 			} finally {
 				publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
@@ -205,7 +201,7 @@ void checkDestinationAvailability() throws MigrationException {
 			if (new File(dstFile, MainApp.getDataFolder()).exists())
 				throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
 
-			if (dstFile.getFreeSpace() < calculateUsedSpace(new File(srcFile, MainApp.getDataFolder())))
+			if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))
 				throw new MigrationException(R.string.file_migration_failed_not_enough_space);
 		}
 
@@ -218,38 +214,6 @@ void copyFiles() throws MigrationException {
 			publishProgress(mProgress);
 		}
 
-		private boolean copyFile(File src, File target) {
-			boolean ret = true;
-
-			InputStream in = null;
-			OutputStream out = null;
-
-			try {
-				in = new FileInputStream(src);
-				out = new FileOutputStream(target);
-				byte[] buf = new byte[1024];
-				int len;
-				while ((len = in.read(buf)) > 0) {
-					out.write(buf, 0, len);
-				}
-			} catch (IOException ex) {
-				ret = false;
-			} finally {
-				if (in != null) try {
-					in.close();
-				} catch (IOException e) {
-					e.printStackTrace(System.err);
-				}
-				if (out != null) try {
-					out.close();
-				} catch (IOException e) {
-					e.printStackTrace(System.err);
-				}
-			}
-
-			return ret;
-		}
-
 		void copyDirs(File src, File dst) throws MigrationException {
 			if (!dst.mkdirs())
 				throw new MigrationException(R.string.file_migration_failed_while_coping);
@@ -261,7 +225,7 @@ void copyDirs(File src, File dst) throws MigrationException {
 
 				if (f.isDirectory())
 					copyDirs(f, new File(dst, f.getName()));
-				else if (!copyFile(f, new File(dst, f.getName())))
+				else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))
 					throw new MigrationException(R.string.file_migration_failed_while_coping);
 			}
 
@@ -290,19 +254,6 @@ void rollback() {
 					Log_OC.w(TAG, "Rollback step failed");
 		}
 
-		long calculateUsedSpace(File dir) {
-			long result = 0;
-
-			for (File f : dir.listFiles()) {
-				if (f.isDirectory())
-					result += calculateUsedSpace(f);
-				else
-					result += f.length();
-			}
-
-			return result;
-		}
-
 		void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
 			for (int i = 0; i < accounts.length; ++i)
 				syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 731e3ba9f7c4..25a9e7ff3bee 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -40,6 +40,11 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -50,6 +55,16 @@
 import third_parties.daveKoeller.AlphanumComparator;
 
 
+import android.accounts.Account;
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.net.Uri;
+import android.os.StatFs;
+import android.webkit.MimeTypeMap;
+
+
 /**
  * Static methods to help in access to local file system.
  */
@@ -439,13 +454,11 @@ public int compare(OCFile o1, OCFile o2) {
     public static long getFolderSize(File dir) {
         if (dir.exists()) {
             long result = 0;
-            File[] fileList = dir.listFiles();
-            for(int i = 0; i < fileList.length; i++) {
-                if(fileList[i].isDirectory()) {
-                    result += getFolderSize(fileList[i]);
-                } else {
-                    result += fileList[i].length();
-                }
+            for (File f : dir.listFiles()) {
+                if (f.isDirectory())
+                    result += getFolderSize(f);
+                else
+                    result += f.length();
             }
             return result;
         }
@@ -495,4 +508,36 @@ public static void searchForLocalFileInDefaultPath(OCFile file, Account account)
         }
     }
 
+    public static boolean copyFile(File src, File target) {
+        boolean ret = true;
+
+        InputStream in = null;
+        OutputStream out = null;
+
+        try {
+            in = new FileInputStream(src);
+            out = new FileOutputStream(target);
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0) {
+                out.write(buf, 0, len);
+            }
+        } catch (IOException ex) {
+            ret = false;
+        } finally {
+            if (in != null) try {
+                in.close();
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+            if (out != null) try {
+                out.close();
+            } catch (IOException e) {
+                e.printStackTrace(System.err);
+            }
+        }
+
+        return ret;
+    }
+
 }

From 6722f71be8b5071a58b7da8cc4a68293fb2be580 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 17:44:20 +0100
Subject: [PATCH 06/25] Stop and start logging on migration

---
 .../android/ui/activity/StorageMigrationActivity.java        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index bc051799300f..243e85ff1a7e 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -125,6 +125,8 @@ protected Integer doInBackground(String... args) {
 			Account[] ocAccounts = AccountManager.get(context).getAccountsByType(MainApp.getAccountType());
 			boolean[] oldAutoSync = new boolean[ocAccounts.length];
 
+			Log_OC.stopLogging();
+
 			try {
 				publishProgress(mProgress++, R.string.file_migration_checking_destination);
 
@@ -148,15 +150,18 @@ protected Integer doInBackground(String... args) {
 
 			} catch (MigrationException e) {
 				rollback();
+				Log_OC.startLogging(mStorageSource);
 				return e.getResId();
 			} catch (MigrationCleanupException e) {
 				Log_OC.w(TAG, "Migration cleanup step failed");
+				Log_OC.startLogging(mStorageSource);
 				return 0;
 			} finally {
 				publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
 				restoreAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
 			}
 
+			Log_OC.startLogging(mStorageTarget);
 			publishProgress(mProgress++, R.string.file_migration_ok_finished);
 
 			return 0;

From 8ad388f951f26572373a86c655988abec3a63ceb Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 17:57:14 +0100
Subject: [PATCH 07/25] Soften requirement on cleanup step failures

---
 .../ui/activity/StorageMigrationActivity.java        | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index 243e85ff1a7e..c0b452284aa3 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -106,10 +106,6 @@ private class MigrationException extends Exception {
 			int getResId() { return mResId; }
 		}
 
-		private class MigrationCleanupException extends Exception {
-			MigrationCleanupException() {}
-		}
-
 		@Override
 		protected Integer doInBackground(String... args) {
 
@@ -152,10 +148,6 @@ protected Integer doInBackground(String... args) {
 				rollback();
 				Log_OC.startLogging(mStorageSource);
 				return e.getResId();
-			} catch (MigrationCleanupException e) {
-				Log_OC.w(TAG, "Migration cleanup step failed");
-				Log_OC.startLogging(mStorageSource);
-				return 0;
 			} finally {
 				publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
 				restoreAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
@@ -246,10 +238,10 @@ void updateIndex(Context context) throws MigrationException {
 			}
 		}
 
-		void cleanup() throws MigrationCleanupException {
+		void cleanup() {
 			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
 			if (!srcFile.delete())
-				throw new MigrationCleanupException();
+				Log_OC.w(TAG, "Migration cleanup step failed");
 		}
 
 		void rollback() {

From 0ea54fa91c8a8efef974218426e56a51d12f24f0 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 22:06:53 +0100
Subject: [PATCH 08/25] Fix after rebase

---
 res/xml/preferences.xml                               | 2 +-
 src/com/owncloud/android/ui/activity/Preferences.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 10d227bf5e39..bd3ff55ab2ec 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,7 +19,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 	<PreferenceCategory android:title="@string/prefs_category_general">
-		<Preference
+		<com.owncloud.android.ui.PreferenceWithLongSummary
 			android:title="@string/prefs_storage_path"
 			android:key="storage_path" />
 	</PreferenceCategory>
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 24671199b081..54117d6db69d 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -339,7 +339,7 @@ public boolean onPreferenceClick(Preference preference) {
             }
         }
 
-        mPrefStoragePath =  findPreference("storage_path");
+        mPrefStoragePath =  (PreferenceWithLongSummary)findPreference("storage_path");
         if (mPrefStoragePath != null) {
 
             mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -361,7 +361,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 });
         }
 
-        mPrefInstantUploadPath =  findPreference("instant_upload_path");
+        mPrefInstantUploadPath = (PreferenceWithLongSummary)findPreference("instant_upload_path");
         if (mPrefInstantUploadPath != null){
 
             mPrefInstantUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {

From cec707b5829bd6c128d7823f050da220e9fe08d1 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Sun, 22 Nov 2015 11:20:24 +0100
Subject: [PATCH 09/25] For more reliability delete old files recursively in
 migration cleanup

---
 .../android/ui/activity/StorageMigrationActivity.java | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index c0b452284aa3..ee4f08e17538 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -240,10 +240,19 @@ void updateIndex(Context context) throws MigrationException {
 
 		void cleanup() {
 			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
-			if (!srcFile.delete())
+			if (!deleteRecursive(srcFile))
 				Log_OC.w(TAG, "Migration cleanup step failed");
 		}
 
+		boolean deleteRecursive(File f) {
+			boolean res = true;
+			if (f.isDirectory())
+				for (File c : f.listFiles())
+					res = deleteRecursive(c) && res;
+			return f.delete() && res;
+		}
+
+
 		void rollback() {
 			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
 			if (dstFile.exists())

From 2af111b8cba5dbcf5ca742209d9253d841b973e7 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Sun, 6 Dec 2015 22:44:15 +0100
Subject: [PATCH 10/25] Add DataStorageUtils to detect connected SD cards

---
 res/values/strings.xml                               | 5 +++++
 src/com/owncloud/android/utils/DataStorageUtils.java | 7 +++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/com/owncloud/android/utils/DataStorageUtils.java

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 128b974f946a..f8466bfc954e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -525,4 +525,9 @@
         <item quantity="other">%d selected</item>
     </plurals>
 
+    <string name="storage_description_external">External</string>
+    <string name="storage_description_sd">SD card</string>
+    <string name="storage_description_sd_no">SD card %1$d</string>
+    <string name="storage_description_unknown">Unknown</string>
+
 </resources>
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
new file mode 100644
index 000000000000..75a35a4b0b0f
--- /dev/null
+++ b/src/com/owncloud/android/utils/DataStorageUtils.java
@@ -0,0 +1,7 @@
+package com.owncloud.android.utils;
+
+/**
+ * Created by bartek on 06.12.2015.
+ */
+public class DataStorageUtils {
+}

From 9dc51a4880ac83b04d4b7b866d74400bb861b61b Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 7 Dec 2015 17:24:30 +0100
Subject: [PATCH 11/25] Simplify storage selection process

---
 AndroidManifest.xml                           |   3 +
 res/values/strings.xml                        |   5 +
 res/xml/preferences.xml                       |   2 +-
 src/com/owncloud/android/MainApp.java         |   3 +-
 .../android/ui/activity/Preferences.java      | 104 +++--
 .../android/ui/activity/StorageMigration.java | 391 ++++++++++++++++++
 .../ui/activity/StorageMigrationActivity.java | 290 -------------
 .../android/utils/DataStorageUtils.java       | 102 ++++-
 8 files changed, 568 insertions(+), 332 deletions(-)
 create mode 100644 src/com/owncloud/android/ui/activity/StorageMigration.java
 delete mode 100644 src/com/owncloud/android/ui/activity/StorageMigrationActivity.java

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 26d9b61dd938..22da0d25b27b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,9 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+
     <application
         android:name=".MainApp"
         android:icon="@mipmap/ic_launcher"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f8466bfc954e..cd480e02012f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -356,6 +356,7 @@
     <string name="uploader_upload_forbidden_permissions">to upload in this folder</string>
     <string name="downloader_download_file_not_found">The file is no longer available on the server</string>
 
+    <string name="file_migration_dialog_title">Updating storage path</string>
     <string name="file_migration_finish_button">Finish</string>
     <string name="file_migration_preparing">Preparing for migration...</string>
     <string name="file_migration_checking_destination">Checking destination...</string>
@@ -373,6 +374,10 @@
     <string name="file_migration_failed_while_coping">ERROR: While migrating</string>
     <string name="file_migration_failed_while_updating_index">ERROR: While updating index</string>
 
+    <string name="file_migration_directory_already_exists">Data folder already exists, what to do?</string>
+    <string name="file_migration_override_data_folder">Override</string>
+    <string name="file_migration_use_data_folder">Use existing</string>
+
     <string name="prefs_category_accounts">Accounts</string>
     <string name="prefs_add_account">Add account</string>
     <string name="drawer_manage_accounts">Manage accounts</string>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index bd3ff55ab2ec..df592f68d82f 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -19,7 +19,7 @@
 -->
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 	<PreferenceCategory android:title="@string/prefs_category_general">
-		<com.owncloud.android.ui.PreferenceWithLongSummary
+		<ListPreference
 			android:title="@string/prefs_storage_path"
 			android:key="storage_path" />
 	</PreferenceCategory>
diff --git a/src/com/owncloud/android/MainApp.java b/src/com/owncloud/android/MainApp.java
index 9639ebf3b670..d77c674df7e9 100644
--- a/src/com/owncloud/android/MainApp.java
+++ b/src/com/owncloud/android/MainApp.java
@@ -35,6 +35,7 @@
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory.Policy;
 import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.ui.activity.Preferences;
 
 
 /**
@@ -67,7 +68,7 @@ public void onCreate(){
 
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        MainApp.storagePath = appPrefs.getString("storage_path", Environment.
+        MainApp.storagePath = appPrefs.getString(Preferences.Keys.STORAGE_PATH, Environment.
                               getExternalStorageDirectory().getAbsolutePath());
 
         boolean isSamlAuth = AUTH_ON.equals(getString(R.string.auth_method_saml_web_sso));
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 54117d6db69d..342962890320 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -35,6 +35,7 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.CheckBoxPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.preference.Preference.OnPreferenceClickListener;
@@ -64,12 +65,11 @@
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.PreferenceWithLongSummary;
 import com.owncloud.android.ui.RadioButtonPreference;
+import com.owncloud.android.utils.DataStorageUtils;
 import com.owncloud.android.utils.DisplayUtils;
 
-import java.io.File;
 import java.io.IOException;
 
-
 /**
  * An Activity that allows the user to change the application's settings.
  *
@@ -118,6 +118,10 @@ public class Preferences extends PreferenceActivity {
     private PreferenceWithLongSummary mPrefStoragePath;
     private String mStoragePath;
 
+	public static class Keys {
+		public static final String STORAGE_PATH = "storage_path";
+	}
+
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
@@ -140,7 +144,6 @@ public void onCreate(Bundle savedInstanceState) {
             getWindow().getDecorView().findViewById(actionBarTitleId).
                     setContentDescription(getString(R.string.actionbar_settings));
         }
-        
         // Load package info
         String temp;
         try {
@@ -149,9 +152,9 @@ public void onCreate(Bundle savedInstanceState) {
         } catch (NameNotFoundException e) {
             temp = "";
             Log_OC.e(TAG, "Error while showing about dialog", e);
-        } 
+        }
         final String appVersion = temp;
-       
+
         // Register context menu for list of preferences.
         registerForContextMenu(getListView());
 
@@ -237,7 +240,7 @@ public boolean onPreferenceClick(Preference preference) {
                 preferenceCategory.removePreference(pHelp);
             }
         }
-        
+
        boolean recommendEnabled = getResources().getBoolean(R.bool.recommend_enabled);
        Preference pRecommend =  findPreference("recommend");
         if (pRecommend != null){
@@ -246,11 +249,11 @@ public boolean onPreferenceClick(Preference preference) {
                     @Override
                     public boolean onPreferenceClick(Preference preference) {
 
-                        Intent intent = new Intent(Intent.ACTION_SENDTO); 
+                        Intent intent = new Intent(Intent.ACTION_SENDTO);
                         intent.setType("text/plain");
-                        intent.setData(Uri.parse(getString(R.string.mail_recommend))); 
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); 
-                        
+                        intent.setData(Uri.parse(getString(R.string.mail_recommend)));
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+
                         String appName = getString(R.string.app_name);
                         String downloadUrl = getString(R.string.url_app_download);
 
@@ -259,7 +262,7 @@ public boolean onPreferenceClick(Preference preference) {
                                 appName);
                         String recommendText = String.format(getString(R.string.recommend_text),
                                 appName, downloadUrl);
-                        
+
                         intent.putExtra(Intent.EXTRA_SUBJECT, recommendSubject);
                         intent.putExtra(Intent.EXTRA_TEXT, recommendText);
                         startActivity(intent);
@@ -272,7 +275,7 @@ public boolean onPreferenceClick(Preference preference) {
                 preferenceCategory.removePreference(pRecommend);
             }
         }
-        
+
         boolean feedbackEnabled = getResources().getBoolean(R.bool.feedback_enabled);
         Preference pFeedback =  findPreference("feedback");
         if (pFeedback != null){
@@ -286,11 +289,11 @@ public boolean onPreferenceClick(Preference preference) {
                         Intent intent = new Intent(Intent.ACTION_SENDTO); 
                         intent.setType("text/plain");
                         intent.putExtra(Intent.EXTRA_SUBJECT, feedback);
-                        
-                        intent.setData(Uri.parse(feedbackMail)); 
-                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); 
+
+                        intent.setData(Uri.parse(feedbackMail));
+                        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                         startActivity(intent);
-                        
+
                         return true;
                     }
                 });
@@ -339,26 +342,35 @@ public boolean onPreferenceClick(Preference preference) {
             }
         }
 
-        mPrefStoragePath =  (PreferenceWithLongSummary)findPreference("storage_path");
+        mPrefStoragePath =  (ListPreference) findPreference(Keys.STORAGE_PATH);
         if (mPrefStoragePath != null) {
-
-            mPrefStoragePath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
-                @Override
-                public boolean onPreferenceClick(Preference preference) {
-                    Intent intent = new Intent(Preferences.this, LocalDirectorySelectorActivity.class);
-                    intent.putExtra(UploadFilesActivity.KEY_DIRECTORY_PATH, mStoragePath);
-                    startActivityForResult(intent, ACTION_SELECT_STORAGE_PATH);
-                    return true;
-                }
-            });
+			DataStorageUtils.Storage[] storageOptions = DataStorageUtils.getAvailableStoragePoints(getApplicationContext());
+			String[] entries = new String[storageOptions.length];
+			String[] values = new String[storageOptions.length];
+			for (int i = 0; i < storageOptions.length; ++i) {
+				entries[i] = storageOptions[i].getDescription();
+				values[i] = storageOptions[i].getPath();
+			}
+			mPrefStoragePath.setEntries(entries);
+			mPrefStoragePath.setEntryValues(values);
 
             mPrefStoragePath.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
-                        MainApp.setStoragePath((String) newValue);
+						String newPath = (String)newValue;
+						if (mStoragePath.equals(newPath))
+							return true;
+
+						StorageMigration storageMigration = new StorageMigration(Preferences.this, mStoragePath, newPath);
+
+						storageMigration.setStorageMigrationProgressListener(Preferences.this);
+
+						storageMigration.migrate();
+
                         return true;
                     }
                 });
+
         }
 
         mPrefInstantUploadPath = (PreferenceWithLongSummary)findPreference("instant_upload_path");
@@ -377,7 +389,7 @@ public boolean onPreferenceClick(Preference preference) {
                     }
                 });
         }
-        
+
         mPrefInstantUploadCategory =
                 (PreferenceCategory) findPreference("instant_uploading_category");
 
@@ -385,11 +397,11 @@ public boolean onPreferenceClick(Preference preference) {
         mPrefInstantUploadPathWiFi =  findPreference("instant_upload_on_wifi");
         mPrefInstantPictureUploadOnlyOnCharging = findPreference("instant_upload_on_charging");
         mPrefInstantUpload = findPreference("instant_uploading");
-        
+
         toggleInstantPictureOptions(((CheckBoxPreference) mPrefInstantUpload).isChecked());
-        
+
         mPrefInstantUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
-            
+
             @Override
             public boolean onPreferenceChange(Preference preference, Object newValue) {
                 toggleInstantPictureOptions((Boolean) newValue);
@@ -399,7 +411,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                 return true;
             }
         });
-       
+
         mPrefInstantVideoUploadPath =  findPreference("instant_video_upload_path");
         if (mPrefInstantVideoUploadPath != null){
 
@@ -423,7 +435,7 @@ public boolean onPreferenceClick(Preference preference) {
         mPrefInstantVideoUpload = findPreference("instant_video_uploading");
         mPrefInstantVideoUploadOnlyOnCharging = findPreference("instant_video_upload_on_charging");
         toggleInstantVideoOptions(((CheckBoxPreference) mPrefInstantVideoUpload).isChecked());
-        
+
         mPrefInstantVideoUpload.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
 
             @Override
@@ -523,7 +535,7 @@ private void toggleInstantPictureOptions(Boolean value){
             mPrefInstantUploadCategory.removePreference(mPrefInstantPictureUploadOnlyOnCharging);
         }
     }
-    
+
     private void toggleInstantVideoOptions(Boolean value){
         if (value){
             mPrefInstantUploadCategory.addPreference(mPrefInstantVideoUploadPathWiFi);
@@ -747,9 +759,10 @@ private void saveStoragePath(String newStoragePath) {
         mStoragePath = newStoragePath;
         MainApp.setStoragePath(mStoragePath);
         SharedPreferences.Editor editor = appPrefs.edit();
-        editor.putString("storage_path", mStoragePath);
+        editor.putString(Keys.STORAGE_PATH, mStoragePath);
         editor.commit();
-        mPrefStoragePath.setSummary(mStoragePath);
+		String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, this);
+        mPrefStoragePath.setSummary(storageDescription);
     }
 
     /**
@@ -758,9 +771,10 @@ private void saveStoragePath(String newStoragePath) {
     private void loadStoragePath() {
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        mStoragePath = appPrefs.getString("storage_path", Environment.getExternalStorageDirectory()
+        mStoragePath = appPrefs.getString(Keys.STORAGE_PATH, Environment.getExternalStorageDirectory()
                                                          .getAbsolutePath());
-        mPrefStoragePath.setSummary(mStoragePath);
+		String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, getApplicationContext());
+		mPrefStoragePath.setSummary(storageDescription);
     }
 
     /**
@@ -791,4 +805,16 @@ private void saveInstantUploadVideoPathOnPreferences() {
         editor.putString("instant_video_upload_path", mUploadVideoPath);
         editor.commit();
     }
+
+	@Override
+	public void onStorageMigrationFinished(String storagePath, boolean succeed) {
+		if (succeed) {
+			saveStoragePath(storagePath);
+		}
+	}
+
+	@Override
+	public void onCancelMigration() {
+		// Migration was canceled so we don't do anything
+	}
 }
diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
new file mode 100644
index 000000000000..3496a2b59cfa
--- /dev/null
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -0,0 +1,391 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2015 ownCloud Inc.
+ *   Copyright (C) 2015 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+package com.owncloud.android.ui.activity;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.app.ProgressDialog;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.AsyncTask;
+import android.support.v7.app.AlertDialog;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datamodel.FileDataStorageManager;
+import com.owncloud.android.lib.common.utils.Log_OC;
+import com.owncloud.android.utils.FileStorageUtils;
+
+import java.io.File;
+
+/**
+ * Created by Bartosz Przybylski on 07.11.2015.
+ */
+public class StorageMigration {
+	private static final String TAG = StorageMigration.class.getName();
+
+	public interface StorageMigrationProgressListener {
+		void onStorageMigrationFinished(String storagePath, boolean succeed);
+		void onCancelMigration();
+	}
+
+	private ProgressDialog mProgressDialog;
+	private Context mContext;
+	private String mSourceStoragePath;
+	private String mTargetStoragePath;
+
+	private StorageMigrationProgressListener mListener;
+
+	public StorageMigration(Context context, String sourcePath, String targetPath) {
+		mContext = context;
+		mSourceStoragePath = sourcePath;
+		mTargetStoragePath = targetPath;
+	}
+
+	public void setStorageMigrationProgressListener(StorageMigrationProgressListener listener) {
+		mListener = listener;
+	}
+
+	public void migrate() {
+		if (storageFolderAlreadyExists())
+			askToOverride();
+		else {
+			AlertDialog progressDialog = createMigrationProgressDialog();
+			progressDialog.show();
+			new FileMigrationTask(
+					mContext,
+					mSourceStoragePath,
+					mTargetStoragePath,
+					progressDialog,
+					mListener).execute();
+
+			progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+		}
+	}
+
+	private boolean storageFolderAlreadyExists() {
+		File f = new File(mTargetStoragePath, MainApp.getDataFolder());
+		return f.exists() && f.isDirectory();
+	}
+
+	private void askToOverride() {
+
+		new AlertDialog.Builder(mContext)
+				.setMessage(R.string.file_migration_directory_already_exists)
+				.setCancelable(true)
+				.setOnCancelListener(new DialogInterface.OnCancelListener() {
+					@Override
+					public void onCancel(DialogInterface dialogInterface) {
+						if (mListener != null)
+							mListener.onCancelMigration();
+					}
+				})
+				.setNegativeButton(R.string.common_cancel, new OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						if (mListener != null)
+							mListener.onCancelMigration();
+					}
+				})
+				.setNeutralButton(R.string.file_migration_use_data_folder, new OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						AlertDialog progressDialog = createMigrationProgressDialog();
+						progressDialog.show();
+						new StoragePathSwitchTask(
+								mContext,
+								mSourceStoragePath,
+								mTargetStoragePath,
+								progressDialog,
+								mListener).execute();
+
+						progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+
+					}
+				})
+				.setPositiveButton(R.string.file_migration_override_data_folder, new OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						AlertDialog progressDialog = createMigrationProgressDialog();
+						progressDialog.show();
+						new FileMigrationTask(
+								mContext,
+								mSourceStoragePath,
+								mTargetStoragePath,
+								progressDialog,
+								mListener).execute();
+
+						progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+					}
+				})
+				.create()
+				.show();
+	}
+
+	private AlertDialog createMigrationProgressDialog() {
+		AlertDialog progressDialog = new AlertDialog.Builder(mContext)
+				.setCancelable(false)
+				.setTitle(R.string.file_migration_dialog_title)
+				.setMessage(R.string.file_migration_preparing)
+				.setPositiveButton(R.string.drawer_close, new OnClickListener() {
+					@Override
+					public void onClick(DialogInterface dialogInterface, int i) {
+						dialogInterface.dismiss();
+					}
+				})
+				.create();
+		return progressDialog;
+	}
+
+	abstract static private class FileMigrationTaskBase extends AsyncTask<Void, Integer, Integer> {
+		protected String mStorageSource;
+		protected String mStorageTarget;
+		protected Context mContext;
+		protected AlertDialog mProgressDialog;
+		protected StorageMigrationProgressListener mListener;
+
+		protected String mAuthority;
+		protected Account[] mOcAccounts;
+
+		public FileMigrationTaskBase(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+			mContext = context;
+			mStorageSource = source;
+			mStorageTarget = target;
+			mProgressDialog = progressDialog;
+			mListener = listener;
+
+			mAuthority = mContext.getString(R.string.authority);
+			mOcAccounts = AccountManager.get(mContext).getAccountsByType(MainApp.getAccountType());
+		}
+
+		@Override
+		protected void onProgressUpdate(Integer... progress) {
+			if (progress.length > 1 && progress[0] != 0)
+				mProgressDialog.setMessage(mContext.getString(progress[0]));
+		}
+
+		@Override
+		protected void onPostExecute(Integer code) {
+			if (code != 0) {
+				mProgressDialog.setMessage(mContext.getString(code));
+			} else {
+				mProgressDialog.setMessage(mContext.getString(R.string.file_migration_ok_finished));
+			}
+			mProgressDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+			boolean succeed = code == 0;
+			if (mListener != null)
+				mListener.onStorageMigrationFinished(succeed ? mStorageTarget : mStorageSource, succeed);
+		}
+
+		protected boolean[] saveAccountsSyncStatus() {
+			boolean[] syncs = new boolean[mOcAccounts.length];
+			for (int i = 0; i < mOcAccounts.length; ++i)
+				syncs[i] = ContentResolver.getSyncAutomatically(mOcAccounts[i], mAuthority);
+			return syncs;
+		}
+
+		protected void stopAccountsSyncing() {
+			for (int i = 0; i < mOcAccounts.length; ++i)
+				ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, false);
+		}
+
+		protected void waitForUnfinishedSynchronizations() {
+			for (int i = 0; i < mOcAccounts.length; ++i)
+				while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority))
+					try {
+						Thread.sleep(1000);
+					} catch (InterruptedException e) {
+						Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
+						Thread.currentThread().interrupt();
+					}
+		}
+
+		protected void restoreAccountsSyncStatus(boolean oldSync[]) {
+			for (int i = 0; i < mOcAccounts.length; ++i)
+				ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, oldSync[i]);
+		}
+	}
+
+	static private class StoragePathSwitchTask extends FileMigrationTaskBase {
+
+		public StoragePathSwitchTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+			super(context, source, target, progressDialog, listener);
+		}
+
+		@Override
+		protected Integer doInBackground(Void... voids) {
+			publishProgress(R.string.file_migration_preparing);
+
+			Log_OC.stopLogging();
+			boolean[] syncStates = new boolean[0];
+			try {
+				publishProgress(R.string.file_migration_saving_accounts_configuration);
+				syncStates = saveAccountsSyncStatus();
+
+				publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
+				stopAccountsSyncing();
+				waitForUnfinishedSynchronizations();
+			} finally {
+				publishProgress(R.string.file_migration_restoring_accounts_configuration);
+				restoreAccountsSyncStatus(syncStates);
+			}
+			Log_OC.startLogging(mStorageTarget);
+
+			return 0;
+		}
+	}
+
+	static private class FileMigrationTask extends FileMigrationTaskBase {
+		private class MigrationException extends Exception {
+			private int mResId;
+
+			MigrationException(int resId) {
+				super();
+				this.mResId = resId;
+			}
+
+			int getResId() { return mResId; }
+		}
+
+		public FileMigrationTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+			super(context, source, target, progressDialog, listener);
+		}
+
+		@Override
+		protected Integer doInBackground(Void... args) {
+			publishProgress(R.string.file_migration_preparing);
+			Log_OC.stopLogging();
+
+			boolean[] syncState = new boolean[0];
+
+			try {
+				File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+				deleteRecursive(dstFile);
+				dstFile.delete();
+
+				publishProgress(R.string.file_migration_checking_destination);
+
+				checkDestinationAvailability();
+
+				publishProgress(R.string.file_migration_saving_accounts_configuration);
+				syncState = saveAccountsSyncStatus();
+
+				publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
+				stopAccountsSyncing();
+				waitForUnfinishedSynchronizations();
+
+				publishProgress(R.string.file_migration_migrating);
+				copyFiles();
+
+				publishProgress(R.string.file_migration_updating_index);
+				updateIndex(mContext);
+
+				publishProgress(R.string.file_migration_cleaning);
+				cleanup();
+
+			} catch (MigrationException e) {
+				rollback();
+				Log_OC.startLogging(mStorageSource);
+				return e.getResId();
+			} finally {
+				publishProgress(R.string.file_migration_restoring_accounts_configuration);
+				restoreAccountsSyncStatus(syncState);
+			}
+
+			Log_OC.startLogging(mStorageTarget);
+			publishProgress(R.string.file_migration_ok_finished);
+
+			return 0;
+		}
+
+
+		void checkDestinationAvailability() throws MigrationException {
+			File srcFile = new File(mStorageSource);
+			File dstFile = new File(mStorageTarget);
+
+			if (!dstFile.canRead() || !srcFile.canRead())
+				throw new MigrationException(R.string.file_migration_failed_not_readable);
+
+			if (!dstFile.canWrite() || !srcFile.canWrite())
+				throw new MigrationException(R.string.file_migration_failed_not_writable);
+
+			if (new File(dstFile, MainApp.getDataFolder()).exists())
+				throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
+
+			if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))
+				throw new MigrationException(R.string.file_migration_failed_not_enough_space);
+		}
+
+		void copyFiles() throws MigrationException {
+			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+
+			copyDirs(srcFile, dstFile);
+		}
+
+		void copyDirs(File src, File dst) throws MigrationException {
+			if (!dst.mkdirs())
+				throw new MigrationException(R.string.file_migration_failed_while_coping);
+
+			for (File f : src.listFiles()) {
+				if (f.isDirectory())
+					copyDirs(f, new File(dst, f.getName()));
+				else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))
+					throw new MigrationException(R.string.file_migration_failed_while_coping);
+			}
+
+		}
+
+		void updateIndex(Context context) throws MigrationException {
+			FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
+
+			try {
+				manager.migrateStoredFiles(mStorageSource, mStorageTarget);
+			} catch (Exception e) {
+				throw new MigrationException(R.string.file_migration_failed_while_updating_index);
+			}
+		}
+
+		void cleanup() {
+			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+			if (!deleteRecursive(srcFile))
+				Log_OC.w(TAG, "Migration cleanup step failed");
+			srcFile.delete();
+		}
+
+		boolean deleteRecursive(File f) {
+			boolean res = true;
+			if (f.isDirectory())
+				for (File c : f.listFiles())
+					res = deleteRecursive(c) && res;
+			return f.delete() && res;
+		}
+
+		void rollback() {
+			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+			if (dstFile.exists())
+				if (!dstFile.delete())
+					Log_OC.w(TAG, "Rollback step failed");
+		}
+	}
+}
diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
deleted file mode 100644
index ee4f08e17538..000000000000
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ /dev/null
@@ -1,290 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   @author Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *   Copyright (C) 2015 Bartosz Przybylski
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-package com.owncloud.android.ui.activity;
-
-import android.accounts.Account;
-import android.accounts.AccountManager;
-import android.content.ContentResolver;
-import android.content.Context;
-import android.content.Intent;
-import android.os.AsyncTask;
-import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.view.View;
-import android.widget.Button;
-import android.widget.ProgressBar;
-import android.widget.TextView;
-
-import com.owncloud.android.MainApp;
-import com.owncloud.android.R;
-import com.owncloud.android.datamodel.FileDataStorageManager;
-import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.utils.FileStorageUtils;
-
-import java.io.File;
-
-/**
- * Created by Bartosz Przybylski on 07.11.2015.
- */
-public class StorageMigrationActivity extends AppCompatActivity {
-	private static final String TAG = StorageMigrationActivity.class.getName();
-	public static final String KEY_MIGRATION_TARGET_DIR = "MIGRATION_TARGET";
-	public static final String KEY_MIGRATION_SOURCE_DIR = "MIGRATION_SOURCE";
-
-	private ProgressBar mProgressBar;
-	private Button mFinishButton;
-	private TextView mFeedbackText;
-
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-
-		setContentView(R.layout.migration_layout);
-		mProgressBar = (ProgressBar)findViewById(R.id.migrationProgress);
-		mFinishButton = (Button)findViewById(R.id.finishButton);
-		mFeedbackText = (TextView)findViewById(R.id.migrationText);
-
-		mProgressBar.setProgress(0);
-		mFinishButton.setVisibility(View.INVISIBLE);
-		mFeedbackText.setText(R.string.file_migration_preparing);
-
-		mFinishButton.setOnClickListener(new View.OnClickListener() {
-			@Override
-			public void onClick(View view) {
-				setResult(RESULT_CANCELED);
-				finish();
-			}
-		});
-
-		String source = getIntent().getStringExtra(KEY_MIGRATION_SOURCE_DIR);
-		String destination = getIntent().getStringExtra(KEY_MIGRATION_TARGET_DIR);
-
-		if (source == null || destination == null) {
-			Log_OC.e(TAG, "source or destination is null");
-			finish();
-		}
-
-		new FileMigrationTask().execute(source, destination);
-	}
-
-	private class FileMigrationTask extends AsyncTask<String, Integer, Integer> {
-
-		private String mStorageTarget;
-		private String mStorageSource;
-		private int mProgress;
-
-		private static final int mProgressCopyUpperBound = 98;
-
-		private class MigrationException extends Exception {
-			private int mResId;
-			/*
-			 * @param resId resource identifier to use for displaying error
-			 */
-			MigrationException(int resId) {
-				super();
-				this.mResId = resId;
-			}
-
-			int getResId() { return mResId; }
-		}
-
-		@Override
-		protected Integer doInBackground(String... args) {
-
-			mStorageSource = args[0];
-			mStorageTarget = args[1];
-			mProgress = 0;
-
-			publishProgress(mProgress++, R.string.file_migration_preparing);
-
-			Context context = StorageMigrationActivity.this;
-			String ocAuthority = context.getString(R.string.authority);
-
-			Account[] ocAccounts = AccountManager.get(context).getAccountsByType(MainApp.getAccountType());
-			boolean[] oldAutoSync = new boolean[ocAccounts.length];
-
-			Log_OC.stopLogging();
-
-			try {
-				publishProgress(mProgress++, R.string.file_migration_checking_destination);
-
-				checkDestinationAvailability();
-
-				publishProgress(mProgress++, R.string.file_migration_saving_accounts_configuration);
-				saveAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
-
-				publishProgress(mProgress++, R.string.file_migration_waiting_for_unfinished_sync);
-				stopAccountsSyncing(ocAuthority, ocAccounts);
-				waitForUnfinishedSynchronizations(ocAuthority, ocAccounts);
-
-				publishProgress(mProgress++, R.string.file_migration_migrating);
-				copyFiles();
-
-				publishProgress(mProgress++, R.string.file_migration_updating_index);
-				updateIndex(context);
-
-				publishProgress(mProgress++, R.string.file_migration_cleaning);
-				cleanup();
-
-			} catch (MigrationException e) {
-				rollback();
-				Log_OC.startLogging(mStorageSource);
-				return e.getResId();
-			} finally {
-				publishProgress(mProgress++, R.string.file_migration_restoring_accounts_configuration);
-				restoreAccountsSyncStatus(ocAuthority, ocAccounts, oldAutoSync);
-			}
-
-			Log_OC.startLogging(mStorageTarget);
-			publishProgress(mProgress++, R.string.file_migration_ok_finished);
-
-			return 0;
-		}
-
-		@Override
-		protected void onProgressUpdate(Integer... progress) {
-			mProgressBar.setProgress(progress[0]);
-			if (progress.length > 1)
-				mFeedbackText.setText(progress[1]);
-		}
-
-		@Override
-		protected void onPostExecute(Integer code) {
-			mFinishButton.setVisibility(View.VISIBLE);
-			if (code != 0) {
-				mFeedbackText.setText(code);
-			} else {
-				mFeedbackText.setText(R.string.file_migration_ok_finished);
-				mFinishButton.setOnClickListener(new View.OnClickListener() {
-					@Override
-					public void onClick(View view) {
-						Intent resultIntent = new Intent();
-						resultIntent.putExtra(KEY_MIGRATION_TARGET_DIR, mStorageTarget);
-						setResult(RESULT_OK, resultIntent);
-						finish();
-					}
-				});
-			}
-		}
-
-		void checkDestinationAvailability() throws MigrationException {
-			File srcFile = new File(mStorageSource);
-			File dstFile = new File(mStorageTarget);
-
-			if (!dstFile.canRead() || !srcFile.canRead())
-				throw new MigrationException(R.string.file_migration_failed_not_readable);
-
-			if (!dstFile.canWrite() || !srcFile.canWrite())
-				throw new MigrationException(R.string.file_migration_failed_not_writable);
-
-			if (new File(dstFile, MainApp.getDataFolder()).exists())
-				throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
-
-			if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))
-				throw new MigrationException(R.string.file_migration_failed_not_enough_space);
-		}
-
-		void copyFiles() throws MigrationException {
-			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
-			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
-
-			copyDirs(srcFile, dstFile);
-			mProgress = Math.max(mProgress, mProgressCopyUpperBound);
-			publishProgress(mProgress);
-		}
-
-		void copyDirs(File src, File dst) throws MigrationException {
-			if (!dst.mkdirs())
-				throw new MigrationException(R.string.file_migration_failed_while_coping);
-
-			for (File f : src.listFiles()) {
-
-				mProgress = Math.min(mProgress+1, mProgressCopyUpperBound);
-				publishProgress(mProgress);
-
-				if (f.isDirectory())
-					copyDirs(f, new File(dst, f.getName()));
-				else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))
-					throw new MigrationException(R.string.file_migration_failed_while_coping);
-			}
-
-		}
-
-		void updateIndex(Context context) throws MigrationException {
-			FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
-
-			try {
-				manager.migrateStoredFiles(mStorageSource, mStorageTarget);
-			} catch (Exception e) {
-				throw new MigrationException(R.string.file_migration_failed_while_updating_index);
-			}
-		}
-
-		void cleanup() {
-			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
-			if (!deleteRecursive(srcFile))
-				Log_OC.w(TAG, "Migration cleanup step failed");
-		}
-
-		boolean deleteRecursive(File f) {
-			boolean res = true;
-			if (f.isDirectory())
-				for (File c : f.listFiles())
-					res = deleteRecursive(c) && res;
-			return f.delete() && res;
-		}
-
-
-		void rollback() {
-			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
-			if (dstFile.exists())
-				if (!dstFile.delete())
-					Log_OC.w(TAG, "Rollback step failed");
-		}
-
-		void saveAccountsSyncStatus(String authority, Account accounts[], boolean syncs[]) {
-			for (int i = 0; i < accounts.length; ++i)
-				syncs[i] = ContentResolver.getSyncAutomatically(accounts[i], authority);
-		}
-
-		void stopAccountsSyncing(String authority, Account accounts[]) {
-			for (int i = 0; i < accounts.length; ++i)
-				ContentResolver.setSyncAutomatically(accounts[i], authority, false);
-		}
-
-		void waitForUnfinishedSynchronizations(String authority, Account accounts[]) {
-			for (int i = 0; i < accounts.length; ++i)
-				while (ContentResolver.isSyncActive(accounts[i], authority))
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
-						Thread.currentThread().interrupt();
-					}
-		}
-
-		void restoreAccountsSyncStatus(String authority, Account accounts[], boolean oldSync[]) {
-			for (int i = 0; i < accounts.length; ++i)
-				ContentResolver.setSyncAutomatically(accounts[i], authority, oldSync[i]);
-		}
-
-	}
-}
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
index 75a35a4b0b0f..d720172d8123 100644
--- a/src/com/owncloud/android/utils/DataStorageUtils.java
+++ b/src/com/owncloud/android/utils/DataStorageUtils.java
@@ -1,7 +1,107 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartek Przybylski
+ *   Copyright (C) 2015  Bartosz Przybylski
+ *   Copyright (C) 2015 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
 package com.owncloud.android.utils;
 
+import android.content.Context;
+import android.os.Build;
+import android.os.Environment;
+
+import com.owncloud.android.R;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
 /**
- * Created by bartek on 06.12.2015.
+ * @author Bartosz Przybylski
  */
 public class DataStorageUtils {
+	static public final class Storage {
+		private String mDescription;
+		private String mPath;
+
+		Storage(String description, String path) {
+			mDescription = description;
+			mPath = path;
+		}
+
+		public String getPath() { return mPath; }
+		public String getDescription() { return mDescription; }
+	}
+
+	static public Storage[] getAvailableStoragePoints(Context context) {
+		// Android 6.0 and later changed some internal implementation of accessing storage
+		// so for now we return only single path named "external"
+		// TODO(przybylski): add 6.0 code
+		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
+			return new Storage[] {
+				new Storage(context.getString(R.string.storage_description_external),
+						    Environment.getExternalStorageDirectory().getAbsolutePath())
+			};
+		}
+
+		List<Storage> list = new ArrayList<>();
+
+		String storagePath = Environment.getExternalStorageDirectory().getPath();
+		if (canBeAddedToAvailableList(storagePath))
+			list.add(new Storage(context.getString(R.string.storage_description_external),
+					 			 storagePath));
+
+		storagePath = System.getenv("SECONDARY_STORAGE"); // : separated paths to sd cards
+		list.addAll(getSDCardStorage(storagePath, context));
+
+		//list.add(new Storage("Costam", Environment.getExternalStorageDirectory().getAbsolutePath() + "/costam"));
+
+		return list.toArray(new Storage[list.size()]);
+	}
+
+	static public String getStorageDescriptionByPath(String path, Context context) {
+		Storage[] storages = getAvailableStoragePoints(context);
+		for (Storage s : storages) {
+			if (s.getPath().equals(path))
+				return s.getDescription();
+		}
+		return context.getString(R.string.storage_description_unknown);
+	}
+
+	private static List<Storage> getSDCardStorage(String storagePath, Context context) {
+		if (storagePath == null) return new ArrayList<>();
+
+		String[] paths = storagePath.split(":");
+		List<Storage> list = new ArrayList<>();
+		if (paths.length == 1)
+			list.add(new Storage(context.getString(R.string.storage_description_sd), paths[0]));
+		else
+			for (int i = 0; i < paths.length; ++i) {
+				if (canBeAddedToAvailableList(paths[i]))
+					list.add(new Storage(context.getString(R.string.storage_description_sd_no, i+1),
+							paths[i]));
+			}
+		return list;
+	}
+
+	private static boolean canBeAddedToAvailableList(String path) {
+		if (path == null) return false;
+		File f = new File(path);
+		return f.exists() && f.isDirectory();
+	}
 }

From 47f522d34e65dca6ccc3ee6f820534e26e18bbd0 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 7 Dec 2015 18:28:10 +0100
Subject: [PATCH 12/25] Small code cleanups

---
 .../android/ui/activity/Preferences.java      | 21 +++++++++++--------
 .../android/utils/DataStorageUtils.java       |  2 +-
 .../android/utils/FileStorageUtils.java       |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 342962890320..8a9ebad91431 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -76,7 +76,8 @@
  * It proxies the necessary calls via {@link android.support.v7.app.AppCompatDelegate} to be used
  * with AppCompat.
  */
-public class Preferences extends PreferenceActivity {
+public class Preferences extends PreferenceActivity
+        implements StorageMigration.StorageMigrationProgressListener {
     
     private static final String TAG = Preferences.class.getSimpleName();
 
@@ -120,6 +121,8 @@ public class Preferences extends PreferenceActivity {
 
 	public static class Keys {
 		public static final String STORAGE_PATH = "storage_path";
+		public static final String INSTANT_UPLOAD_PATH = "instant_upload_path";
+		public static final String INSTANT_VIDEO_UPLOAD_PATH = "instant_video_upload_path";
 	}
 
     @SuppressWarnings("deprecation")
@@ -367,13 +370,13 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
 
 						storageMigration.migrate();
 
-                        return true;
+                        return false;
                     }
                 });
 
         }
 
-        mPrefInstantUploadPath = (PreferenceWithLongSummary)findPreference("instant_upload_path");
+        mPrefInstantUploadPath = (PreferenceWithLongSummary)findPreference(Keys.INSTANT_UPLOAD_PATH);
         if (mPrefInstantUploadPath != null){
 
             mPrefInstantUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -412,7 +415,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             }
         });
 
-        mPrefInstantVideoUploadPath =  findPreference("instant_video_upload_path");
+        mPrefInstantVideoUploadPath =  findPreference(Keys.INSTANT_VIDEO_UPLOAD_PATH);
         if (mPrefInstantVideoUploadPath != null){
 
             mPrefInstantVideoUploadPath.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@@ -746,7 +749,7 @@ private AppCompatDelegate getDelegate() {
     private void loadInstantUploadPath() {
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
-        mUploadPath = appPrefs.getString("instant_upload_path", getString(R.string.instant_upload_path));
+        mUploadPath = appPrefs.getString(Keys.INSTANT_UPLOAD_PATH, getString(R.string.instant_upload_path));
         mPrefInstantUploadPath.setSummary(mUploadPath);
     }
 
@@ -763,6 +766,7 @@ private void saveStoragePath(String newStoragePath) {
         editor.commit();
 		String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, this);
         mPrefStoragePath.setSummary(storageDescription);
+		mPrefStoragePath.setValue(newStoragePath);
     }
 
     /**
@@ -784,7 +788,7 @@ private void saveInstantUploadPathOnPreferences() {
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         SharedPreferences.Editor editor = appPrefs.edit();
-        editor.putString("instant_upload_path", mUploadPath);
+        editor.putString(Keys.INSTANT_UPLOAD_PATH, mUploadPath);
         editor.commit();
     }
 
@@ -802,15 +806,14 @@ private void saveInstantUploadVideoPathOnPreferences() {
         SharedPreferences appPrefs =
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         SharedPreferences.Editor editor = appPrefs.edit();
-        editor.putString("instant_video_upload_path", mUploadVideoPath);
+        editor.putString(Keys.INSTANT_VIDEO_UPLOAD_PATH, mUploadVideoPath);
         editor.commit();
     }
 
 	@Override
 	public void onStorageMigrationFinished(String storagePath, boolean succeed) {
-		if (succeed) {
+		if (succeed)
 			saveStoragePath(storagePath);
-		}
 	}
 
 	@Override
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
index d720172d8123..fd46a20e37a9 100644
--- a/src/com/owncloud/android/utils/DataStorageUtils.java
+++ b/src/com/owncloud/android/utils/DataStorageUtils.java
@@ -69,7 +69,7 @@ static public Storage[] getAvailableStoragePoints(Context context) {
 		storagePath = System.getenv("SECONDARY_STORAGE"); // : separated paths to sd cards
 		list.addAll(getSDCardStorage(storagePath, context));
 
-		//list.add(new Storage("Costam", Environment.getExternalStorageDirectory().getAbsolutePath() + "/costam"));
+		list.add(new Storage("Costam", Environment.getExternalStorageDirectory().getAbsolutePath() + "/costam"));
 
 		return list.toArray(new Storage[list.size()]);
 	}
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 25a9e7ff3bee..0ef8459d2b89 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -54,6 +54,7 @@
 
 import third_parties.daveKoeller.AlphanumComparator;
 
+import com.owncloud.android.ui.activity.Preferences;
 
 import android.accounts.Account;
 import android.annotation.SuppressLint;

From 8b587cead2a474dbdbf576cdf535a8829f39740d Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 7 Dec 2015 18:51:42 +0100
Subject: [PATCH 13/25] Tabs to spaces

---
 .../android/ui/activity/Preferences.java      |  66 +-
 .../android/ui/activity/StorageMigration.java | 686 +++++++++---------
 2 files changed, 376 insertions(+), 376 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 8a9ebad91431..0b58bbfe4725 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -119,11 +119,11 @@ public class Preferences extends PreferenceActivity
     private PreferenceWithLongSummary mPrefStoragePath;
     private String mStoragePath;
 
-	public static class Keys {
-		public static final String STORAGE_PATH = "storage_path";
-		public static final String INSTANT_UPLOAD_PATH = "instant_upload_path";
-		public static final String INSTANT_VIDEO_UPLOAD_PATH = "instant_video_upload_path";
-	}
+    public static class Keys {
+        public static final String STORAGE_PATH = "storage_path";
+        public static final String INSTANT_UPLOAD_PATH = "instant_upload_path";
+        public static final String INSTANT_VIDEO_UPLOAD_PATH = "instant_video_upload_path";
+    }
 
     @SuppressWarnings("deprecation")
     @Override
@@ -347,28 +347,28 @@ public boolean onPreferenceClick(Preference preference) {
 
         mPrefStoragePath =  (ListPreference) findPreference(Keys.STORAGE_PATH);
         if (mPrefStoragePath != null) {
-			DataStorageUtils.Storage[] storageOptions = DataStorageUtils.getAvailableStoragePoints(getApplicationContext());
-			String[] entries = new String[storageOptions.length];
-			String[] values = new String[storageOptions.length];
-			for (int i = 0; i < storageOptions.length; ++i) {
-				entries[i] = storageOptions[i].getDescription();
-				values[i] = storageOptions[i].getPath();
-			}
-			mPrefStoragePath.setEntries(entries);
-			mPrefStoragePath.setEntryValues(values);
+            DataStorageUtils.Storage[] storageOptions = DataStorageUtils.getAvailableStoragePoints(getApplicationContext());
+            String[] entries = new String[storageOptions.length];
+            String[] values = new String[storageOptions.length];
+            for (int i = 0; i < storageOptions.length; ++i) {
+                entries[i] = storageOptions[i].getDescription();
+                values[i] = storageOptions[i].getPath();
+            }
+            mPrefStoragePath.setEntries(entries);
+            mPrefStoragePath.setEntryValues(values);
 
             mPrefStoragePath.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
                     @Override
                     public boolean onPreferenceChange(Preference preference, Object newValue) {
-						String newPath = (String)newValue;
-						if (mStoragePath.equals(newPath))
-							return true;
+                        String newPath = (String)newValue;
+                        if (mStoragePath.equals(newPath))
+                            return true;
 
-						StorageMigration storageMigration = new StorageMigration(Preferences.this, mStoragePath, newPath);
+                        StorageMigration storageMigration = new StorageMigration(Preferences.this, mStoragePath, newPath);
 
-						storageMigration.setStorageMigrationProgressListener(Preferences.this);
+                        storageMigration.setStorageMigrationProgressListener(Preferences.this);
 
-						storageMigration.migrate();
+                        storageMigration.migrate();
 
                         return false;
                     }
@@ -764,9 +764,9 @@ private void saveStoragePath(String newStoragePath) {
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString(Keys.STORAGE_PATH, mStoragePath);
         editor.commit();
-		String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, this);
+        String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, this);
         mPrefStoragePath.setSummary(storageDescription);
-		mPrefStoragePath.setValue(newStoragePath);
+        mPrefStoragePath.setValue(newStoragePath);
     }
 
     /**
@@ -777,8 +777,8 @@ private void loadStoragePath() {
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mStoragePath = appPrefs.getString(Keys.STORAGE_PATH, Environment.getExternalStorageDirectory()
                                                          .getAbsolutePath());
-		String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, getApplicationContext());
-		mPrefStoragePath.setSummary(storageDescription);
+        String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, getApplicationContext());
+        mPrefStoragePath.setSummary(storageDescription);
     }
 
     /**
@@ -810,14 +810,14 @@ private void saveInstantUploadVideoPathOnPreferences() {
         editor.commit();
     }
 
-	@Override
-	public void onStorageMigrationFinished(String storagePath, boolean succeed) {
-		if (succeed)
-			saveStoragePath(storagePath);
-	}
+    @Override
+    public void onStorageMigrationFinished(String storagePath, boolean succeed) {
+        if (succeed)
+            saveStoragePath(storagePath);
+    }
 
-	@Override
-	public void onCancelMigration() {
-		// Migration was canceled so we don't do anything
-	}
+    @Override
+    public void onCancelMigration() {
+        // Migration was canceled so we don't do anything
+    }
 }
diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
index 3496a2b59cfa..230db8785592 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigration.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -42,350 +42,350 @@
  * Created by Bartosz Przybylski on 07.11.2015.
  */
 public class StorageMigration {
-	private static final String TAG = StorageMigration.class.getName();
-
-	public interface StorageMigrationProgressListener {
-		void onStorageMigrationFinished(String storagePath, boolean succeed);
-		void onCancelMigration();
-	}
-
-	private ProgressDialog mProgressDialog;
-	private Context mContext;
-	private String mSourceStoragePath;
-	private String mTargetStoragePath;
-
-	private StorageMigrationProgressListener mListener;
-
-	public StorageMigration(Context context, String sourcePath, String targetPath) {
-		mContext = context;
-		mSourceStoragePath = sourcePath;
-		mTargetStoragePath = targetPath;
-	}
-
-	public void setStorageMigrationProgressListener(StorageMigrationProgressListener listener) {
-		mListener = listener;
-	}
-
-	public void migrate() {
-		if (storageFolderAlreadyExists())
-			askToOverride();
-		else {
-			AlertDialog progressDialog = createMigrationProgressDialog();
-			progressDialog.show();
-			new FileMigrationTask(
-					mContext,
-					mSourceStoragePath,
-					mTargetStoragePath,
-					progressDialog,
-					mListener).execute();
-
-			progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-		}
-	}
-
-	private boolean storageFolderAlreadyExists() {
-		File f = new File(mTargetStoragePath, MainApp.getDataFolder());
-		return f.exists() && f.isDirectory();
-	}
-
-	private void askToOverride() {
-
-		new AlertDialog.Builder(mContext)
-				.setMessage(R.string.file_migration_directory_already_exists)
-				.setCancelable(true)
-				.setOnCancelListener(new DialogInterface.OnCancelListener() {
-					@Override
-					public void onCancel(DialogInterface dialogInterface) {
-						if (mListener != null)
-							mListener.onCancelMigration();
-					}
-				})
-				.setNegativeButton(R.string.common_cancel, new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialogInterface, int i) {
-						if (mListener != null)
-							mListener.onCancelMigration();
-					}
-				})
-				.setNeutralButton(R.string.file_migration_use_data_folder, new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialogInterface, int i) {
-						AlertDialog progressDialog = createMigrationProgressDialog();
-						progressDialog.show();
-						new StoragePathSwitchTask(
-								mContext,
-								mSourceStoragePath,
-								mTargetStoragePath,
-								progressDialog,
-								mListener).execute();
-
-						progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-
-					}
-				})
-				.setPositiveButton(R.string.file_migration_override_data_folder, new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialogInterface, int i) {
-						AlertDialog progressDialog = createMigrationProgressDialog();
-						progressDialog.show();
-						new FileMigrationTask(
-								mContext,
-								mSourceStoragePath,
-								mTargetStoragePath,
-								progressDialog,
-								mListener).execute();
-
-						progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
-					}
-				})
-				.create()
-				.show();
-	}
-
-	private AlertDialog createMigrationProgressDialog() {
-		AlertDialog progressDialog = new AlertDialog.Builder(mContext)
-				.setCancelable(false)
-				.setTitle(R.string.file_migration_dialog_title)
-				.setMessage(R.string.file_migration_preparing)
-				.setPositiveButton(R.string.drawer_close, new OnClickListener() {
-					@Override
-					public void onClick(DialogInterface dialogInterface, int i) {
-						dialogInterface.dismiss();
-					}
-				})
-				.create();
-		return progressDialog;
-	}
-
-	abstract static private class FileMigrationTaskBase extends AsyncTask<Void, Integer, Integer> {
-		protected String mStorageSource;
-		protected String mStorageTarget;
-		protected Context mContext;
-		protected AlertDialog mProgressDialog;
-		protected StorageMigrationProgressListener mListener;
-
-		protected String mAuthority;
-		protected Account[] mOcAccounts;
-
-		public FileMigrationTaskBase(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
-			mContext = context;
-			mStorageSource = source;
-			mStorageTarget = target;
-			mProgressDialog = progressDialog;
-			mListener = listener;
-
-			mAuthority = mContext.getString(R.string.authority);
-			mOcAccounts = AccountManager.get(mContext).getAccountsByType(MainApp.getAccountType());
-		}
-
-		@Override
-		protected void onProgressUpdate(Integer... progress) {
-			if (progress.length > 1 && progress[0] != 0)
-				mProgressDialog.setMessage(mContext.getString(progress[0]));
-		}
-
-		@Override
-		protected void onPostExecute(Integer code) {
-			if (code != 0) {
-				mProgressDialog.setMessage(mContext.getString(code));
-			} else {
-				mProgressDialog.setMessage(mContext.getString(R.string.file_migration_ok_finished));
-			}
-			mProgressDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setEnabled(true);
-			boolean succeed = code == 0;
-			if (mListener != null)
-				mListener.onStorageMigrationFinished(succeed ? mStorageTarget : mStorageSource, succeed);
-		}
-
-		protected boolean[] saveAccountsSyncStatus() {
-			boolean[] syncs = new boolean[mOcAccounts.length];
-			for (int i = 0; i < mOcAccounts.length; ++i)
-				syncs[i] = ContentResolver.getSyncAutomatically(mOcAccounts[i], mAuthority);
-			return syncs;
-		}
-
-		protected void stopAccountsSyncing() {
-			for (int i = 0; i < mOcAccounts.length; ++i)
-				ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, false);
-		}
-
-		protected void waitForUnfinishedSynchronizations() {
-			for (int i = 0; i < mOcAccounts.length; ++i)
-				while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority))
-					try {
-						Thread.sleep(1000);
-					} catch (InterruptedException e) {
-						Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
-						Thread.currentThread().interrupt();
-					}
-		}
-
-		protected void restoreAccountsSyncStatus(boolean oldSync[]) {
-			for (int i = 0; i < mOcAccounts.length; ++i)
-				ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, oldSync[i]);
-		}
-	}
-
-	static private class StoragePathSwitchTask extends FileMigrationTaskBase {
-
-		public StoragePathSwitchTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
-			super(context, source, target, progressDialog, listener);
-		}
-
-		@Override
-		protected Integer doInBackground(Void... voids) {
-			publishProgress(R.string.file_migration_preparing);
-
-			Log_OC.stopLogging();
-			boolean[] syncStates = new boolean[0];
-			try {
-				publishProgress(R.string.file_migration_saving_accounts_configuration);
-				syncStates = saveAccountsSyncStatus();
-
-				publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
-				stopAccountsSyncing();
-				waitForUnfinishedSynchronizations();
-			} finally {
-				publishProgress(R.string.file_migration_restoring_accounts_configuration);
-				restoreAccountsSyncStatus(syncStates);
-			}
-			Log_OC.startLogging(mStorageTarget);
-
-			return 0;
-		}
-	}
-
-	static private class FileMigrationTask extends FileMigrationTaskBase {
-		private class MigrationException extends Exception {
-			private int mResId;
-
-			MigrationException(int resId) {
-				super();
-				this.mResId = resId;
-			}
-
-			int getResId() { return mResId; }
-		}
-
-		public FileMigrationTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
-			super(context, source, target, progressDialog, listener);
-		}
-
-		@Override
-		protected Integer doInBackground(Void... args) {
-			publishProgress(R.string.file_migration_preparing);
-			Log_OC.stopLogging();
-
-			boolean[] syncState = new boolean[0];
-
-			try {
-				File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
-				deleteRecursive(dstFile);
-				dstFile.delete();
-
-				publishProgress(R.string.file_migration_checking_destination);
-
-				checkDestinationAvailability();
-
-				publishProgress(R.string.file_migration_saving_accounts_configuration);
-				syncState = saveAccountsSyncStatus();
-
-				publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
-				stopAccountsSyncing();
-				waitForUnfinishedSynchronizations();
-
-				publishProgress(R.string.file_migration_migrating);
-				copyFiles();
-
-				publishProgress(R.string.file_migration_updating_index);
-				updateIndex(mContext);
-
-				publishProgress(R.string.file_migration_cleaning);
-				cleanup();
-
-			} catch (MigrationException e) {
-				rollback();
-				Log_OC.startLogging(mStorageSource);
-				return e.getResId();
-			} finally {
-				publishProgress(R.string.file_migration_restoring_accounts_configuration);
-				restoreAccountsSyncStatus(syncState);
-			}
-
-			Log_OC.startLogging(mStorageTarget);
-			publishProgress(R.string.file_migration_ok_finished);
-
-			return 0;
-		}
-
-
-		void checkDestinationAvailability() throws MigrationException {
-			File srcFile = new File(mStorageSource);
-			File dstFile = new File(mStorageTarget);
-
-			if (!dstFile.canRead() || !srcFile.canRead())
-				throw new MigrationException(R.string.file_migration_failed_not_readable);
-
-			if (!dstFile.canWrite() || !srcFile.canWrite())
-				throw new MigrationException(R.string.file_migration_failed_not_writable);
-
-			if (new File(dstFile, MainApp.getDataFolder()).exists())
-				throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
-
-			if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))
-				throw new MigrationException(R.string.file_migration_failed_not_enough_space);
-		}
-
-		void copyFiles() throws MigrationException {
-			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
-			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
-
-			copyDirs(srcFile, dstFile);
-		}
-
-		void copyDirs(File src, File dst) throws MigrationException {
-			if (!dst.mkdirs())
-				throw new MigrationException(R.string.file_migration_failed_while_coping);
-
-			for (File f : src.listFiles()) {
-				if (f.isDirectory())
-					copyDirs(f, new File(dst, f.getName()));
-				else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))
-					throw new MigrationException(R.string.file_migration_failed_while_coping);
-			}
+    private static final String TAG = StorageMigration.class.getName();
+
+    public interface StorageMigrationProgressListener {
+        void onStorageMigrationFinished(String storagePath, boolean succeed);
+        void onCancelMigration();
+    }
+
+    private ProgressDialog mProgressDialog;
+    private Context mContext;
+    private String mSourceStoragePath;
+    private String mTargetStoragePath;
+
+    private StorageMigrationProgressListener mListener;
+
+    public StorageMigration(Context context, String sourcePath, String targetPath) {
+        mContext = context;
+        mSourceStoragePath = sourcePath;
+        mTargetStoragePath = targetPath;
+    }
+
+    public void setStorageMigrationProgressListener(StorageMigrationProgressListener listener) {
+        mListener = listener;
+    }
+
+    public void migrate() {
+        if (storageFolderAlreadyExists())
+            askToOverride();
+        else {
+            AlertDialog progressDialog = createMigrationProgressDialog();
+            progressDialog.show();
+            new FileMigrationTask(
+                    mContext,
+                    mSourceStoragePath,
+                    mTargetStoragePath,
+                    progressDialog,
+                    mListener).execute();
+
+            progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+        }
+    }
+
+    private boolean storageFolderAlreadyExists() {
+        File f = new File(mTargetStoragePath, MainApp.getDataFolder());
+        return f.exists() && f.isDirectory();
+    }
+
+    private void askToOverride() {
+
+        new AlertDialog.Builder(mContext)
+                .setMessage(R.string.file_migration_directory_already_exists)
+                .setCancelable(true)
+                .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                    @Override
+                    public void onCancel(DialogInterface dialogInterface) {
+                        if (mListener != null)
+                            mListener.onCancelMigration();
+                    }
+                })
+                .setNegativeButton(R.string.common_cancel, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        if (mListener != null)
+                            mListener.onCancelMigration();
+                    }
+                })
+                .setNeutralButton(R.string.file_migration_use_data_folder, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        AlertDialog progressDialog = createMigrationProgressDialog();
+                        progressDialog.show();
+                        new StoragePathSwitchTask(
+                                mContext,
+                                mSourceStoragePath,
+                                mTargetStoragePath,
+                                progressDialog,
+                                mListener).execute();
+
+                        progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+
+                    }
+                })
+                .setPositiveButton(R.string.file_migration_override_data_folder, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        AlertDialog progressDialog = createMigrationProgressDialog();
+                        progressDialog.show();
+                        new FileMigrationTask(
+                                mContext,
+                                mSourceStoragePath,
+                                mTargetStoragePath,
+                                progressDialog,
+                                mListener).execute();
+
+                        progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                    }
+                })
+                .create()
+                .show();
+    }
+
+    private AlertDialog createMigrationProgressDialog() {
+        AlertDialog progressDialog = new AlertDialog.Builder(mContext)
+                .setCancelable(false)
+                .setTitle(R.string.file_migration_dialog_title)
+                .setMessage(R.string.file_migration_preparing)
+                .setPositiveButton(R.string.drawer_close, new OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialogInterface, int i) {
+                        dialogInterface.dismiss();
+                    }
+                })
+                .create();
+        return progressDialog;
+    }
+
+    abstract static private class FileMigrationTaskBase extends AsyncTask<Void, Integer, Integer> {
+        protected String mStorageSource;
+        protected String mStorageTarget;
+        protected Context mContext;
+        protected AlertDialog mProgressDialog;
+        protected StorageMigrationProgressListener mListener;
+
+        protected String mAuthority;
+        protected Account[] mOcAccounts;
+
+        public FileMigrationTaskBase(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+            mContext = context;
+            mStorageSource = source;
+            mStorageTarget = target;
+            mProgressDialog = progressDialog;
+            mListener = listener;
+
+            mAuthority = mContext.getString(R.string.authority);
+            mOcAccounts = AccountManager.get(mContext).getAccountsByType(MainApp.getAccountType());
+        }
+
+        @Override
+        protected void onProgressUpdate(Integer... progress) {
+            if (progress.length > 1 && progress[0] != 0)
+                mProgressDialog.setMessage(mContext.getString(progress[0]));
+        }
+
+        @Override
+        protected void onPostExecute(Integer code) {
+            if (code != 0) {
+                mProgressDialog.setMessage(mContext.getString(code));
+            } else {
+                mProgressDialog.setMessage(mContext.getString(R.string.file_migration_ok_finished));
+            }
+            mProgressDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+            boolean succeed = code == 0;
+            if (mListener != null)
+                mListener.onStorageMigrationFinished(succeed ? mStorageTarget : mStorageSource, succeed);
+        }
+
+        protected boolean[] saveAccountsSyncStatus() {
+            boolean[] syncs = new boolean[mOcAccounts.length];
+            for (int i = 0; i < mOcAccounts.length; ++i)
+                syncs[i] = ContentResolver.getSyncAutomatically(mOcAccounts[i], mAuthority);
+            return syncs;
+        }
+
+        protected void stopAccountsSyncing() {
+            for (int i = 0; i < mOcAccounts.length; ++i)
+                ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, false);
+        }
+
+        protected void waitForUnfinishedSynchronizations() {
+            for (int i = 0; i < mOcAccounts.length; ++i)
+                while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority))
+                    try {
+                        Thread.sleep(1000);
+                    } catch (InterruptedException e) {
+                        Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
+                        Thread.currentThread().interrupt();
+                    }
+        }
+
+        protected void restoreAccountsSyncStatus(boolean oldSync[]) {
+            for (int i = 0; i < mOcAccounts.length; ++i)
+                ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, oldSync[i]);
+        }
+    }
+
+    static private class StoragePathSwitchTask extends FileMigrationTaskBase {
+
+        public StoragePathSwitchTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+            super(context, source, target, progressDialog, listener);
+        }
+
+        @Override
+        protected Integer doInBackground(Void... voids) {
+            publishProgress(R.string.file_migration_preparing);
+
+            Log_OC.stopLogging();
+            boolean[] syncStates = new boolean[0];
+            try {
+                publishProgress(R.string.file_migration_saving_accounts_configuration);
+                syncStates = saveAccountsSyncStatus();
+
+                publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
+                stopAccountsSyncing();
+                waitForUnfinishedSynchronizations();
+            } finally {
+                publishProgress(R.string.file_migration_restoring_accounts_configuration);
+                restoreAccountsSyncStatus(syncStates);
+            }
+            Log_OC.startLogging(mStorageTarget);
+
+            return 0;
+        }
+    }
+
+    static private class FileMigrationTask extends FileMigrationTaskBase {
+        private class MigrationException extends Exception {
+            private int mResId;
+
+            MigrationException(int resId) {
+                super();
+                this.mResId = resId;
+            }
+
+            int getResId() { return mResId; }
+        }
+
+        public FileMigrationTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+            super(context, source, target, progressDialog, listener);
+        }
+
+        @Override
+        protected Integer doInBackground(Void... args) {
+            publishProgress(R.string.file_migration_preparing);
+            Log_OC.stopLogging();
+
+            boolean[] syncState = new boolean[0];
+
+            try {
+                File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+                deleteRecursive(dstFile);
+                dstFile.delete();
+
+                publishProgress(R.string.file_migration_checking_destination);
+
+                checkDestinationAvailability();
+
+                publishProgress(R.string.file_migration_saving_accounts_configuration);
+                syncState = saveAccountsSyncStatus();
+
+                publishProgress(R.string.file_migration_waiting_for_unfinished_sync);
+                stopAccountsSyncing();
+                waitForUnfinishedSynchronizations();
+
+                publishProgress(R.string.file_migration_migrating);
+                copyFiles();
+
+                publishProgress(R.string.file_migration_updating_index);
+                updateIndex(mContext);
+
+                publishProgress(R.string.file_migration_cleaning);
+                cleanup();
+
+            } catch (MigrationException e) {
+                rollback();
+                Log_OC.startLogging(mStorageSource);
+                return e.getResId();
+            } finally {
+                publishProgress(R.string.file_migration_restoring_accounts_configuration);
+                restoreAccountsSyncStatus(syncState);
+            }
+
+            Log_OC.startLogging(mStorageTarget);
+            publishProgress(R.string.file_migration_ok_finished);
+
+            return 0;
+        }
+
+
+        void checkDestinationAvailability() throws MigrationException {
+            File srcFile = new File(mStorageSource);
+            File dstFile = new File(mStorageTarget);
+
+            if (!dstFile.canRead() || !srcFile.canRead())
+                throw new MigrationException(R.string.file_migration_failed_not_readable);
+
+            if (!dstFile.canWrite() || !srcFile.canWrite())
+                throw new MigrationException(R.string.file_migration_failed_not_writable);
+
+            if (new File(dstFile, MainApp.getDataFolder()).exists())
+                throw new MigrationException(R.string.file_migration_failed_dir_already_exists);
+
+            if (dstFile.getFreeSpace() < FileStorageUtils.getFolderSize(new File(srcFile, MainApp.getDataFolder())))
+                throw new MigrationException(R.string.file_migration_failed_not_enough_space);
+        }
+
+        void copyFiles() throws MigrationException {
+            File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+            File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+
+            copyDirs(srcFile, dstFile);
+        }
+
+        void copyDirs(File src, File dst) throws MigrationException {
+            if (!dst.mkdirs())
+                throw new MigrationException(R.string.file_migration_failed_while_coping);
+
+            for (File f : src.listFiles()) {
+                if (f.isDirectory())
+                    copyDirs(f, new File(dst, f.getName()));
+                else if (!FileStorageUtils.copyFile(f, new File(dst, f.getName())))
+                    throw new MigrationException(R.string.file_migration_failed_while_coping);
+            }
 
-		}
-
-		void updateIndex(Context context) throws MigrationException {
-			FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
+        }
+
+        void updateIndex(Context context) throws MigrationException {
+            FileDataStorageManager manager = new FileDataStorageManager(null, context.getContentResolver());
 
-			try {
-				manager.migrateStoredFiles(mStorageSource, mStorageTarget);
-			} catch (Exception e) {
-				throw new MigrationException(R.string.file_migration_failed_while_updating_index);
-			}
-		}
+            try {
+                manager.migrateStoredFiles(mStorageSource, mStorageTarget);
+            } catch (Exception e) {
+                throw new MigrationException(R.string.file_migration_failed_while_updating_index);
+            }
+        }
 
-		void cleanup() {
-			File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
-			if (!deleteRecursive(srcFile))
-				Log_OC.w(TAG, "Migration cleanup step failed");
-			srcFile.delete();
-		}
-
-		boolean deleteRecursive(File f) {
-			boolean res = true;
-			if (f.isDirectory())
-				for (File c : f.listFiles())
-					res = deleteRecursive(c) && res;
-			return f.delete() && res;
-		}
-
-		void rollback() {
-			File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
-			if (dstFile.exists())
-				if (!dstFile.delete())
-					Log_OC.w(TAG, "Rollback step failed");
-		}
-	}
+        void cleanup() {
+            File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+            if (!deleteRecursive(srcFile))
+                Log_OC.w(TAG, "Migration cleanup step failed");
+            srcFile.delete();
+        }
+
+        boolean deleteRecursive(File f) {
+            boolean res = true;
+            if (f.isDirectory())
+                for (File c : f.listFiles())
+                    res = deleteRecursive(c) && res;
+            return f.delete() && res;
+        }
+
+        void rollback() {
+            File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
+            if (dstFile.exists())
+                if (!dstFile.delete())
+                    Log_OC.w(TAG, "Rollback step failed");
+        }
+    }
 }

From 70c690ca7cf41169932ba995f44f6aed0a034906 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Sun, 20 Dec 2015 19:24:12 +0100
Subject: [PATCH 14/25] Use progress dialog instead of alert dialog, for better
 UX

---
 .../android/ui/activity/StorageMigration.java | 52 +++++++++++--------
 .../android/utils/DataStorageUtils.java       |  2 -
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
index 230db8785592..fac9ded10fa7 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigration.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -23,12 +23,13 @@
 import android.accounts.Account;
 import android.accounts.AccountManager;
 import android.app.ProgressDialog;
+import android.app.AlertDialog;
 import android.content.ContentResolver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.DialogInterface.OnClickListener;
 import android.os.AsyncTask;
-import android.support.v7.app.AlertDialog;
+import android.view.View;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
@@ -39,7 +40,7 @@
 import java.io.File;
 
 /**
- * Created by Bartosz Przybylski on 07.11.2015.
+ * @author Bartosz Przybylski
  */
 public class StorageMigration {
     private static final String TAG = StorageMigration.class.getName();
@@ -70,7 +71,7 @@ public void migrate() {
         if (storageFolderAlreadyExists())
             askToOverride();
         else {
-            AlertDialog progressDialog = createMigrationProgressDialog();
+            ProgressDialog progressDialog = createMigrationProgressDialog();
             progressDialog.show();
             new FileMigrationTask(
                     mContext,
@@ -79,7 +80,7 @@ public void migrate() {
                     progressDialog,
                     mListener).execute();
 
-            progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+            progressDialog.getButton(progressDialog.BUTTON_POSITIVE).setVisibility(View.GONE);
         }
     }
 
@@ -110,7 +111,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
                 .setNeutralButton(R.string.file_migration_use_data_folder, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        AlertDialog progressDialog = createMigrationProgressDialog();
+                        ProgressDialog progressDialog = createMigrationProgressDialog();
                         progressDialog.show();
                         new StoragePathSwitchTask(
                                 mContext,
@@ -119,14 +120,14 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                 progressDialog,
                                 mListener).execute();
 
-                        progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                        progressDialog.getButton(ProgressDialog.BUTTON_POSITIVE).setVisibility(View.GONE);
 
                     }
                 })
                 .setPositiveButton(R.string.file_migration_override_data_folder, new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
-                        AlertDialog progressDialog = createMigrationProgressDialog();
+                        ProgressDialog progressDialog = createMigrationProgressDialog();
                         progressDialog.show();
                         new FileMigrationTask(
                                 mContext,
@@ -135,25 +136,27 @@ public void onClick(DialogInterface dialogInterface, int i) {
                                 progressDialog,
                                 mListener).execute();
 
-                        progressDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(false);
+                        progressDialog.getButton(ProgressDialog.BUTTON_POSITIVE).setVisibility(View.GONE);
                     }
                 })
                 .create()
                 .show();
     }
 
-    private AlertDialog createMigrationProgressDialog() {
-        AlertDialog progressDialog = new AlertDialog.Builder(mContext)
-                .setCancelable(false)
-                .setTitle(R.string.file_migration_dialog_title)
-                .setMessage(R.string.file_migration_preparing)
-                .setPositiveButton(R.string.drawer_close, new OnClickListener() {
+    private ProgressDialog createMigrationProgressDialog() {
+        ProgressDialog progressDialog = new ProgressDialog(mContext);
+        progressDialog.setCancelable(false);
+        progressDialog.setTitle(R.string.file_migration_dialog_title);
+        progressDialog.setMessage(mContext.getString(R.string.file_migration_preparing));
+        progressDialog.setButton(
+                ProgressDialog.BUTTON_POSITIVE,
+                mContext.getString(R.string.drawer_close),
+                new OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialogInterface, int i) {
                         dialogInterface.dismiss();
                     }
-                })
-                .create();
+                });
         return progressDialog;
     }
 
@@ -161,13 +164,13 @@ abstract static private class FileMigrationTaskBase extends AsyncTask<Void, Inte
         protected String mStorageSource;
         protected String mStorageTarget;
         protected Context mContext;
-        protected AlertDialog mProgressDialog;
+        protected ProgressDialog mProgressDialog;
         protected StorageMigrationProgressListener mListener;
 
         protected String mAuthority;
         protected Account[] mOcAccounts;
 
-        public FileMigrationTaskBase(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+        public FileMigrationTaskBase(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
             mContext = context;
             mStorageSource = source;
             mStorageTarget = target;
@@ -191,8 +194,15 @@ protected void onPostExecute(Integer code) {
             } else {
                 mProgressDialog.setMessage(mContext.getString(R.string.file_migration_ok_finished));
             }
-            mProgressDialog.getButton(android.app.AlertDialog.BUTTON_POSITIVE).setEnabled(true);
+
             boolean succeed = code == 0;
+            if (succeed) {
+                mProgressDialog.hide();
+            } else {
+                mProgressDialog.getButton(ProgressDialog.BUTTON_POSITIVE).setVisibility(View.VISIBLE);
+                mProgressDialog.setIndeterminateDrawable(mContext.getResources().getDrawable(R.drawable.image_fail));
+            }
+
             if (mListener != null)
                 mListener.onStorageMigrationFinished(succeed ? mStorageTarget : mStorageSource, succeed);
         }
@@ -228,7 +238,7 @@ protected void restoreAccountsSyncStatus(boolean oldSync[]) {
 
     static private class StoragePathSwitchTask extends FileMigrationTaskBase {
 
-        public StoragePathSwitchTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+        public StoragePathSwitchTask(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
             super(context, source, target, progressDialog, listener);
         }
 
@@ -267,7 +277,7 @@ private class MigrationException extends Exception {
             int getResId() { return mResId; }
         }
 
-        public FileMigrationTask(Context context, String source, String target, AlertDialog progressDialog, StorageMigrationProgressListener listener) {
+        public FileMigrationTask(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
             super(context, source, target, progressDialog, listener);
         }
 
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
index fd46a20e37a9..dc0aa9ccb745 100644
--- a/src/com/owncloud/android/utils/DataStorageUtils.java
+++ b/src/com/owncloud/android/utils/DataStorageUtils.java
@@ -69,8 +69,6 @@ static public Storage[] getAvailableStoragePoints(Context context) {
 		storagePath = System.getenv("SECONDARY_STORAGE"); // : separated paths to sd cards
 		list.addAll(getSDCardStorage(storagePath, context));
 
-		list.add(new Storage("Costam", Environment.getExternalStorageDirectory().getAbsolutePath() + "/costam"));
-
 		return list.toArray(new Storage[list.size()]);
 	}
 

From 4265c60b92517672148d1537119a5c0d891180c5 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Wed, 23 Dec 2015 21:23:31 +0100
Subject: [PATCH 15/25] Change the way of fetching mounted resources, use
 system tools and parse results

---
 res/values/strings.xml                        |  3 +-
 .../android/utils/DataStorageUtils.java       | 89 +++++++++++--------
 2 files changed, 55 insertions(+), 37 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cd480e02012f..71c80593ef3a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -530,8 +530,7 @@
         <item quantity="other">%d selected</item>
     </plurals>
 
-    <string name="storage_description_external">External</string>
-    <string name="storage_description_sd">SD card</string>
+    <string name="storage_description_default">Default</string>
     <string name="storage_description_sd_no">SD card %1$d</string>
     <string name="storage_description_unknown">Unknown</string>
 
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
index dc0aa9ccb745..fbe6a562f9a4 100644
--- a/src/com/owncloud/android/utils/DataStorageUtils.java
+++ b/src/com/owncloud/android/utils/DataStorageUtils.java
@@ -28,8 +28,10 @@
 import com.owncloud.android.R;
 
 import java.io.File;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * @author Bartosz Przybylski
@@ -49,30 +51,24 @@ static public final class Storage {
 	}
 
 	static public Storage[] getAvailableStoragePoints(Context context) {
-		// Android 6.0 and later changed some internal implementation of accessing storage
-		// so for now we return only single path named "external"
-		// TODO(przybylski): add 6.0 code
-		if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
-			return new Storage[] {
-				new Storage(context.getString(R.string.storage_description_external),
-						    Environment.getExternalStorageDirectory().getAbsolutePath())
-			};
-		}
+        List<Storage> result = new ArrayList<>();
+
+        String storagePath = Environment.getExternalStorageDirectory().getPath();
+        if (canBeAddedToAvailableList(result, storagePath))
+            result.add(new Storage(context.getString(R.string.storage_description_default),
+                    storagePath));
 
-		List<Storage> list = new ArrayList<>();
 
-		String storagePath = Environment.getExternalStorageDirectory().getPath();
-		if (canBeAddedToAvailableList(storagePath))
-			list.add(new Storage(context.getString(R.string.storage_description_external),
-					 			 storagePath));
+        int cardNo = 1;
 
-		storagePath = System.getenv("SECONDARY_STORAGE"); // : separated paths to sd cards
-		list.addAll(getSDCardStorage(storagePath, context));
+        for (String potentialPath : getPotentialPaths(getMountedResources()))
+            if (canBeAddedToAvailableList(result, potentialPath))
+                result.add(new Storage(constructSDCardName(context, cardNo++), potentialPath));
 
-		return list.toArray(new Storage[list.size()]);
+        return result.toArray(new Storage[result.size()]);
 	}
 
-	static public String getStorageDescriptionByPath(String path, Context context) {
+	public static String getStorageDescriptionByPath(String path, Context context) {
 		Storage[] storages = getAvailableStoragePoints(context);
 		for (Storage s : storages) {
 			if (s.getPath().equals(path))
@@ -81,24 +77,47 @@ static public String getStorageDescriptionByPath(String path, Context context) {
 		return context.getString(R.string.storage_description_unknown);
 	}
 
-	private static List<Storage> getSDCardStorage(String storagePath, Context context) {
-		if (storagePath == null) return new ArrayList<>();
-
-		String[] paths = storagePath.split(":");
-		List<Storage> list = new ArrayList<>();
-		if (paths.length == 1)
-			list.add(new Storage(context.getString(R.string.storage_description_sd), paths[0]));
-		else
-			for (int i = 0; i < paths.length; ++i) {
-				if (canBeAddedToAvailableList(paths[i]))
-					list.add(new Storage(context.getString(R.string.storage_description_sd_no, i+1),
-							paths[i]));
-			}
-		return list;
-	}
-
-	private static boolean canBeAddedToAvailableList(String path) {
+    private static String constructSDCardName(Context context, int no) {
+        return context.getString(R.string.storage_description_sd_no, no);
+    }
+
+    private static String getMountedResources() {
+        String s = "";
+        try {
+            final Process process = new ProcessBuilder().command("mount")
+                    .redirectErrorStream(true).start();
+
+            process.waitFor();
+            final InputStream is = process.getInputStream();
+            final byte buffer[] = new byte[1024];
+            while (is.read(buffer) != -1)
+                s += new String(buffer);
+            is.close();
+        } catch (final Exception e) { }
+        return s;
+    }
+
+    private static String[] getPotentialPaths(String mounted) {
+        final List<String> result = new ArrayList<String>();
+        final String reg = "(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4).*rw.*";
+
+        for (String line : mounted.split("\n"))
+            if (!line.toLowerCase(Locale.US).contains("asec") && line.matches(reg)) {
+                    String parts[] = line.split(" ");
+                    for (String path : parts) {
+                        if (path.startsWith("/") &&
+                                !path.toLowerCase(Locale.US).contains("vold"))
+                            result.add(path);
+                    }
+            }
+        return result.toArray(new String[result.size()]);
+    }
+
+	private static boolean canBeAddedToAvailableList(List<Storage> currentList, String path) {
 		if (path == null) return false;
+        for (Storage storage : currentList)
+            if (storage.getPath().equals(path))
+                return false;
 		File f = new File(path);
 		return f.exists() && f.isDirectory();
 	}

From a9f55d5d96245c57e892a7e7327827af940cb90d Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Wed, 30 Dec 2015 14:11:50 +0100
Subject: [PATCH 16/25] Handle case of migration of empty src directory

---
 src/com/owncloud/android/ui/activity/StorageMigration.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
index fac9ded10fa7..77629d513977 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigration.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -293,6 +293,9 @@ protected Integer doInBackground(Void... args) {
                 deleteRecursive(dstFile);
                 dstFile.delete();
 
+                File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
+                srcFile.mkdirs();
+
                 publishProgress(R.string.file_migration_checking_destination);
 
                 checkDestinationAvailability();

From 5cf019d9de67f2310e740ca53fba08bf048a13e1 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Fri, 1 Jan 2016 14:40:18 +0100
Subject: [PATCH 17/25] Because of multiple underlying implementation of
 storage mount points introduce a mechanism which is querying multiple
 solutions and lists them to the user

---
 .../datastorage/DataStorageProvider.java      |  85 ++++++++++++
 .../android/datastorage/StoragePoint.java     |  43 ++++++
 .../datastorage/UniqueStorageList.java        |  54 ++++++++
 .../AbstractCommandLineStoragePoint.java      |  64 +++++++++
 .../AbstractStoragePointProvider.java         |  42 ++++++
 .../EnvironmentStoragePointProvider.java      |  58 ++++++++
 .../HardcodedStoragePointProvider.java        |  56 ++++++++
 .../providers/IStoragePointProvider.java      |  48 +++++++
 .../MountCommandStoragePointProvider.java     |  67 ++++++++++
 .../SystemDefaultStoragePointProvider.java    |  52 ++++++++
 .../providers/VDCStoragePointProvider.java    |  79 +++++++++++
 .../android/ui/activity/Preferences.java      |  13 +-
 .../android/utils/DataStorageUtils.java       | 124 ------------------
 13 files changed, 657 insertions(+), 128 deletions(-)
 create mode 100644 src/com/owncloud/android/datastorage/DataStorageProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/StoragePoint.java
 create mode 100644 src/com/owncloud/android/datastorage/UniqueStorageList.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
 create mode 100644 src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
 delete mode 100644 src/com/owncloud/android/utils/DataStorageUtils.java

diff --git a/src/com/owncloud/android/datastorage/DataStorageProvider.java b/src/com/owncloud/android/datastorage/DataStorageProvider.java
new file mode 100644
index 000000000000..3749d83ec121
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/DataStorageProvider.java
@@ -0,0 +1,85 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datastorage.providers.EnvironmentStoragePointProvider;
+import com.owncloud.android.datastorage.providers.HardcodedStoragePointProvider;
+import com.owncloud.android.datastorage.providers.IStoragePointProvider;
+import com.owncloud.android.datastorage.providers.MountCommandStoragePointProvider;
+import com.owncloud.android.datastorage.providers.SystemDefaultStoragePointProvider;
+import com.owncloud.android.datastorage.providers.VDCStoragePointProvider;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class DataStorageProvider {
+
+    private static Vector<IStoragePointProvider> mStorageProviders = new Vector<>();
+    private static UniqueStorageList mCachedStoragePoints = new UniqueStorageList();
+    private static DataStorageProvider sInstance = new DataStorageProvider() {{
+        // There is no system wide way to get usb storage so we need to provide multiple
+        // handcrafted ways to add those.
+        addStoragePointProvider(new SystemDefaultStoragePointProvider());
+        addStoragePointProvider(new EnvironmentStoragePointProvider());
+        addStoragePointProvider(new VDCStoragePointProvider());
+        addStoragePointProvider(new MountCommandStoragePointProvider());
+        addStoragePointProvider(new HardcodedStoragePointProvider());
+    }};
+
+
+    public static DataStorageProvider getInstance() {
+        return sInstance;
+    }
+
+    private DataStorageProvider() {}
+
+    public StoragePoint[] getAvailableStoragePoints() {
+        if (mCachedStoragePoints.size() != 0)
+            return mCachedStoragePoints.toArray(new StoragePoint[mCachedStoragePoints.size()]);
+
+
+        for (IStoragePointProvider p : mStorageProviders)
+            if (p.canProvideStoragePoints())
+                mCachedStoragePoints.addAll(p.getAvailableStoragePoint());
+
+        return mCachedStoragePoints.toArray(new StoragePoint[mCachedStoragePoints.size()]);
+    }
+
+    public String getStorageDescriptionByPath(String path) {
+        for (StoragePoint s : getAvailableStoragePoints())
+            if (s.getPath().equals(path))
+                return s.getDescription();
+        return MainApp.getAppContext().getString(R.string.storage_description_unknown);
+    }
+
+    public void addStoragePointProvider(IStoragePointProvider provider) {
+        mStorageProviders.add(provider);
+    }
+
+    public void removeStoragePointProvider(IStoragePointProvider provider) {
+        mStorageProviders.remove(provider);
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/StoragePoint.java b/src/com/owncloud/android/datastorage/StoragePoint.java
new file mode 100644
index 000000000000..ad8ba8e6992a
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/StoragePoint.java
@@ -0,0 +1,43 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartek Przybylski
+ *   Copyright (C) 2016  Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class StoragePoint implements Comparable<StoragePoint> {
+    private String mDescription;
+    private String mPath;
+
+    public StoragePoint(String description, String path) {
+        mDescription = description;
+        mPath = path;
+    }
+
+    public String getPath() { return mPath; }
+    public String getDescription() { return mDescription; }
+
+    @Override
+    public int compareTo(StoragePoint another) {
+        return mPath.compareTo(another.getPath());
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/UniqueStorageList.java b/src/com/owncloud/android/datastorage/UniqueStorageList.java
new file mode 100644
index 000000000000..0eb65e82f42b
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/UniqueStorageList.java
@@ -0,0 +1,54 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class UniqueStorageList extends Vector<StoragePoint> {
+    @Override
+    public boolean add(StoragePoint sp) {
+        try {
+            for (StoragePoint s : this) {
+                String thisCanonPath = new File(s.getPath()).getCanonicalPath();
+                String otherCanonPath = new File(sp.getPath()).getCanonicalPath();
+                if (thisCanonPath.equals(otherCanonPath))
+                    return true;
+            }
+        } catch (IOException e) {
+            return false;
+        }
+        return super.add(sp);
+    }
+
+    @Override
+    public synchronized boolean addAll(Collection<? extends StoragePoint> collection) {
+        for (StoragePoint sp : collection)
+            add(sp);
+        return true;
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java b/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
new file mode 100644
index 000000000000..baac49177569
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
@@ -0,0 +1,64 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import java.io.InputStream;
+import java.util.Arrays;
+
+/**
+ * @author Bartosz Przybylski
+ */
+abstract public class AbstractCommandLineStoragePoint extends AbstractStoragePointProvider {
+
+    static protected final int sCommandLineOKReturnValue = 0;
+
+    protected abstract String[] getCommand();
+
+    @Override
+    public boolean canProvideStoragePoints() {
+        Process process;
+        try {
+            process = new ProcessBuilder().command(Arrays.asList(getCommand())).start();
+            process.waitFor();
+        } catch (Exception e) {
+            return false;
+        }
+        return process != null && process.exitValue() == sCommandLineOKReturnValue;
+    }
+
+    protected String getCommandLineResult() {
+        String s = "";
+        try {
+            final Process process = new ProcessBuilder().command(getCommand())
+                    .redirectErrorStream(true).start();
+
+            process.waitFor();
+            final InputStream is = process.getInputStream();
+            final byte buffer[] = new byte[1024];
+            while (is.read(buffer) != -1)
+                s += new String(buffer);
+            is.close();
+        } catch (final Exception e) { }
+        return s;
+    }
+
+}
diff --git a/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
new file mode 100644
index 000000000000..20b4c5ab0462
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
@@ -0,0 +1,42 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.io.File;
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+abstract public class AbstractStoragePointProvider implements IStoragePointProvider {
+
+    protected boolean canBeAddedToAvailableList(Vector<StoragePoint> currentList, String path) {
+        if (path == null) return false;
+        for (StoragePoint storage : currentList)
+            if (storage.getPath().equals(path))
+                return false;
+        File f = new File(path);
+        return f.exists() && f.isDirectory() && f.canRead() && f.canWrite();
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
new file mode 100644
index 000000000000..b8ccc8d5fdf2
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
@@ -0,0 +1,58 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import android.text.TextUtils;
+
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class EnvironmentStoragePointProvider extends AbstractStoragePointProvider {
+
+    private static final String sSecondaryStorageEnvName = "SECONDARY_STORAGE";
+
+    @Override
+    public boolean canProvideStoragePoints() {
+        return !TextUtils.isEmpty(System.getenv(sSecondaryStorageEnvName));
+    }
+
+    @Override
+    public Vector<StoragePoint> getAvailableStoragePoint() {
+        Vector<StoragePoint> result = new Vector<>();
+
+        addEntriesFromEnv(result, sSecondaryStorageEnvName);
+
+        return result;
+    }
+
+    private void addEntriesFromEnv(Vector<StoragePoint> result, String envName) {
+        String env = System.getenv(envName);
+        if (env != null)
+            for (String p : env.split(":"))
+                if (canBeAddedToAvailableList(result, p))
+                    result.add(new StoragePoint(p, p));
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
new file mode 100644
index 000000000000..2e7d010059f1
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
@@ -0,0 +1,56 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class HardcodedStoragePointProvider extends AbstractStoragePointProvider {
+
+    static private final String[] sPaths = {
+            "/mnt/external_sd/",
+            "/mnt/extSdCard/",
+            "/storage/extSdCard",
+            "/storage/sdcard1/",
+            "/storage/usbcard1/"
+    };
+
+    @Override
+    public boolean canProvideStoragePoints() {
+        return true;
+    }
+
+    @Override
+    public Vector<StoragePoint> getAvailableStoragePoint() {
+        Vector<StoragePoint> result = new Vector<>();
+
+        for (String s : sPaths)
+            if (canBeAddedToAvailableList(result, s))
+                result.add(new StoragePoint(s, s));
+
+        return result;
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
new file mode 100644
index 000000000000..d6d59750a82c
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
@@ -0,0 +1,48 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public interface IStoragePointProvider {
+
+    /**
+     *  This method is used for querying storage provider to check if it can provide
+     *  usable and reliable data storage places.
+     *
+     *  @return true if provider can reliably return storage path
+     */
+    boolean canProvideStoragePoints();
+
+
+    /**
+     *
+     * @return available storage points
+     */
+    Vector<StoragePoint> getAvailableStoragePoint();
+
+}
diff --git a/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
new file mode 100644
index 000000000000..53789ca605a4
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
@@ -0,0 +1,67 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.util.Locale;
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class MountCommandStoragePointProvider extends AbstractCommandLineStoragePoint {
+
+    static private final String[] sCommand = new String[] { "mount" };
+
+    @Override
+    protected String[] getCommand() {
+        return sCommand;
+    }
+
+    @Override
+    public Vector<StoragePoint> getAvailableStoragePoint() {
+        Vector<StoragePoint> result = new Vector<>();
+
+        for (String p : getPotentialPaths(getCommandLineResult()))
+            if (canBeAddedToAvailableList(result, p))
+                result.add(new StoragePoint(p, p));
+
+        return result;
+    }
+
+    private Vector<String> getPotentialPaths(String mounted) {
+        final Vector<String> result = new Vector<>();
+        final String reg = "(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4).*rw.*";
+
+        for (String line : mounted.split("\n"))
+            if (!line.toLowerCase(Locale.US).contains("asec") && line.matches(reg)) {
+                String parts[] = line.split(" ");
+                for (String path : parts) {
+                    if (path.startsWith("/") &&
+                            !path.toLowerCase(Locale.US).contains("vold"))
+                        result.add(path);
+                }
+            }
+        return result;
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
new file mode 100644
index 000000000000..3eda025317b1
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
@@ -0,0 +1,52 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import android.os.Environment;
+
+import com.owncloud.android.MainApp;
+import com.owncloud.android.R;
+import com.owncloud.android.datastorage.StoragePoint;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class SystemDefaultStoragePointProvider extends AbstractStoragePointProvider {
+    @Override
+    public boolean canProvideStoragePoints() {
+        return true;
+    }
+
+    @Override
+    public Vector<StoragePoint> getAvailableStoragePoint() {
+        Vector<StoragePoint> result = new Vector<>();
+
+        final String defaultStringDesc =
+                MainApp.getAppContext().getString(R.string.storage_description_default);
+        final String path = Environment.getExternalStorageDirectory().getAbsolutePath();
+        result.add(new StoragePoint(defaultStringDesc, path));
+
+        return result;
+    }
+}
diff --git a/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
new file mode 100644
index 000000000000..5f42d4bf3c61
--- /dev/null
+++ b/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
@@ -0,0 +1,79 @@
+/**
+ *   ownCloud Android client application
+ *
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License version 2,
+ *   as published by the Free Software Foundation.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+package com.owncloud.android.datastorage.providers;
+
+import com.owncloud.android.datastorage.StoragePoint;
+import com.owncloud.android.lib.common.utils.Log_OC;
+
+import java.util.Vector;
+
+/**
+ * @author Bartosz Przybylski
+ */
+public class VDCStoragePointProvider extends AbstractCommandLineStoragePoint {
+
+    static private final String TAG = VDCStoragePointProvider.class.getSimpleName();
+
+    static private final String[] sVDCVolListCommand = new String[]{ "/system/bin/vdc", "volume", "list" };
+    static private final int sVDCVolumeList = 110;
+
+
+    @Override
+    public Vector<StoragePoint> getAvailableStoragePoint() {
+        Vector<StoragePoint> result = new Vector<>();
+
+        result.addAll(getPaths(getCommandLineResult()));
+
+        return result;
+    }
+
+    @Override
+    protected String[] getCommand() {
+        return sVDCVolListCommand;
+    }
+
+    private Vector<StoragePoint> getPaths(String vdcResources) {
+        Vector<StoragePoint> result = new Vector<>();
+
+        for (String line : vdcResources.split("\n")) {
+            String vdcLine[] = line.split(" ");
+            try {
+                int status = Integer.parseInt(vdcLine[0]);
+                if (status != sVDCVolumeList)
+                    continue;
+                final String description = vdcLine[1];
+                final String path = vdcLine[2];
+
+                if (canBeAddedToAvailableList(result, path))
+                    result.add(new StoragePoint(description, path));
+
+            } catch (NumberFormatException e) {
+                Log_OC.e(TAG, "Incorrect VDC output format " + e);
+            } catch (Exception e) {
+                Log_OC.e(TAG, "Unexpected exception on VDC parsing " + e);
+            }
+        }
+
+        return result;
+    }
+
+}
diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 0b58bbfe4725..3f6a13a1518b 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -59,13 +59,18 @@
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
+import com.owncloud.android.datastorage.DataStorageProvider;
+import com.owncloud.android.datastorage.StoragePoint;
+import com.owncloud.android.db.DbHandler;
+import com.owncloud.android.files.FileOperationsHelper;
+import com.owncloud.android.files.services.FileDownloader;
+import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.PreferenceWithLongSummary;
 import com.owncloud.android.ui.RadioButtonPreference;
-import com.owncloud.android.utils.DataStorageUtils;
 import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.IOException;
@@ -347,7 +352,7 @@ public boolean onPreferenceClick(Preference preference) {
 
         mPrefStoragePath =  (ListPreference) findPreference(Keys.STORAGE_PATH);
         if (mPrefStoragePath != null) {
-            DataStorageUtils.Storage[] storageOptions = DataStorageUtils.getAvailableStoragePoints(getApplicationContext());
+            StoragePoint[] storageOptions = DataStorageProvider.getInstance().getAvailableStoragePoints();
             String[] entries = new String[storageOptions.length];
             String[] values = new String[storageOptions.length];
             for (int i = 0; i < storageOptions.length; ++i) {
@@ -764,7 +769,7 @@ private void saveStoragePath(String newStoragePath) {
         SharedPreferences.Editor editor = appPrefs.edit();
         editor.putString(Keys.STORAGE_PATH, mStoragePath);
         editor.commit();
-        String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, this);
+        String storageDescription = DataStorageProvider.getInstance().getStorageDescriptionByPath(mStoragePath);
         mPrefStoragePath.setSummary(storageDescription);
         mPrefStoragePath.setValue(newStoragePath);
     }
@@ -777,7 +782,7 @@ private void loadStoragePath() {
                 PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
         mStoragePath = appPrefs.getString(Keys.STORAGE_PATH, Environment.getExternalStorageDirectory()
                                                          .getAbsolutePath());
-        String storageDescription = DataStorageUtils.getStorageDescriptionByPath(mStoragePath, getApplicationContext());
+        String storageDescription = DataStorageProvider.getInstance().getStorageDescriptionByPath(mStoragePath);
         mPrefStoragePath.setSummary(storageDescription);
     }
 
diff --git a/src/com/owncloud/android/utils/DataStorageUtils.java b/src/com/owncloud/android/utils/DataStorageUtils.java
deleted file mode 100644
index fbe6a562f9a4..000000000000
--- a/src/com/owncloud/android/utils/DataStorageUtils.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- *   ownCloud Android client application
- *
- *   @author Bartek Przybylski
- *   Copyright (C) 2015  Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package com.owncloud.android.utils;
-
-import android.content.Context;
-import android.os.Build;
-import android.os.Environment;
-
-import com.owncloud.android.R;
-
-import java.io.File;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * @author Bartosz Przybylski
- */
-public class DataStorageUtils {
-	static public final class Storage {
-		private String mDescription;
-		private String mPath;
-
-		Storage(String description, String path) {
-			mDescription = description;
-			mPath = path;
-		}
-
-		public String getPath() { return mPath; }
-		public String getDescription() { return mDescription; }
-	}
-
-	static public Storage[] getAvailableStoragePoints(Context context) {
-        List<Storage> result = new ArrayList<>();
-
-        String storagePath = Environment.getExternalStorageDirectory().getPath();
-        if (canBeAddedToAvailableList(result, storagePath))
-            result.add(new Storage(context.getString(R.string.storage_description_default),
-                    storagePath));
-
-
-        int cardNo = 1;
-
-        for (String potentialPath : getPotentialPaths(getMountedResources()))
-            if (canBeAddedToAvailableList(result, potentialPath))
-                result.add(new Storage(constructSDCardName(context, cardNo++), potentialPath));
-
-        return result.toArray(new Storage[result.size()]);
-	}
-
-	public static String getStorageDescriptionByPath(String path, Context context) {
-		Storage[] storages = getAvailableStoragePoints(context);
-		for (Storage s : storages) {
-			if (s.getPath().equals(path))
-				return s.getDescription();
-		}
-		return context.getString(R.string.storage_description_unknown);
-	}
-
-    private static String constructSDCardName(Context context, int no) {
-        return context.getString(R.string.storage_description_sd_no, no);
-    }
-
-    private static String getMountedResources() {
-        String s = "";
-        try {
-            final Process process = new ProcessBuilder().command("mount")
-                    .redirectErrorStream(true).start();
-
-            process.waitFor();
-            final InputStream is = process.getInputStream();
-            final byte buffer[] = new byte[1024];
-            while (is.read(buffer) != -1)
-                s += new String(buffer);
-            is.close();
-        } catch (final Exception e) { }
-        return s;
-    }
-
-    private static String[] getPotentialPaths(String mounted) {
-        final List<String> result = new ArrayList<String>();
-        final String reg = "(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4).*rw.*";
-
-        for (String line : mounted.split("\n"))
-            if (!line.toLowerCase(Locale.US).contains("asec") && line.matches(reg)) {
-                    String parts[] = line.split(" ");
-                    for (String path : parts) {
-                        if (path.startsWith("/") &&
-                                !path.toLowerCase(Locale.US).contains("vold"))
-                            result.add(path);
-                    }
-            }
-        return result.toArray(new String[result.size()]);
-    }
-
-	private static boolean canBeAddedToAvailableList(List<Storage> currentList, String path) {
-		if (path == null) return false;
-        for (Storage storage : currentList)
-            if (storage.getPath().equals(path))
-                return false;
-		File f = new File(path);
-		return f.exists() && f.isDirectory();
-	}
-}

From afbe508dd1eae8a13702595570374efa1c907580 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Sun, 8 May 2016 21:48:02 +0200
Subject: [PATCH 18/25] use lollipop external storage system

---
 .../datastorage/DataStorageProvider.java      | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/com/owncloud/android/datastorage/DataStorageProvider.java b/src/com/owncloud/android/datastorage/DataStorageProvider.java
index 3749d83ec121..904469e77d16 100644
--- a/src/com/owncloud/android/datastorage/DataStorageProvider.java
+++ b/src/com/owncloud/android/datastorage/DataStorageProvider.java
@@ -21,6 +21,8 @@
 
 package com.owncloud.android.datastorage;
 
+import android.os.Build;
+
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datastorage.providers.EnvironmentStoragePointProvider;
@@ -30,6 +32,7 @@
 import com.owncloud.android.datastorage.providers.SystemDefaultStoragePointProvider;
 import com.owncloud.android.datastorage.providers.VDCStoragePointProvider;
 
+import java.io.File;
 import java.util.Vector;
 
 /**
@@ -60,10 +63,18 @@ public StoragePoint[] getAvailableStoragePoints() {
         if (mCachedStoragePoints.size() != 0)
             return mCachedStoragePoints.toArray(new StoragePoint[mCachedStoragePoints.size()]);
 
-
-        for (IStoragePointProvider p : mStorageProviders)
-            if (p.canProvideStoragePoints())
-                mCachedStoragePoints.addAll(p.getAvailableStoragePoint());
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            for (File f : MainApp.getAppContext().getExternalFilesDirs(null)) {
+                if (f != null) {
+                    mCachedStoragePoints.add(new StoragePoint(f.getAbsolutePath(), f.getAbsolutePath()));
+                }
+            }
+        } else {
+            for (IStoragePointProvider p : mStorageProviders)
+                if (p.canProvideStoragePoints()) {
+                    mCachedStoragePoints.addAll(p.getAvailableStoragePoint());
+                }
+        }
 
         return mCachedStoragePoints.toArray(new StoragePoint[mCachedStoragePoints.size()]);
     }

From e47ebda6cc1ce6e740cca9410be29568c4a45321 Mon Sep 17 00:00:00 2001
From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Sun, 3 Jul 2016 00:19:59 +0200
Subject: [PATCH 19/25] rebase fixes

---
 .../android/ui/activity/Preferences.java      | 36 ++++---------------
 .../ui/activity/UploadFilesActivity.java      |  2 +-
 .../android/utils/FileStorageUtils.java       |  1 +
 3 files changed, 9 insertions(+), 30 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 3f6a13a1518b..15f1995c749d 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -21,10 +21,10 @@
  */
 package com.owncloud.android.ui.activity;
 
-import android.accounts.Account;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Intent;
+import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -32,8 +32,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
-import android.os.Handler;
-import android.os.IBinder;
 import android.preference.CheckBoxPreference;
 import android.preference.ListPreference;
 import android.preference.Preference;
@@ -57,20 +55,15 @@
 import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datastorage.DataStorageProvider;
 import com.owncloud.android.datastorage.StoragePoint;
-import com.owncloud.android.db.DbHandler;
-import com.owncloud.android.files.FileOperationsHelper;
 import com.owncloud.android.files.services.FileDownloader;
 import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;
-import com.owncloud.android.services.OperationsService;
 import com.owncloud.android.ui.PreferenceWithLongSummary;
-import com.owncloud.android.ui.RadioButtonPreference;
 import com.owncloud.android.utils.DisplayUtils;
 
 import java.io.IOException;
@@ -88,8 +81,6 @@ public class Preferences extends PreferenceActivity
 
     private static final int ACTION_SELECT_UPLOAD_PATH = 1;
     private static final int ACTION_SELECT_UPLOAD_VIDEO_PATH = 2;
-    private static final int ACTION_SELECT_STORAGE_PATH = 3;
-    private static final int ACTION_PERFORM_MIGRATION = 4;
     private static final int ACTION_REQUEST_PASSCODE = 5;
     private static final int ACTION_CONFIRM_PASSCODE = 6;
 
@@ -105,7 +96,6 @@ public class Preferences extends PreferenceActivity
     private Preference pAboutApp;
     private AppCompatDelegate mDelegate;
 
-    private PreferenceCategory mAccountsPrefCategory = null;
     private String mUploadPath;
     private PreferenceCategory mPrefInstantUploadCategory;
     private Preference mPrefInstantUpload;
@@ -120,8 +110,7 @@ public class Preferences extends PreferenceActivity
     private Preference mPrefInstantVideoUploadPathWiFi;
     private Preference mPrefInstantVideoUploadOnlyOnCharging;
     private String mUploadVideoPath;
-
-    private PreferenceWithLongSummary mPrefStoragePath;
+    private ListPreference mPrefStoragePath;
     private String mStoragePath;
 
     public static class Keys {
@@ -651,21 +640,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
 
                 Toast.makeText(this, R.string.pass_code_removed, Toast.LENGTH_LONG).show();
             }
-        } else if (requestCode == ACTION_SELECT_STORAGE_PATH && resultCode == RESULT_OK) {
-            File currentStorageDir = new File(mStoragePath);
-            File upcomingStorageDir = new File(data.getStringExtra(UploadFilesActivity.EXTRA_CHOSEN_FILES));
-
-            if (currentStorageDir != upcomingStorageDir) {
-                Intent migrationIntent = new Intent(this, StorageMigrationActivity.class);
-                migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_SOURCE_DIR,
-                        currentStorageDir.getAbsolutePath());
-                migrationIntent.putExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR,
-                        upcomingStorageDir.getAbsolutePath());
-                startActivityForResult(migrationIntent, ACTION_PERFORM_MIGRATION);
-            }
-        } else if (requestCode == ACTION_PERFORM_MIGRATION && resultCode == RESULT_OK) {
-            String resultStorageDir = data.getStringExtra(StorageMigrationActivity.KEY_MIGRATION_TARGET_DIR);
-            saveStoragePath(resultStorageDir);
         } else if (requestCode == ACTION_REQUEST_CODE_DAVDROID_SETUP && resultCode == RESULT_OK) {
             Toast.makeText(this, R.string.prefs_calendar_contacts_sync_setup_successful, Toast.LENGTH_LONG).show();        }
     }
@@ -801,7 +775,10 @@ private void saveInstantUploadPathOnPreferences() {
      * Load upload video path set on preferences
      */
     private void loadInstantUploadVideoPath() {
-        mPrefInstantVideoUploadPath.setSummary(MainApp.getStoragePath());
+        SharedPreferences appPrefs =
+                PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        mUploadVideoPath = appPrefs.getString("instant_video_upload_path", getString(R.string.instant_upload_path));
+        mPrefInstantVideoUploadPath.setSummary(mUploadVideoPath);
     }
 
     /**
@@ -825,4 +802,5 @@ public void onStorageMigrationFinished(String storagePath, boolean succeed) {
     public void onCancelMigration() {
         // Migration was canceled so we don't do anything
     }
+
 }
diff --git a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
index 598397202eb2..1b87294e3b85 100644
--- a/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
+++ b/src/com/owncloud/android/ui/activity/UploadFilesActivity.java
@@ -68,7 +68,7 @@ public class UploadFilesActivity extends FileActivity implements
     private boolean mSelectAll = false;
     private LocalFileListFragment mFileListFragment;
     private Button mCancelBtn;
-    private Button mUploadBtn;
+    protected Button mUploadBtn;
     private Spinner mBehaviourSpinner;
     private Account mAccountOnCreation;
     private DialogFragment mCurrentDialog;
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 0ef8459d2b89..4548813f1689 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -60,6 +60,7 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.os.Environment;
 import android.preference.PreferenceManager;
 import android.net.Uri;
 import android.os.StatFs;

From d1ebcdda0df6e7dbb56925d7a4004e3fc1178660 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Sun, 3 Jul 2016 14:36:17 +0200
Subject: [PATCH 20/25] fixed strings (oC->Nc and ... --> &#8230;)

---
 res/values/strings.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 71c80593ef3a..9dd9efc6f369 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -358,19 +358,19 @@
 
     <string name="file_migration_dialog_title">Updating storage path</string>
     <string name="file_migration_finish_button">Finish</string>
-    <string name="file_migration_preparing">Preparing for migration...</string>
-    <string name="file_migration_checking_destination">Checking destination...</string>
-    <string name="file_migration_saving_accounts_configuration">Saving accounts configuration...</string>
-    <string name="file_migration_waiting_for_unfinished_sync">Waiting for unfinished synchronizations...</string>
-    <string name="file_migration_migrating">Moving data...</string>
-    <string name="file_migration_updating_index">Updating index...</string>
-    <string name="file_migration_cleaning">Cleaning...</string>
-    <string name="file_migration_restoring_accounts_configuration">Restoring accounts configuration...</string>
+    <string name="file_migration_preparing">Preparing for migration&#8230;</string>
+    <string name="file_migration_checking_destination">Checking destination&#8230;</string>
+    <string name="file_migration_saving_accounts_configuration">Saving accounts configuration&#8230;</string>
+    <string name="file_migration_waiting_for_unfinished_sync">Waiting for unfinished synchronizations&#8230;</string>
+    <string name="file_migration_migrating">Moving data&#8230;</string>
+    <string name="file_migration_updating_index">Updating index&#8230;</string>
+    <string name="file_migration_cleaning">Cleaning&#8230;</string>
+    <string name="file_migration_restoring_accounts_configuration">Restoring accounts configuration&#8230;</string>
     <string name="file_migration_ok_finished">Finished</string>
     <string name="file_migration_failed_not_enough_space">ERROR: Not enough space</string>
     <string name="file_migration_failed_not_writable">ERROR: File is not writable</string>
     <string name="file_migration_failed_not_readable">ERROR: File is not readable</string>
-    <string name="file_migration_failed_dir_already_exists">ERROR: owncloud directory already exists</string>
+    <string name="file_migration_failed_dir_already_exists">ERROR: Nextcloud directory already exists</string>
     <string name="file_migration_failed_while_coping">ERROR: While migrating</string>
     <string name="file_migration_failed_while_updating_index">ERROR: While updating index</string>
 

From d7d28451179aa13e645417abc9ae25c41c3eb260 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 10:37:35 +0200
Subject: [PATCH 21/25] lib version 1.0.2, organizes imports in
 FileStorageUtils

---
 .../android/utils/FileStorageUtils.java        | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 4548813f1689..1827ca03359f 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -37,14 +37,14 @@
 import com.owncloud.android.lib.resources.files.RemoteFile;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -54,18 +54,6 @@
 
 import third_parties.daveKoeller.AlphanumComparator;
 
-import com.owncloud.android.ui.activity.Preferences;
-
-import android.accounts.Account;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.os.Environment;
-import android.preference.PreferenceManager;
-import android.net.Uri;
-import android.os.StatFs;
-import android.webkit.MimeTypeMap;
-
 
 /**
  * Static methods to help in access to local file system.

From 6e73da2809c7cb6e17ca84f708c7a4ac1a5159de Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 10:59:31 +0200
Subject: [PATCH 22/25] CR, GPLv3

---
 res/layout/migration_layout.xml               | 19 ++++++
 .../datastorage/DataStorageProvider.java      | 18 +++---
 .../android/datastorage/StoragePoint.java     | 22 +++----
 .../datastorage/UniqueStorageList.java        | 18 +++---
 .../AbstractCommandLineStoragePoint.java      | 18 +++---
 .../AbstractStoragePointProvider.java         | 18 +++---
 .../EnvironmentStoragePointProvider.java      | 18 +++---
 .../HardcodedStoragePointProvider.java        | 18 +++---
 .../providers/IStoragePointProvider.java      | 18 +++---
 .../MountCommandStoragePointProvider.java     | 18 +++---
 .../SystemDefaultStoragePointProvider.java    | 18 +++---
 .../providers/VDCStoragePointProvider.java    | 18 +++---
 .../LocalDirectorySelectorActivity.java       | 21 +++----
 .../android/ui/activity/StorageMigration.java | 59 ++++++++++++-------
 .../android/utils/FileStorageUtils.java       | 31 +++++-----
 15 files changed, 186 insertions(+), 146 deletions(-)

diff --git a/res/layout/migration_layout.xml b/res/layout/migration_layout.xml
index 84b5c2207b23..8604fa645abe 100644
--- a/res/layout/migration_layout.xml
+++ b/res/layout/migration_layout.xml
@@ -1,3 +1,22 @@
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2016 Bartosz Przybylski
+  Copyright (C) 2016 Nextcloud
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+-->
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               android:orientation="vertical"
diff --git a/src/com/owncloud/android/datastorage/DataStorageProvider.java b/src/com/owncloud/android/datastorage/DataStorageProvider.java
index 904469e77d16..8aafd0f773e6 100644
--- a/src/com/owncloud/android/datastorage/DataStorageProvider.java
+++ b/src/com/owncloud/android/datastorage/DataStorageProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage;
diff --git a/src/com/owncloud/android/datastorage/StoragePoint.java b/src/com/owncloud/android/datastorage/StoragePoint.java
index ad8ba8e6992a..b3083d7676cb 100644
--- a/src/com/owncloud/android/datastorage/StoragePoint.java
+++ b/src/com/owncloud/android/datastorage/StoragePoint.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
- *   @author Bartek Przybylski
- *   Copyright (C) 2016  Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   @author Bartosz Przybylski
+ *   Copyright (C) 2016 Nextcloud
+ *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage;
diff --git a/src/com/owncloud/android/datastorage/UniqueStorageList.java b/src/com/owncloud/android/datastorage/UniqueStorageList.java
index 0eb65e82f42b..731acc7a0f82 100644
--- a/src/com/owncloud/android/datastorage/UniqueStorageList.java
+++ b/src/com/owncloud/android/datastorage/UniqueStorageList.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage;
diff --git a/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java b/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
index baac49177569..86052c098a4f 100644
--- a/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
+++ b/src/com/owncloud/android/datastorage/providers/AbstractCommandLineStoragePoint.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
index 20b4c5ab0462..8dfa93e51d6e 100644
--- a/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/AbstractStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
index b8ccc8d5fdf2..9ca5470f1191 100644
--- a/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/EnvironmentStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
index 2e7d010059f1..d65e8ca88940 100644
--- a/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/HardcodedStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
index d6d59750a82c..e096658b653e 100644
--- a/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/IStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
index 53789ca605a4..f6449713ca8c 100644
--- a/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
index 3eda025317b1..2e2c04932db3 100644
--- a/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/SystemDefaultStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
index 5f42d4bf3c61..270f7af209b5 100644
--- a/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/VDCStoragePointProvider.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
  *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 package com.owncloud.android.datastorage.providers;
diff --git a/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
index 83b44c594012..0e246b07f73a 100644
--- a/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
+++ b/src/com/owncloud/android/ui/activity/LocalDirectorySelectorActivity.java
@@ -1,22 +1,23 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *   Copyright (C) 2015 Bartosz Przybylski
+ *   Copyright (C) 2016 ownCloud Inc.
+ *   Copyright (C) 2016 Nextcloud
+ *   Copyright (C) 2016 Bartosz Przybylski
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activity;
 
diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
index 77629d513977..1c7baae4a4fc 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigration.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -1,22 +1,22 @@
 /**
- *   ownCloud Android client application
+ *   Nextcloud Android client application
  *
  *   @author Bartosz Przybylski
- *   Copyright (C) 2015 ownCloud Inc.
- *   Copyright (C) 2015 Bartosz Przybylski
+ *   Copyright (C) 2016 Bartosz Przybylski
+ *   Copyright (C) 2016 Nextcloud
  *
- *   This program is free software: you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License version 2,
- *   as published by the Free Software Foundation.
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ *   License as published by the Free Software Foundation; either
+ *   version 3 of the License, or any later version.
  *
  *   This program is distributed in the hope that it will be useful,
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *   GNU AFFERO GENERAL PUBLIC LICENSE for more details.
  *
+ *   You should have received a copy of the GNU Affero General Public
+ *   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 package com.owncloud.android.ui.activity;
 
@@ -170,7 +170,11 @@ abstract static private class FileMigrationTaskBase extends AsyncTask<Void, Inte
         protected String mAuthority;
         protected Account[] mOcAccounts;
 
-        public FileMigrationTaskBase(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
+        public FileMigrationTaskBase(Context context,
+                                     String source,
+                                     String target,
+                                     ProgressDialog progressDialog,
+                                     StorageMigrationProgressListener listener) {
             mContext = context;
             mStorageSource = source;
             mStorageTarget = target;
@@ -183,8 +187,9 @@ public FileMigrationTaskBase(Context context, String source, String target, Prog
 
         @Override
         protected void onProgressUpdate(Integer... progress) {
-            if (progress.length > 1 && progress[0] != 0)
+            if (progress.length > 1 && progress[0] != 0) {
                 mProgressDialog.setMessage(mContext.getString(progress[0]));
+            }
         }
 
         @Override
@@ -203,42 +208,52 @@ protected void onPostExecute(Integer code) {
                 mProgressDialog.setIndeterminateDrawable(mContext.getResources().getDrawable(R.drawable.image_fail));
             }
 
-            if (mListener != null)
+            if (mListener != null) {
                 mListener.onStorageMigrationFinished(succeed ? mStorageTarget : mStorageSource, succeed);
+            }
         }
 
         protected boolean[] saveAccountsSyncStatus() {
             boolean[] syncs = new boolean[mOcAccounts.length];
-            for (int i = 0; i < mOcAccounts.length; ++i)
+            for (int i = 0; i < mOcAccounts.length; ++i) {
                 syncs[i] = ContentResolver.getSyncAutomatically(mOcAccounts[i], mAuthority);
+            }
             return syncs;
         }
 
         protected void stopAccountsSyncing() {
-            for (int i = 0; i < mOcAccounts.length; ++i)
+            for (int i = 0; i < mOcAccounts.length; ++i) {
                 ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, false);
+            }
         }
 
         protected void waitForUnfinishedSynchronizations() {
-            for (int i = 0; i < mOcAccounts.length; ++i)
-                while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority))
+            for (int i = 0; i < mOcAccounts.length; ++i) {
+                while (ContentResolver.isSyncActive(mOcAccounts[i], mAuthority)) {
                     try {
                         Thread.sleep(1000);
                     } catch (InterruptedException e) {
                         Log_OC.w(TAG, "Thread interrupted while waiting for account to end syncing");
                         Thread.currentThread().interrupt();
                     }
+                }
+            }
         }
 
         protected void restoreAccountsSyncStatus(boolean oldSync[]) {
-            for (int i = 0; i < mOcAccounts.length; ++i)
+            for (int i = 0; i < mOcAccounts.length; ++i) {
                 ContentResolver.setSyncAutomatically(mOcAccounts[i], mAuthority, oldSync[i]);
+            }
         }
     }
 
     static private class StoragePathSwitchTask extends FileMigrationTaskBase {
 
-        public StoragePathSwitchTask(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
+        public StoragePathSwitchTask(Context context,
+                                     String source,
+                                     String target,
+                                     ProgressDialog progressDialog,
+                                     StorageMigrationProgressListener listener) {
             super(context, source, target, progressDialog, listener);
         }
 
@@ -277,7 +292,11 @@ private class MigrationException extends Exception {
             int getResId() { return mResId; }
         }
 
-        public FileMigrationTask(Context context, String source, String target, ProgressDialog progressDialog, StorageMigrationProgressListener listener) {
+        public FileMigrationTask(Context context,
+                                 String source,
+                                 String target,
+                                 ProgressDialog progressDialog,
+                                 StorageMigrationProgressListener listener) {
             super(context, source, target, progressDialog, listener);
         }
 
diff --git a/src/com/owncloud/android/utils/FileStorageUtils.java b/src/com/owncloud/android/utils/FileStorageUtils.java
index 1827ca03359f..704eaba3cbfe 100644
--- a/src/com/owncloud/android/utils/FileStorageUtils.java
+++ b/src/com/owncloud/android/utils/FileStorageUtils.java
@@ -21,12 +21,10 @@
 package com.owncloud.android.utils;
 
 import android.accounts.Account;
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Environment;
-import android.os.StatFs;
 import android.preference.PreferenceManager;
 import android.webkit.MimeTypeMap;
 
@@ -84,7 +82,11 @@ public static final String removeDataFolderPath(String fullPath) {
      * Get local owncloud storage path for accountName.
      */
     public static final String getSavePath(String accountName) {
-        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + Uri.encode(accountName, "@");
+        return MainApp.getStoragePath()
+                + File.separator
+                + MainApp.getDataFolder()
+                + File.separator
+                + Uri.encode(accountName, "@");
         // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
         // that can be in the accountName since 0.1.190B
     }
@@ -102,27 +104,26 @@ public static final String getDefaultSavePathFor(String accountName, OCFile file
      * Get absolute path to tmp folder inside datafolder in sd-card for given accountName.
      */
     public static final String getTemporalPath(String accountName) {
-        return MainApp.getStoragePath() + File.separator + MainApp.getDataFolder() + File.separator + "tmp" + File.separator + Uri.encode(accountName, "@");
+        return MainApp.getStoragePath()
+                + File.separator
+                + MainApp.getDataFolder()
+                + File.separator
+                + "tmp"
+                + File.separator
+                + Uri.encode(accountName, "@");
         // URL encoding is an 'easy fix' to overcome that NTFS and FAT32 don't allow ":" in file names,
         // that can be in the accountName since 0.1.190B
     }
 
     /**
      * Optimistic number of bytes available on sd-card. accountName is ignored.
+     *
      * @param accountName not used. can thus be null.
      * @return Optimistic number of available bytes (can be less)
      */
-    @SuppressLint("NewApi")
     public static final long getUsableSpace(String accountName) {
         File savePath = new File(MainApp.getStoragePath());
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.GINGERBREAD) {
-            return savePath.getUsableSpace();
-
-        } else {
-            StatFs stats = new StatFs(savePath.getAbsolutePath());
-            return stats.getAvailableBlocks() * stats.getBlockSize();
-        }
-
+        return savePath.getUsableSpace();
     }
     
     public static final String getLogPath()  {
@@ -518,12 +519,12 @@ public static boolean copyFile(File src, File target) {
             if (in != null) try {
                 in.close();
             } catch (IOException e) {
-                e.printStackTrace(System.err);
+                Log_OC.e(TAG, "Error closing input stream during copy", e);
             }
             if (out != null) try {
                 out.close();
             } catch (IOException e) {
-                e.printStackTrace(System.err);
+                Log_OC.e(TAG, "Error closing output stream during copy", e);
             }
         }
 

From 612199a9b710b07a8a4206ab0652c90b96323f03 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 11:12:25 +0200
Subject: [PATCH 23/25] further CR fixes, fixed comment in
 layout/migration_layout.xml

---
 res/layout/migration_layout.xml               | 25 ++++++++++---------
 res/xml/preferences.xml                       |  3 ---
 .../datamodel/FileDataStorageManager.java     | 19 +++-----------
 .../datastorage/DataStorageProvider.java      |  6 ++---
 .../android/ui/activity/StorageMigration.java |  1 +
 5 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/res/layout/migration_layout.xml b/res/layout/migration_layout.xml
index 8604fa645abe..107acbb9b337 100644
--- a/res/layout/migration_layout.xml
+++ b/res/layout/migration_layout.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   Nextcloud Android client application
 
@@ -17,35 +18,35 @@
   You should have received a copy of the GNU Affero General Public
   License along with this program.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<?xml version="1.0" encoding="utf-8"?>
+
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:orientation="vertical"
               android:layout_width="match_parent"
               android:layout_height="match_parent"
-              android:gravity="center_vertical">
+              android:gravity="center_vertical"
+              android:orientation="vertical">
 
     <ProgressBar
+        android:id="@+id/migrationProgress"
         style="?android:attr/progressBarStyleHorizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/migrationProgress"
         android:layout_gravity="center_horizontal"
-        android:progress="50"
         android:paddingLeft="30dp"
-        android:paddingRight="30dp"/>
+        android:paddingRight="30dp"
+        android:progress="50"/>
 
     <TextView
+        android:id="@+id/migrationText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center_horizontal"
         android:text=""
-        android:id="@+id/migrationText"
-        android:layout_gravity="center_horizontal"/>
+        android:textAppearance="?android:attr/textAppearanceMedium"/>
 
     <Button
+        android:id="@+id/finishButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/drawer_close"
-        android:id="@+id/finishButton"
-        android:layout_gravity="center_horizontal"/>
+        android:layout_gravity="center_horizontal"
+        android:text="@string/drawer_close"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index df592f68d82f..66065bbbc584 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -23,9 +23,6 @@
 			android:title="@string/prefs_storage_path"
 			android:key="storage_path" />
 	</PreferenceCategory>
-    <PreferenceCategory android:title="@string/prefs_category_accounts" android:key="accounts_category">
-    </PreferenceCategory>
-    
 
     <PreferenceCategory android:title="@string/prefs_category_instant_uploading" android:key="instant_uploading_category">
 		<com.owncloud.android.ui.CheckBoxPreferenceWithLongTitle android:key="instant_uploading"
diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index 66167eaf8ac2..34ba10bd19e0 100644
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -46,11 +46,6 @@
 import com.owncloud.android.utils.MimeTypeUtil;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -784,16 +779,10 @@ public void migrateStoredFiles(String srcPath, String dstPath) throws Exception
         c.close();
 
         /// 3. apply updates in batch
-        try {
-            if (getContentResolver() != null) {
-                getContentResolver().applyBatch(MainApp.getAuthority(), operations);
-
-            } else {
-                getContentProviderClient().applyBatch(operations);
-            }
-
-        } catch (Exception e) {
-            throw e;
+        if (getContentResolver() != null) {
+            getContentResolver().applyBatch(MainApp.getAuthority(), operations);
+        } else {
+            getContentProviderClient().applyBatch(operations);
         }
     }
 
diff --git a/src/com/owncloud/android/datastorage/DataStorageProvider.java b/src/com/owncloud/android/datastorage/DataStorageProvider.java
index 8aafd0f773e6..0b40ad39956c 100644
--- a/src/com/owncloud/android/datastorage/DataStorageProvider.java
+++ b/src/com/owncloud/android/datastorage/DataStorageProvider.java
@@ -40,9 +40,9 @@
  */
 public class DataStorageProvider {
 
-    private static Vector<IStoragePointProvider> mStorageProviders = new Vector<>();
-    private static UniqueStorageList mCachedStoragePoints = new UniqueStorageList();
-    private static DataStorageProvider sInstance = new DataStorageProvider() {{
+    private static final Vector<IStoragePointProvider> mStorageProviders = new Vector<>();
+    private static final UniqueStorageList mCachedStoragePoints = new UniqueStorageList();
+    private static final DataStorageProvider sInstance = new DataStorageProvider() {{
         // There is no system wide way to get usb storage so we need to provide multiple
         // handcrafted ways to add those.
         addStoragePointProvider(new SystemDefaultStoragePointProvider());
diff --git a/src/com/owncloud/android/ui/activity/StorageMigration.java b/src/com/owncloud/android/ui/activity/StorageMigration.java
index 1c7baae4a4fc..cf0c4d09be87 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigration.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigration.java
@@ -394,6 +394,7 @@ void updateIndex(Context context) throws MigrationException {
             try {
                 manager.migrateStoredFiles(mStorageSource, mStorageTarget);
             } catch (Exception e) {
+                Log_OC.e(TAG,e.getMessage(),e);
                 throw new MigrationException(R.string.file_migration_failed_while_updating_index);
             }
         }

From 20a0a747d73d1bd034ec7870ee51fc3b4cc4ac94 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Tue, 2 Aug 2016 11:18:49 +0200
Subject: [PATCH 24/25] extract/pre-compile the pattern

---
 .../providers/MountCommandStoragePointProvider.java         | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
index f6449713ca8c..b5bb71e25c7a 100644
--- a/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
+++ b/src/com/owncloud/android/datastorage/providers/MountCommandStoragePointProvider.java
@@ -25,6 +25,7 @@
 
 import java.util.Locale;
 import java.util.Vector;
+import java.util.regex.Pattern;
 
 /**
  * @author Bartosz Przybylski
@@ -33,6 +34,8 @@ public class MountCommandStoragePointProvider extends AbstractCommandLineStorage
 
     static private final String[] sCommand = new String[] { "mount" };
 
+    private static Pattern sPattern = Pattern.compile("(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4).*rw.*");
+
     @Override
     protected String[] getCommand() {
         return sCommand;
@@ -51,10 +54,9 @@ public Vector<StoragePoint> getAvailableStoragePoint() {
 
     private Vector<String> getPotentialPaths(String mounted) {
         final Vector<String> result = new Vector<>();
-        final String reg = "(?i).*vold.*(vfat|ntfs|exfat|fat32|ext3|ext4).*rw.*";
 
         for (String line : mounted.split("\n"))
-            if (!line.toLowerCase(Locale.US).contains("asec") && line.matches(reg)) {
+            if (!line.toLowerCase(Locale.US).contains("asec") && sPattern.matcher(line).matches()) {
                 String parts[] = line.split(" ");
                 for (String path : parts) {
                     if (path.startsWith("/") &&

From b09126cb810c496ebc1a14d3361e8313ea6c8ae1 Mon Sep 17 00:00:00 2001
From: Andy Scherzinger <info@andy-scherzinger.de>
Date: Mon, 12 Sep 2016 22:04:23 +0200
Subject: [PATCH 25/25] fixed imports after rebase

---
 src/com/owncloud/android/ui/activity/Preferences.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/com/owncloud/android/ui/activity/Preferences.java b/src/com/owncloud/android/ui/activity/Preferences.java
index 15f1995c749d..d05503203d42 100644
--- a/src/com/owncloud/android/ui/activity/Preferences.java
+++ b/src/com/owncloud/android/ui/activity/Preferences.java
@@ -21,10 +21,10 @@
  */
 package com.owncloud.android.ui.activity;
 
+import android.accounts.Account;
 import android.accounts.AuthenticatorException;
 import android.accounts.OperationCanceledException;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -55,11 +55,10 @@
 import com.owncloud.android.BuildConfig;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
+import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.datastorage.DataStorageProvider;
 import com.owncloud.android.datastorage.StoragePoint;
-import com.owncloud.android.files.services.FileDownloader;
-import com.owncloud.android.files.services.FileUploader;
 import com.owncloud.android.lib.common.OwnCloudAccount;
 import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
 import com.owncloud.android.lib.common.utils.Log_OC;