Skip to content

[stable-3.29] Nmc/2131 Hide share menu #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[stable-3.29] Nmc/2131 Hide share menu #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,12 +609,13 @@ public void openActionsMenu(final int filesCount, final Set<OCFile> checkedFiles

List<Integer> 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);
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()) {
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/preview/PreviewMediaFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/owncloud/android/ui/preview/PreviewTextFileFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down