Bug fixed (and some refactoring): crash on local removal of a folder

diff --git a/src/com/owncloud/android/datamodel/FileDataStorageManager.java b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
index b1f266a..3f0d69f 100644 (file)
--- a/src/com/owncloud/android/datamodel/FileDataStorageManager.java
+++ b/src/com/owncloud/android/datamodel/FileDataStorageManager.java
@@ -486,8 +486,12 @@ public class FileDataStorageManager {
                     }
                     success &= (deleted > 0); 
                 }
-                if (removeLocalCopy && file.isDown() && file.getStoragePath() != null && success) {
-                    success = new File(file.getStoragePath()).delete();
+                String localPath = file.getStoragePath();
+                if (removeLocalCopy && file.isDown() && localPath != null && success) {
+                    success = new File(localPath).delete();
+                    if (success) {
+                        triggerMediaScan(localPath);
+                    }
                     if (!removeDBData && success) {
                         // maybe unnecessary, but should be checked TODO remove if unnecessary
                         file.setStoragePath(null);

diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
index b6ecd1a..2453404 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -96,7 +96,6 @@ implements ConfirmationDialogFragmentListener {
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {
             cg.getFileOperationsHelper().removeFile(mTargetFile, false);
-            storageManager.triggerMediaScan(mTargetFile.getStoragePath());
         }
     }
     
@@ -105,7 +104,6 @@ implements ConfirmationDialogFragmentListener {
      */
     @Override
     public void onNeutral(String callerTag) {
-        String path = mTargetFile.getStoragePath();
         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
         cg.getFileOperationsHelper().removeFile(mTargetFile, true);
         
@@ -135,9 +133,6 @@ implements ConfirmationDialogFragmentListener {
            folder.setEtag("");
            storageManager.saveFile(folder);
         }
-        
-        // Trigger MediaScan
-        storageManager.triggerMediaScan(path);
     }
 
     @Override