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 97eaf1aec34e..c9382c744229 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 @@ -609,12 +609,13 @@ public void openActionsMenu(final int filesCount, final Set checkedFiles List toHide = new ArrayList<>(); if (isAPKorAAB(checkedFiles)) { - toHide.add(R.id.action_send_share_file); toHide.add(R.id.action_export_file); toHide.add(R.id.action_sync_file); toHide.add(R.id.action_download_file); } - + // need to hide the share menu because we have renamed another menu for sharing (NMC) + toHide.add(R.id.action_send_share_file); + FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow, toHide) .setResultListener(childFragmentManager, this, (id) -> { onFileActionChosen(id, checkedFiles); @@ -1047,7 +1048,7 @@ public void onItemClicked(OCFile file) { Snackbar.LENGTH_LONG).show(); return; } - + // Click on a file if (PreviewImageFragment.canBePreviewed(file)) { // preview image - it handles the download, if needed 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 7085235f9109..940bd308cc7a 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 @@ -396,7 +396,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 0da228a12ca4..0a0742608929 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 @@ -470,7 +470,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 39f2b0900db9..5619d90652a8 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 @@ -427,7 +427,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 56c5935b6a12..08f9dd81995d 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 @@ -289,7 +289,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);