mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-24 06:05:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #497 from owncloud/fixed_local_removal_of_files

Browse source 
Fixed local removal of files
This commit is contained in:
masensio 2014-05-20 10:37:57 +02:00
commit 3b0a823458
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/com/owncloud/android/datamodel/FileDataStorageManager.java
View file

@ -1,6 +1,6 @@
/* ownCloud Android client application /* ownCloud Android client application
* Copyright (C) 2012 Bartek Przybylski * Copyright (C) 2012 Bartek Przybylski
* Copyright (C) 2012-2013 ownCloud Inc. * Copyright (C) 2012-2014 ownCloud Inc.
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2, * it under the terms of the GNU General Public License version 2,
@ -494,6 +494,7 @@ public class FileDataStorageManager {
boolean success = true; boolean success = true;
File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder)); File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder));
if (localFolder.exists()) { if (localFolder.exists()) {
// stage 1: remove the local files already registered in the files database
Vector<OCFile> files = getFolderContent(folder.getFileId()); Vector<OCFile> files = getFolderContent(folder.getFileId());
if (files != null) { if (files != null) {
for (OCFile file : files) { for (OCFile file : files) {
@ -511,11 +512,30 @@ public class FileDataStorageManager {
} }
} }
} }
success &= localFolder.delete();
// stage 2: remove the folder itself and any local file inside out of sync;
// for instance, after clearing the app cache or reinstalling
success &= removeLocalFolder(localFolder);
} }
return success; return success;
} }
private boolean removeLocalFolder(File localFolder) {
boolean success = true;
File[] localFiles = localFolder.listFiles();
if (localFiles != null) {
for (File localFile : localFiles) {
if (localFile.isDirectory()) {
success &= removeLocalFolder(localFile);
} else {
success &= localFile.delete();
}
}
}
success &= localFolder.delete();
return success;
}
/** /**
* Updates database for a folder that was moved to a different location. * Updates database for a folder that was moved to a different location.
* *