Skip to content

[stable-3.32] Nmc/1924 Sharing customizations #361

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
wants to merge 1 commit into
base: stable-3.32
Choose a base branch
from
Open

[stable-3.32] Nmc/1924 Sharing customizations #361

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
3 changes: 2 additions & 1 deletion app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.owncloud.android.lib.resources.shares.ShareType
import com.owncloud.android.operations.CreateFolderOperation
import com.owncloud.android.ui.activity.FileDisplayActivity
import com.owncloud.android.ui.adapter.OCFileListItemViewHolder
import com.owncloud.android.ui.fragment.util.SharePermissionManager
import org.junit.Assert
import org.junit.Rule
import org.junit.Test
Expand Down Expand Up @@ -68,7 +69,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
"admin",
false,
"",
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER
).execute(client).isSuccess
)

Expand Down
8 changes: 4 additions & 4 deletions app/src/androidTest/java/com/nextcloud/utils/SharePermissionManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class SharePermissionManagerTest {
// region Helper Method Tests
@Test
fun testCanEditShouldReturnTrueIfAllPermissionsPresent() {
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, isFolder = true)
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER, isFolder = true)
assertTrue(SharePermissionManager.canEdit(share))
}

Expand Down Expand Up @@ -129,15 +129,15 @@ class SharePermissionManagerTest {
@Test
fun testGetMaximumPermissionForFolder() {
assertEquals(
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER,
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER,
SharePermissionManager.getMaximumPermission(isFolder = true)
)
}

@Test
fun testGetMaximumPermissionForFile() {
assertEquals(
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE,
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE,
SharePermissionManager.getMaximumPermission(isFolder = false)
)
}
Expand All @@ -146,7 +146,7 @@ class SharePermissionManagerTest {
// region GetSelectedTypeTests
@Test
fun testGetSelectedTypeShouldReturnCanEditWhenFullPermissionsGiven() {
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FILE)
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE)
assertEquals(QuickPermissionType.CAN_EDIT, SharePermissionManager.getSelectedType(share, encrypted = false))
}

Expand Down
Loading