The menu button options have been removed

Author: fesave

owncloudApp/src/main/java/com/owncloud/android/files/FileMenuFilter.java

@@ -92,15 +92,15 @@ public FileMenuFilter(OCFile targetFile, Account account, ComponentsGetter cg,
      * @param menu Options or context menu to filter.
      */
     public void filter(Menu menu, boolean displaySelectAll, boolean displaySelectInverse,
-                       boolean onlyAvailableOffline, boolean sharedByLinkFiles) {
+                       boolean onlyAvailableOffline, boolean sharedByLinkFiles, boolean isFileDetailFragment) {
         if (mFiles == null || mFiles.size() <= 0) {
             hideAll(menu);
 
         } else {
             List<Integer> toShow = new ArrayList<>();
             List<Integer> toHide = new ArrayList<>();
 
-            filter(toShow, toHide, displaySelectAll, displaySelectInverse, onlyAvailableOffline, sharedByLinkFiles);
+            filter(toShow, toHide, displaySelectAll, displaySelectInverse, onlyAvailableOffline, sharedByLinkFiles, isFileDetailFragment);
 
             MenuItem item;
             for (int i : toShow) {
@@ -140,7 +140,7 @@ private void hideAll(Menu menu) {
      */
 
     private void filter(List<Integer> toShow, List<Integer> toHide, boolean displaySelectAll,
-                        boolean displaySelectInverse, boolean onlyAvailableOffline, boolean sharedByLinkFiles) {
+                        boolean displaySelectInverse, boolean onlyAvailableOffline, boolean sharedByLinkFiles, boolean isFileDetailFragment) {
 
         boolean synchronizing = anyFileSynchronizing();
 
@@ -163,7 +163,7 @@ private void filter(List<Integer> toShow, List<Integer> toHide, boolean displayS
 
         // DOWNLOAD
         if (mFiles.isEmpty() || containsFolder() || anyFileDown() || synchronizing || videoPreviewing ||
-                onlyAvailableOffline || sharedByLinkFiles) {
+                onlyAvailableOffline || sharedByLinkFiles || isFileDetailFragment) {
             toHide.add(R.id.action_download_file);
 
         } else {
@@ -197,7 +197,7 @@ private void filter(List<Integer> toShow, List<Integer> toHide, boolean displayS
         }
 
         // OPEN WITH (different to preview!)
-        if (!isSingleFile() || !anyFileDown() || synchronizing) {
+        if (!isSingleFile() || !anyFileDown() || synchronizing || isFileDetailFragment) {
             toHide.add(R.id.action_open_file_with);
 
         } else {
@@ -248,7 +248,7 @@ private void filter(List<Integer> toShow, List<Integer> toHide, boolean displayS
         // SEND
         boolean sendAllowed = (mContext != null &&
                 mContext.getString(R.string.send_files_to_other_apps).equalsIgnoreCase("on"));
-        if (!isSingleFile() || !sendAllowed || synchronizing || videoStreaming || onlyAvailableOffline) {
+        if (!isSingleFile() || !sendAllowed || synchronizing || videoStreaming || onlyAvailableOffline || isFileDetailFragment) {
             toHide.add(R.id.action_send_file);
         } else {
             toShow.add(R.id.action_send_file);

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java

@@ -241,7 +241,7 @@ public void onPrepareOptionsMenu(Menu menu) {
                     mContainerActivity,
                     getActivity()
             );
-            mf.filter(menu, false, false, false, false);
+            mf.filter(menu, false, false, false, false,true);
         }
 
         // additional restriction for this fragment 

owncloudApp/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java

@@ -636,7 +636,7 @@ public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
                     getActivity()
             );
             mf.filter(menu, mEnableSelectAll, true, mFileListOption.isAvailableOffline(),
-                    mFileListOption.isSharedByLink());
+                    mFileListOption.isSharedByLink(),false);
             return true;
         }
 

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewAudioFragment.java

@@ -315,7 +315,7 @@ public void onPrepareOptionsMenu(Menu menu) {
                 mContainerActivity,
                 getActivity()
         );
-        mf.filter(menu, false, false, false, false);
+        mf.filter(menu, false, false, false, false,false);
 
         // additional restriction for this fragment 
         // TODO allow renaming in PreviewAudioFragment

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt

@@ -195,7 +195,7 @@ class PreviewImageFragment : FileFragment() {
                 mContainerActivity,
                 activity
             )
-            fileMenuFilter.filter(menu, false, false, false, false)
+            fileMenuFilter.filter(menu, false, false, false, false,false)
         }
 
         // additional restriction for this fragment

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewTextFragment.java

@@ -301,7 +301,7 @@ public void onPrepareOptionsMenu(Menu menu) {
                     mContainerActivity,
                     getActivity()
             );
-            mf.filter(menu, false, false, false, false);
+            mf.filter(menu, false, false, false, false,false);
         }
 
         // additional restriction for this fragment

owncloudApp/src/main/java/com/owncloud/android/ui/preview/PreviewVideoFragment.java

@@ -321,7 +321,7 @@ public void onPrepareOptionsMenu(@NonNull Menu menu) {
                 mContainerActivity,
                 getActivity()
         );
-        mf.filter(menu, false, false, false, false);
+        mf.filter(menu, false, false, false, false, false);
 
         // additional restrictions for this fragment