From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 27 Nov 2015 16:49:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
X-Git-Tag: beta-20151128~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/b277d52ab693c57d2f74c2063e8b3f6afa36c356?hp=8187a6e5126867cc859113aeb1677f3dcd9ef96b

Merge remote-tracking branch 'remotes/upstream/externalSD2' into beta
---

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index c0b45228..ee4f08e1 100644
--- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
+++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
@@ -240,10 +240,19 @@ public class StorageMigrationActivity extends AppCompatActivity {
 
 		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())