Merge branch 'develop' of https://github.com/owncloud/android into material_toolbar

[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 782ed04..72f40f9 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFileDialogFragment.java
@@ -110,20 +110,21 @@ implements ConfirmationDialogFragmentListener {
         
         FileDataStorageManager storageManager = cg.getStorageManager();
         
         
         FileDataStorageManager storageManager = cg.getStorageManager();
         

-        boolean containsKeepInSync = false;
+        boolean containsFavorite = false;

         if (mTargetFile.isFolder()) {
         if (mTargetFile.isFolder()) {

-            Vector<OCFile> files = storageManager.getFolderContent(mTargetFile);
+            // TODO Enable when "On Device" is recovered ?
+            Vector<OCFile> files = storageManager.getFolderContent(mTargetFile/*, false*/);

             for(OCFile file: files) {
             for(OCFile file: files) {

-                containsKeepInSync = file.keepInSync() || containsKeepInSync;
+                containsFavorite = file.isFavorite() || containsFavorite;

 
 

-                if (containsKeepInSync)
+                if (containsFavorite)

                     break;
             }
         }
 
                     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) {
+        // Remove etag for parent, if file is a favorite
+        // or is a folder and contains favorite
+        if (mTargetFile.isFavorite() || containsFavorite) {

             OCFile folder = null;
             if (mTargetFile.isFolder()) {
                 folder = mTargetFile;
             OCFile folder = null;
             if (mTargetFile.isFolder()) {
                 folder = mTargetFile;