From 7ce9457078ca417f0009725ca1ba56877df1addf Mon Sep 17 00:00:00 2001 From: A117870935 Date: Thu, 25 May 2023 13:05:14 +0530 Subject: [PATCH] Hide send-share menu from 3 dot menu and hide see details menu from preview fragments. --- .../com/owncloud/android/ui/fragment/OCFileListFragment.java | 5 +++-- .../com/owncloud/android/ui/preview/PreviewImageFragment.kt | 4 +++- .../com/owncloud/android/ui/preview/PreviewMediaActivity.kt | 4 +++- .../com/owncloud/android/ui/preview/PreviewMediaFragment.kt | 4 +++- .../owncloud/android/ui/preview/PreviewTextFileFragment.java | 4 +++- 5 files changed, 15 insertions(+), 6 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 index d6725c51d7ef..8a78bb884743 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 @@ -632,12 +632,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); } - + // NMC: always 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); 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 index 96cc11fc2468..5dff88986c42 100644 --- 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 index 2b9b793b87ff..3690130533f7 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 @@ -536,7 +536,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 index f939dbf8ecfc..d3238ea3eb1e 100644 --- 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 index 410173d0fab6..9625ce03f9ea 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 @@ -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);