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 index 3af6eb035c0a..6a5a94e817e3 100644 --- a/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -617,8 +617,11 @@ public void onOverflowIconClicked(OCFile file, View view) { public void openActionsMenu(final int filesCount, final Set checkedFiles, final boolean isOverflow) { throttler.run("overflowClick", () -> { + final List 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.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java index 7c1727ba22ee..de4d32d0152d 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -407,7 +407,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); 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 index 23d7bd00b40f..bdecfea7ec01 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt @@ -477,7 +477,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.java b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java index a1ef3e805734..bf09a83d4bc4 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java @@ -443,7 +443,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); 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 index 195a55cdef61..4b8a82460081 100644 --- a/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java +++ b/app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java @@ -304,7 +304,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);