From baf4d79e1ed17f66d0bf472b6476cf732a251693 Mon Sep 17 00:00:00 2001 From: Bartosz Przybylski Date: Mon, 9 Nov 2015 17:57:14 +0100 Subject: [PATCH] Soften requirement on cleanup step failures --- .../android/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 243e85ff..c0b45228 100644 --- a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java +++ b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java @@ -106,10 +106,6 @@ public class StorageMigrationActivity extends AppCompatActivity { int getResId() { return mResId; } } - private class MigrationCleanupException extends Exception { - MigrationCleanupException() {} - } - @Override protected Integer doInBackground(String... args) { @@ -152,10 +148,6 @@ public class StorageMigrationActivity extends AppCompatActivity { 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 @@ public class StorageMigrationActivity extends AppCompatActivity { } } - 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() { -- 2.11.0