Browse Source

hide download also on folders

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky 6 năm trước cách đây
mục cha
commit
b785b0b18d

+ 2 - 3
src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java

@@ -333,7 +333,7 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
                 publicShare.getPermissions()
         );
         SharingMenuHelper.setupHideFileDownload(menu.findItem(R.id.action_hide_file_download),
-            publicShare.isHideFileDownload(), file.isFolder(), capabilities);
+            publicShare.isHideFileDownload(), capabilities);
         SharingMenuHelper.setupPasswordMenuItem(
                 menu.findItem(R.id.action_password),
                 publicShare.isPasswordProtected()
@@ -400,8 +400,7 @@ public class FileDetailSharingFragment extends Fragment implements UserListAdapt
 
     @Override
     public void setHideFileDownloadPermissionToShare(OCFile file, boolean hideFileDownload) {
-        ((FileActivity) getActivity()).getFileOperationsHelper().
-            setHideFileDownloadPermissionsToShare(file, hideFileDownload);
+        fileOperationsHelper.setHideFileDownloadPermissionsToShare(file, hideFileDownload);
     }
 
     @Override

+ 3 - 5
src/main/java/com/owncloud/android/ui/fragment/util/SharingMenuHelper.java

@@ -66,12 +66,10 @@ public final class SharingMenuHelper {
     /**
      * Sets checked/visibility state on the given {@link MenuItem} based on the given criteria.
      *  @param menuItem the {@link MenuItem} to be setup
-     * @param isFolder    flag if it is a folder
-     * @param capabilities
+     * @param capabilities Capabilities of server to check if hide download is supported
      */
-    public static void setupHideFileDownload(MenuItem menuItem, boolean hideFileDownload, boolean isFolder,
-                                             OCCapability capabilities) {
-        if (isFolder || !capabilities.getVersion().isHideFileDownloadSupported()) {
+    public static void setupHideFileDownload(MenuItem menuItem, boolean hideFileDownload, OCCapability capabilities) {
+        if (!capabilities.getVersion().isHideFileDownloadSupported()) {
             menuItem.setVisible(false);
         } else {
             menuItem.setVisible(true);