From 15dc7be9d9d0863b9cfd0aad1466bbf5bfbace90 Mon Sep 17 00:00:00 2001 From: "David A. Velasco" Date: Wed, 11 Feb 2015 16:51:46 +0100 Subject: [PATCH] Count of files & folders removed from view to choose target folder for a MOVE operation --- .../owncloud/android/ui/fragment/OCFileListFragment.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index 550b3a5b..d243efc7 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -127,8 +127,12 @@ public class OCFileListFragment extends ExtendedListFragment { } mFooterView = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate( - R.layout.list_footer, null, false); - setFooterView(mFooterView); + R.layout.list_footer, null, false); + if (mJustFolders) { + removeFooterView(mFooterView); + } else { + setFooterView(mFooterView); + } Bundle args = getArguments(); mJustFolders = (args == null) ? false : args.getBoolean(ARG_JUST_FOLDERS, false); @@ -442,8 +446,10 @@ public class OCFileListFragment extends ExtendedListFragment { } // Fix for showing or not to show the footerView - if (folders == 0 && files == 0) { // If no files or folders, remove footerView for allowing - // to show the emptyList message + if (mJustFolders || (folders == 0 && files == 0)) { + // If fragment to choose target folder for a MOVE or + // no files or folders, + // remove footerView for allowing to show the emptyList message removeFooterView(mFooterView); } else { // set a new footerView if there is not one for showing the number or files/folders if (getFooterViewCount()== 0) { -- 2.11.0