Skip to content

Commit 5bb632c

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 e3e0264 commit 5bb632c

File tree

88 files changed

+3958
-1276
lines changed

Some content is hidden

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

88 files changed

+3958
-1276
lines changed

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
@@ -83,7 +83,7 @@ class SharePermissionManagerTest {
8383
// region Helper Method Tests
8484
@Test
8585
fun testCanEditShouldReturnTrueIfAllPermissionsPresent() {
86-
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER, isFolder = true)
86+
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER, isFolder = true)
8787
assertTrue(SharePermissionManager.canEdit(share))
8888
}
8989

@@ -127,15 +127,15 @@ class SharePermissionManagerTest {
127127
@Test
128128
fun testGetMaximumPermissionForFolder() {
129129
assertEquals(
130-
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER,
130+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER,
131131
SharePermissionManager.getMaximumPermission(isFolder = true)
132132
)
133133
}
134134

135135
@Test
136136
fun testGetMaximumPermissionForFile() {
137137
assertEquals(
138-
OCShare.MAXIMUM_PERMISSIONS_FOR_FILE,
138+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE,
139139
SharePermissionManager.getMaximumPermission(isFolder = false)
140140
)
141141
}
@@ -144,7 +144,7 @@ class SharePermissionManagerTest {
144144
// region GetSelectedTypeTests
145145
@Test
146146
fun testGetSelectedTypeShouldReturnCanEditWhenFullPermissionsGiven() {
147-
val share = createShare(OCShare.MAXIMUM_PERMISSIONS_FOR_FILE)
147+
val share = createShare(SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FILE)
148148
assertEquals(QuickPermissionType.CAN_EDIT, SharePermissionManager.getSelectedType(share, encrypted = false))
149149
}
150150

0 commit comments

Comments
 (0)