From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 29 Oct 2015 18:00:56 +0000 (+0100)
Subject: merge multi select
X-Git-Tag: beta-20151122~79
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ab4da7ea9236aaa3c2bb4d494fbd1a7ba588f820?ds=inline;hp=-c

merge multi select
---

ab4da7ea9236aaa3c2bb4d494fbd1a7ba588f820
diff --git a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
index 97724046..7657d107 100644
--- a/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
+++ b/src/com/owncloud/android/ui/adapter/FileListListAdapter.java
@@ -212,24 +212,24 @@ public class FileListListAdapter extends BaseAdapter implements ListAdapter {
                     fileSizeV.setVisibility(View.VISIBLE);
                     fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.getFileLength()));
 
-                    if (!file.isFolder()) {
-                        AbsListView parentList = (AbsListView)parent;
-                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
-                                checkBoxV.setVisibility(View.GONE);
-                            } else {
-                                if (parentList.isItemChecked(position)) {
-                                    checkBoxV.setImageResource(
-                                            R.drawable.ic_checkbox_marked);
-                                } else {
-                                    checkBoxV.setImageResource(
-                                            R.drawable.ic_checkbox_blank_outline);
-                                }
-                                checkBoxV.setVisibility(View.VISIBLE);
-                            }
-                        }
-
-                    } else { //Folder
+//                    if (!file.isFolder()) {
+//                        AbsListView parentList = (AbsListView)parent;
+//                        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
+//                            if (parentList.getChoiceMode() == AbsListView.CHOICE_MODE_NONE) {
+//                                checkBoxV.setVisibility(View.GONE);
+//                            } else {
+//                                if (parentList.isItemChecked(position)) {
+//                                    checkBoxV.setImageResource(
+//                                            R.drawable.ic_checkbox_marked);
+//                                } else {
+//                                    checkBoxV.setImageResource(
+//                                            R.drawable.ic_checkbox_blank_outline);
+//                                }
+//                                checkBoxV.setVisibility(View.VISIBLE);
+//                            }
+//                        }
+
+                    if (file.isFolder()) {
                         fileSizeSeparatorV.setVisibility(View.INVISIBLE);
                         fileSizeV.setVisibility(View.INVISIBLE);
                     }
diff --git a/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java b/src/com/owncloud/android/ui/dialog/RemoveFilesDialogFragment.java
index 6f7a159a..6d40d8e7 100644
--- 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()) {
-                // 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;