Hide send-share menu from 3 dot menu and hide see details menu from p…

…review fragments.
nextmcloud · Aug 5, 2024 · 1e648a0 · 1e648a0
1 parent cf222d4
commit 1e648a0
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 5 deletions.
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
@@ -627,8 +627,11 @@ public void onOverflowIconClicked(OCFile file, View view) {
 
     public void openActionsMenu(final int filesCount, final Set<OCFile> checkedFiles, final boolean isOverflow) {
         throttler.run("overflowClick", () -> {
+            final List<Integer> additionalFilter = new ArrayList<>();
+            //need to hide the share menu because we have renamed another menu for sharing (NMC)
+            additionalFilter.add(R.id.action_send_share_file);
             final FragmentManager childFragmentManager = getChildFragmentManager();
-            FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow)
+            FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow, additionalFilter)
                 .setResultListener(childFragmentManager, this, (id) -> {
                     onFileActionChosen(id, checkedFiles);
                 })

diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.kt
@@ -395,7 +395,9 @@ class PreviewImageFragment : FileFragment(), Injectable {
                 R.id.action_move_or_copy,
                 R.id.action_favorite,
                 R.id.action_unset_favorite,
-                R.id.action_pin_to_homescreen
+                R.id.action_pin_to_homescreen,
+                // hide this option for NMC
+                R.id.action_see_details
             )
         )
 

diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
@@ -518,7 +518,9 @@ class PreviewMediaActivity :
                 R.id.action_move_or_copy,
                 R.id.action_favorite,
                 R.id.action_unset_favorite,
-                R.id.action_pin_to_homescreen
+                R.id.action_pin_to_homescreen,
+                // hide this option for NMC
+                R.id.action_see_details
             )
 
         if (getFile() != null && getFile().isSharedWithMe && !getFile().canReshare()) {

diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.kt
@@ -419,7 +419,9 @@ class PreviewMediaFragment : FileFragment(), OnTouchListener, Injectable {
                 R.id.action_move_or_copy,
                 R.id.action_favorite,
                 R.id.action_unset_favorite,
-                R.id.action_pin_to_homescreen
+                R.id.action_pin_to_homescreen,
+                // hide this option for NMC
+                R.id.action_see_details
             )
         )
 

diff --git a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java
@@ -284,7 +284,9 @@ private void showFileActions(OCFile file) {
                 R.id.action_move_or_copy,
                 R.id.action_favorite,
                 R.id.action_unset_favorite,
-                R.id.action_pin_to_homescreen
+                R.id.action_pin_to_homescreen,
+                //hide this option for NMC
+                R.id.action_see_details
                          ));
         if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
             additionalFilter.add(R.id.action_send_share_file);