X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/a99a28cc61d48eca63803c3d661ea1be14f99aec..b29ba035f8fa516b74d814d831a5928a8ab795de:/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java 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())