Skip to content

Shares: Honor write/delete permissions inside shared folders #194

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

Open
paolostivanin wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

Shares: Honor write/delete permissions inside shared folders #194

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
11 changes: 8 additions & 3 deletions ...pp/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,13 +994,18 @@ class MainFileListFragment : Fragment(),
* Check whether the fab should be shown or hidden depending on the [FileListOption] and
* the current folder displayed permissions
*
* Show FAB when [FileListOption.ALL_FILES] and not picking a folder
* Hide FAB When [FileListOption.SHARED_BY_LINK], [FileListOption.AV_OFFLINE] or picking a folder
* Show FAB when [FileListOption.ALL_FILES], or when inside a sub-folder reached via
* [FileListOption.SHARED_BY_LINK] (i.e. a folder shared with the user in the Shares space)
* and the current folder grants add-file or add-subdirectory permission.
* Hide FAB at the flat-list roots ([FileListOption.SHARED_BY_LINK] root,
* [FileListOption.AV_OFFLINE]) or when picking a folder.
*
* @param newFileListOption new file list option to enable.
*/
private fun showOrHideFab(newFileListOption: FileListOption, currentFolder: OCFile) {
if (!newFileListOption.isAllFiles() || isPickingAFolder() ||
val isFabSupportedView = newFileListOption.isAllFiles() ||
(newFileListOption.isSharedByLink() && currentFolder.remotePath != ROOT_PATH)
if (!isFabSupportedView || isPickingAFolder() ||
(!currentFolder.hasAddFilePermission && !currentFolder.hasAddSubdirectoriesPermission)) {
toggleFabVisibility(false)
} else {
Expand Down
3 changes: 2 additions & 1 deletion ...p/src/main/java/eu/opencloud/android/presentation/files/filelist/MainFileListViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,8 @@ class MainFileListViewModel(
displaySelectAll = displaySelectAll,
displaySelectInverse = isMultiselection,
onlyAvailableOfflineFiles = fileListOption.value.isAvailableOffline(),
onlySharedByLinkFiles = fileListOption.value.isSharedByLink(),
onlySharedByLinkFiles = fileListOption.value.isSharedByLink() &&
currentFolderDisplayed.value.remotePath == ROOT_PATH,
shareViaLinkAllowed = shareViaLinkAllowed,
shareWithUsersAllowed = shareWithUsersAllowed,
sendAllowed = sendAllowed,
Expand Down
Loading