Merge remote-tracking branch 'upstream/develop' into triggerMediaScan

[pub/Android/ownCloud.git] / src / com / owncloud / android / ui / dialog / RemoveFileDialogFragment.java

diff --git a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
index a78584a..8158a5a 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -24,6 +24,7 @@ package com.owncloud.android.ui.dialog;
  *  
  *  @author David A. Velasco
  */
  *  
  *  @author David A. Velasco
  */

+import java.io.File;

 import java.util.Vector;
 
 import com.owncloud.android.R;
 import java.util.Vector;
 
 import com.owncloud.android.R;


@@ -33,6 +34,7 @@ import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
 import android.app.Dialog;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
 import android.app.Dialog;

+import android.media.MediaScannerConnection;

 import android.os.Bundle;
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 import android.os.Bundle;
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 


@@ -95,7 +97,9 @@ implements ConfirmationDialogFragmentListener {
         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {
         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {

+            String path = new File(mTargetFile.getStoragePath()).getParent();

             cg.getFileOperationsHelper().removeFile(mTargetFile, false);
             cg.getFileOperationsHelper().removeFile(mTargetFile, false);

+            triggerMediaScan(path);

         }
     }
     
         }
     }
     


@@ -104,6 +108,7 @@ implements ConfirmationDialogFragmentListener {
      */
     @Override
     public void onNeutral(String callerTag) {
      */
     @Override
     public void onNeutral(String callerTag) {

+        String path = new File(mTargetFile.getStoragePath()).getParent();

         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
         cg.getFileOperationsHelper()
             .removeFile(mTargetFile, true);
         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
         cg.getFileOperationsHelper()
             .removeFile(mTargetFile, true);


@@ -132,8 +137,11 @@ implements ConfirmationDialogFragmentListener {
             }
             
            folder.setEtag("");
             }
             
            folder.setEtag("");

-           storageManager.saveFile(folder);
+           storageManager.saveFile(folder);  

         }
         }

+        
+        // Trigger MediaScan
+        triggerMediaScan(path);

     }
 
     @Override
     }
 
     @Override


@@ -141,4 +149,10 @@ implements ConfirmationDialogFragmentListener {
         // nothing to do here
     }
     
         // nothing to do here
     }
     

-}
+    private void triggerMediaScan(String path){
+        MediaScannerConnection.scanFile(
+                getActivity().getApplicationContext(), 
+                new String[]{path}, 
+                null,null);
+    }
+}
\ No newline at end of file