Let Gradle out of Travis for the moment - needs additional review

[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 8039e52..b6ecd1a 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -26,15 +26,14 @@ package com.owncloud.android.ui.dialog;
  */
 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 com.owncloud.android.utils.Log_OC;
-
-import android.app.Dialog;
-import android.os.Bundle;

 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {
 
 public class RemoveFileDialogFragment extends ConfirmationDialogFragment 
 implements ConfirmationDialogFragmentListener {


@@ -97,6 +96,7 @@ implements ConfirmationDialogFragmentListener {
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {
             cg.getFileOperationsHelper().removeFile(mTargetFile, false);
         FileDataStorageManager storageManager = cg.getStorageManager();
         if (storageManager.getFileById(mTargetFile.getFileId()) != null) {
             cg.getFileOperationsHelper().removeFile(mTargetFile, false);

+            storageManager.triggerMediaScan(mTargetFile.getStoragePath());

         }
     }
     
         }
     }
     


@@ -105,9 +105,9 @@ implements ConfirmationDialogFragmentListener {
      */
     @Override
     public void onNeutral(String callerTag) {
      */
     @Override
     public void onNeutral(String callerTag) {

+        String path = mTargetFile.getStoragePath();

         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();
         


@@ -134,8 +134,10 @@ implements ConfirmationDialogFragmentListener {
             
            folder.setEtag("");
            storageManager.saveFile(folder);
             
            folder.setEtag("");
            storageManager.saveFile(folder);

-           Log_OC.d("RemoveFileDialogFragment", "Parent etag= |" + folder.getEtag() + "|");

         }
         }

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

     }
 
     @Override
     }
 
     @Override


@@ -143,4 +145,4 @@ implements ConfirmationDialogFragmentListener {
         // nothing to do here
     }
     
         // nothing to do here
     }
     

-}
+}
\ No newline at end of file