mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-27 09:39:25 +03:00
Code Issues Projects Releases Packages Wiki Activity

Soften requirement on cleanup step failures

Browse source
This commit is contained in:
Bartosz Przybylski 2015-11-09 17:57:14 +01:00 committed by AndyScherzinger
parent 6722f71be8
commit 8ad388f951
No known key found for this signature in database
GPG key ID: 6CADC7E3523C308B
1 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/com/owncloud/android/ui/activity/StorageMigrationActivity.java
View file

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