Soften requirement on cleanup step failures

diff --git a/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java b/src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
index 243e85f..c0b4522 100644 (file)
--- 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; }
                }
 
                        int getResId() { return mResId; }
                }
 

-               private class MigrationCleanupException extends Exception {
-                       MigrationCleanupException() {}
-               }
-

                @Override
                protected Integer doInBackground(String... args) {
 
                @Override
                protected Integer doInBackground(String... args) {
 


@@ -152,10 +148,6 @@ public class StorageMigrationActivity extends AppCompatActivity {
                                rollback();
                                Log_OC.startLogging(mStorageSource);
                                return e.getResId();
                                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);
                        } 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())
                        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() {
                }
 
                void rollback() {