Merge remote-tracking branch 'remotes/upstream/master' into beta

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

diff --git a/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
index 6f7a159..6d40d8e 100644 (file)
--- a/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
+++ b/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
@@ -127,8 +127,7 @@ implements ConfirmationDialogFragmentListener {
 
             boolean containsFavorite = false;
             if (targetFile.isFolder()) {
 
             boolean containsFavorite = false;
             if (targetFile.isFolder()) {

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

                 for (OCFile file : files) {
                     containsFavorite = file.isFavorite() || containsFavorite;
 
                 for (OCFile file : files) {
                     containsFavorite = file.isFavorite() || containsFavorite;