Skip to content

Commit dff1619

Browse files
committed
Customizations done for Sharing with test cases.
Download limit functionality added. Email selection from contact implemented with Test Cases. Share new ui updated with divider, index icons, colors, empty state. Received sharing disabled state handled. Test cases updated Updated colors as per NMC-4218
1 parent cf7ce54 commit dff1619

88 files changed

Lines changed: 3966 additions & 1249 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

app/src/androidTest/java/com/nextcloud/client/FileDisplayActivityIT.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import com.owncloud.android.lib.resources.shares.ShareType
3535
import com.owncloud.android.operations.CreateFolderOperation
3636
import com.owncloud.android.ui.activity.FileDisplayActivity
3737
import com.owncloud.android.ui.adapter.OCFileListItemViewHolder
38+
import com.owncloud.android.ui.fragment.util.SharePermissionManager
3839
import org.junit.Assert
3940
import org.junit.Rule
4041
import org.junit.Test
@@ -68,7 +69,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
6869
"admin",
6970
false,
7071
"",
71-
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
72+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER
7273
).execute(client).isSuccess
7374
)
7475

app/src/androidTest/java/com/nextcloud/utils/SharePermissionManagerTest.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ class SharePermissionManagerTest {
8484
// region Helper Method Tests
8585
@Test
8686
fun testCanEditShouldReturnTrueIfAllPermissionsPresent() {
87-
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, isFolder = true)
87+
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER, isFolder = true)
8888
assertTrue(SharePermissionManager.canEdit(share))
8989
}
9090

@@ -128,15 +128,15 @@ class SharePermissionManagerTest {
128128
@Test
129129
fun testGetMaximumPermissionForFolder() {
130130
assertEquals(
131-
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER,
131+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER,
132132
SharePermissionManager.getMaximumPermission(isFolder = true)
133133
)
134134
}
135135

136136
@Test
137137
fun testGetMaximumPermissionForFile() {
138138
assertEquals(
139-
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE,
139+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE,
140140
SharePermissionManager.getMaximumPermission(isFolder = false)
141141
)
142142
}
@@ -145,7 +145,7 @@ class SharePermissionManagerTest {
145145
// region GetSelectedTypeTests
146146
@Test
147147
fun testGetSelectedTypeShouldReturnCanEditWhenFullPermissionsGiven() {
148-
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FILE)
148+
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE)
149149
assertEquals(QuickPermissionType.CAN_EDIT, SharePermissionManager.getSelectedType(share, encrypted = false))
150150
}
151151

0 commit comments

Comments
 (0)