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

+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.os.Bundle;
-

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


@@ -98,12 +100,39 @@ implements ConfirmationDialogFragmentListener {
     }
     
     /**
     }
     
     /**

-     * Performs the removal of the local copy of the taget file
+     * Performs the removal of the local copy of the target file

      */
     @Override
     public void onNeutral(String callerTag) {
      */
     @Override
     public void onNeutral(String callerTag) {

-        ((ComponentsGetter)getSherlockActivity()).getFileOperationsHelper()
-            .removeFile(mTargetFile, true);
+        ComponentsGetter cg = (ComponentsGetter)getSherlockActivity();
+        cg.getFileOperationsHelper().removeFile(mTargetFile, true);
+        
+        FileDataStorageManager storageManager = cg.getStorageManager();
+        
+        boolean containsKeepInSync = false;
+        if (mTargetFile.isFolder()) {
+            Vector<OCFile> files = storageManager.getFolderContent(mTargetFile);
+            for(OCFile file: files) {
+                containsKeepInSync = file.keepInSync() || containsKeepInSync;
+
+                if (containsKeepInSync)
+                    break;
+            }
+        }
+
+        // Remove etag for parent, if file is a keep_in_sync 
+        // or is a folder and contains keep_in_sync        
+        if (mTargetFile.keepInSync() || containsKeepInSync) {
+            OCFile folder = null;
+            if (mTargetFile.isFolder()) {
+                folder = mTargetFile;
+            } else {
+                folder = storageManager.getFileById(mTargetFile.getParentId());
+            }
+            
+           folder.setEtag("");
+           storageManager.saveFile(folder);
+        }

     }
 
     @Override
     }
 
     @Override


@@ -111,4 +140,4 @@ implements ConfirmationDialogFragmentListener {
         // nothing to do here
     }
     
         // nothing to do here
     }
     

-}
+}
\ No newline at end of file