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

[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 eacc726..2453404 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -24,19 +24,17 @@ package com.owncloud.android.ui.dialog;
  *  
  *  @author David A. Velasco
  */
  *  
  *  @author David A. Velasco
  */

-import java.io.File;

 import java.util.Vector;
 
 import java.util.Vector;
 

+import android.app.Dialog;
+import android.os.Bundle;
+

 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
 
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.ui.activity.ComponentsGetter;
 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 
 implements ConfirmationDialogFragmentListener {
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 


@@ -97,9 +95,7 @@ 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);

         }
     }
     
         }
     }
     


@@ -108,10 +104,8 @@ 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();
         ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();

-        cg.getFileOperationsHelper()
-            .removeFile(mTargetFile, true);
+        cg.getFileOperationsHelper().removeFile(mTargetFile, true);

         
         FileDataStorageManager storageManager = cg.getStorageManager();
         
         
         FileDataStorageManager storageManager = cg.getStorageManager();
         


@@ -139,9 +133,6 @@ implements ConfirmationDialogFragmentListener {
            folder.setEtag("");
            storageManager.saveFile(folder);
         }
            folder.setEtag("");
            storageManager.saveFile(folder);
         }

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

     }
 
     @Override
     }
 
     @Override


@@ -149,10 +140,4 @@ 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
 }
\ No newline at end of file