Skip to content
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.

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

share a folder from inside the folder #3659

Merged
merged 5 commits into from May 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions CHANGELOG.md
Expand Up @@ -29,6 +29,7 @@ Summary
* Enhancement - Support for SVG files added: [#1033](https://github.com/owncloud/android/issues/1033)
* Enhancement - Improved copy/move dialog: [#1414](https://github.com/owncloud/android/issues/1414)
* Enhancement - Thumbnail click action in file detail: [#3653](https://github.com/owncloud/android/pull/3653)
* Enhancement - Share a folder from within the folder: [#1441](https://github.com/owncloud/android/issues/1441)

Details
-------
Expand Down Expand Up @@ -194,6 +195,13 @@ Details

https://github.com/owncloud/android/pull/3653

* Enhancement - Share a folder from within the folder: [#1441](https://github.com/owncloud/android/issues/1441)

You can share a folder clicking in the share icon inside the folder.

https://github.com/owncloud/android/issues/1441
https://github.com/owncloud/android/pull/3659

Changelog for ownCloud Android Client [2.20.0] (2022-02-16)
=======================================
The following sections list the changes in ownCloud Android Client 2.20.0 relevant to
Expand Down
6 changes: 6 additions & 0 deletions changelog/unreleased/3659
@@ -0,0 +1,6 @@
Enhancement: Share a folder from within the folder

You can share a folder clicking in the share icon inside the folder.

https://github.com/owncloud/android/issues/1441
https://github.com/owncloud/android/pull/3659
Expand Up @@ -669,6 +669,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
mSearchView.setOnQueryTextFocusChangeListener(this);
mSearchView.setOnQueryTextListener(this);

menu.removeItem(menu.findItem(R.id.action_share_file).getItemId());

return true;
}

Expand Down
Expand Up @@ -276,6 +276,18 @@ public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflat
mSearchView.setQueryHint(getResources().getString(R.string.actionbar_search));
mSearchView.setOnQueryTextFocusChangeListener(this);
mSearchView.setOnQueryTextListener(this);

if (isPickingAFolder()) {
menu.removeItem(menu.findItem(R.id.action_share_file).getItemId());
}
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.action_share_file) {
mContainerActivity.getFileOperationsHelper().showShareFile(mFile);
}
return super.onOptionsItemSelected(item);
}

public void updateFileListOption(FileListOption newFileListOption) {
Expand Down
6 changes: 6 additions & 0 deletions owncloudApp/src/main/res/menu/main_menu.xml
Expand Up @@ -30,5 +30,11 @@
android:orderInCategory="1"
android:title="@string/actionbar_select_all"
android:visible="false" />
<item
android:id="@+id/action_share_file"
android:title="@string/action_share"
android:icon="@drawable/ic_action_share"
app:showAsAction="ifRoom"
android:orderInCategory="1" />

</menu>