From: Bartosz Przybylski <bart.p.pl@gmail.com>
Date: Mon, 9 Nov 2015 16:57:14 +0000 (+0100)
Subject: Soften requirement on cleanup step failures
X-Git-Tag: beta-20151128~5^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/baf4d79e1ed17f66d0bf472b6476cf732a251693?ds=inline;hp=--cc

Soften requirement on cleanup step failures
---

baf4d79e1ed17f66d0bf472b6476cf732a251693
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() {