mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-28 02:17:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Trigger Media Scan on parent folder when deleting a file or a folder from locally

Browse source
This commit is contained in:
jabarros 2015-01-19 10:39:23 +01:00
parent 86f9d43e8a
commit 6022456fd5
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -491,7 +491,7 @@ public class FileDataStorageManager {
if (removeLocalCopy && file.isDown() && localPath != null && success) { if (removeLocalCopy && file.isDown() && localPath != null && success) {
success = new File(localPath).delete(); success = new File(localPath).delete();
if (success) { if (success) {
triggerMediaScan(localPath); triggerMediaScan(FileStorageUtils.getParentPath(localPath));
} }
if (!removeDBData && success) { if (!removeDBData && success) {
// maybe unnecessary, but should be checked TODO remove if unnecessary // maybe unnecessary, but should be checked TODO remove if unnecessary
@ -539,7 +539,8 @@ public class FileDataStorageManager {
private boolean removeLocalFolder(OCFile folder) { private boolean removeLocalFolder(OCFile folder) {
boolean success = true; boolean success = true;
File localFolder = new File(FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder)); String localFolderPath = FileStorageUtils.getDefaultSavePathFor(mAccount.name, folder);
File localFolder = new File(localFolderPath);
if (localFolder.exists()) { if (localFolder.exists()) {
// stage 1: remove the local files already registered in the files database // stage 1: remove the local files already registered in the files database
Vector<OCFile> files = getFolderContent(folder.getFileId()); Vector<OCFile> files = getFolderContent(folder.getFileId());
@ -549,17 +550,16 @@ public class FileDataStorageManager {
success &= removeLocalFolder(file); success &= removeLocalFolder(file);
} else { } else {
if (file.isDown()) { if (file.isDown()) {
String path = file.getStoragePath();
File localFile = new File(file.getStoragePath()); File localFile = new File(file.getStoragePath());
success &= localFile.delete(); success &= localFile.delete();
if (success) { if (success) {
file.setStoragePath(null); file.setStoragePath(null);
saveFile(file); saveFile(file);
triggerMediaScan(path); // notify MediaScanner about removed file
} }
} }
} }
} }
triggerMediaScan(localFolderPath); // notify MediaScanner about removed file in folder
} }
// stage 2: remove the folder itself and any local file inside out of sync; // stage 2: remove the folder itself and any local file inside out of sync;