Skip to content

SpotBugs: Fix Method ignores exceptional return value - StorageMigration #15594

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SpotBugs: Fix Method ignores exceptional return value - StorageMigration #15594

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import com.owncloud.android.utils.theme.ViewThemeUtils;

import java.io.File;
import java.io.IOException;
import java.nio.file.Files;

import androidx.appcompat.app.AlertDialog;
import androidx.core.content.res.ResourcesCompat;
Expand Down Expand Up @@ -364,10 +366,19 @@ protected Integer doInBackground(Void... args) {
try {
File dstFile = new File(mStorageTarget + File.separator + MainApp.getDataFolder());
deleteRecursive(dstFile);
dstFile.delete();
try {
Files.delete(dstFile.toPath());
} catch (IOException e) {
Log_OC.e(TAG, "Could not delete destination file: " + dstFile.getAbsolutePath(), e);
}

File srcFile = new File(mStorageSource + File.separator + MainApp.getDataFolder());
srcFile.mkdirs();

try {
Files.createDirectories(srcFile.toPath());
} catch (IOException e) {
Log_OC.e(TAG, "Could not create directory: " + srcFile.getAbsolutePath(), e);
}

publishProgress(R.string.file_migration_checking_destination);

Expand Down Expand Up @@ -466,7 +477,11 @@ private void cleanup() {
if (!deleteRecursive(srcFile)) {
Log_OC.w(TAG, "Migration cleanup step failed");
}
srcFile.delete();
try {
Files.delete(srcFile.toPath());
} catch (IOException e) {
Log_OC.e(TAG, "Could not delete source file: " + srcFile.getAbsolutePath(), e);
}
}

private boolean deleteRecursive(File f) {
Expand Down
Loading