Skip to content

Commit c8aedf7

Browse files
committed
Hide send-share menu from 3 dot menu and hide see details menu from preview fragments.
1 parent a5578e9 commit c8aedf7

4 files changed

Lines changed: 13 additions & 4 deletions

File tree

‎app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,8 +610,11 @@ public void onOverflowIconClicked(OCFile file, View view) {
610610

611611
public void openActionsMenu(final int filesCount, final Set<OCFile> checkedFiles, final boolean isOverflow) {
612612
throttler.run("overflowClick", () -> {
613+
final List<Integer> additionalFilter = new ArrayList<>();
614+
//need to hide the share menu because we have renamed another menu for sharing (NMC)
615+
additionalFilter.add(R.id.action_send_share_file);
613616
final FragmentManager childFragmentManager = getChildFragmentManager();
614-
FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow)
617+
FileActionsBottomSheet.newInstance(filesCount, checkedFiles, isOverflow, additionalFilter)
615618
.setResultListener(childFragmentManager, this, (id) -> {
616619
onFileActionChosen(id, checkedFiles);
617620
})

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,9 @@ private void showFileActions(OCFile file) {
379379
R.id.action_move,
380380
R.id.action_copy,
381381
R.id.action_favorite,
382-
R.id.action_unset_favorite
382+
R.id.action_unset_favorite,
383+
//hide this option for NMC
384+
R.id.action_see_details
383385
));
384386
if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
385387
additionalFilter.add(R.id.action_send_share_file);

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,9 @@ private void showFileActions(OCFile file) {
427427
R.id.action_copy,
428428
R.id.action_favorite,
429429
R.id.action_unset_favorite,
430-
R.id.action_pin_to_homescreen
430+
R.id.action_pin_to_homescreen,
431+
//hide this option for NMC
432+
R.id.action_see_details
431433
));
432434
if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
433435
additionalFilter.add(R.id.action_send_share_file);

‎app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,9 @@ private void showFileActions(OCFile file) {
304304
R.id.action_move,
305305
R.id.action_copy,
306306
R.id.action_favorite,
307-
R.id.action_unset_favorite
307+
R.id.action_unset_favorite,
308+
//hide this option for NMC
309+
R.id.action_see_details
308310
));
309311
if (getFile() != null && getFile().isSharedWithMe() && !getFile().canReshare()) {
310312
additionalFilter.add(R.id.action_send_share_file);

0 commit comments

Comments
 (0)