Skip to content

Show unlock action for the file owner #17838

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
falkloewert wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −1
Open

Show unlock action for the file owner #17838

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
4 changes: 3 additions & 1 deletion app/src/main/java/com/nextcloud/android/files/FileLockingHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ object FileLockingHelper {
if (!file.isLocked || file.lockOwnerId == null || file.lockType != FileLockType.MANUAL) {
return false
}
return file.lockOwnerId == userId
// Lock owner can always unlock. The file owner can as well: server-side
// LockService::canUnlock allows TYPE_USER locks for the file owner.
return file.lockOwnerId == userId || file.ownerId == userId
}
}
11 changes: 11 additions & 0 deletions app/src/test/java/com/nextcloud/android/files/FileLockingHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,17 @@ class FileLockingHelperTest {
Assert.assertFalse(FileLockingHelper.canUserUnlockFile(USER_NAME, file))
}

@Test
fun fileOwnerCanUnlockLockOfAnotherClient() {
val file = OCFile("/foo.md").apply {
isLocked = true
lockOwnerId = "text"
lockType = FileLockType.MANUAL
ownerId = USER_NAME
}
Assert.assertTrue(FileLockingHelper.canUserUnlockFile(USER_NAME, file))
}

@Test
fun typeNotManual_cannotUnlock() {
val file = OCFile("/foo.md").apply {
Expand Down