Skip to content

Commit afcd5d8

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 NMC-3928 fix: avoid resetting download counter on every update of advance permission NMC-4653: clear edittext focus on action done
1 parent 9a491e9 commit afcd5d8

File tree

90 files changed

+4426
-1306
lines changed

Some content is hidden

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

90 files changed

+4426
-1306
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ import org.junit.After
4444
import org.junit.Assert.assertEquals
4545
import org.junit.Assert.assertTrue
4646
import org.junit.Before
47+
import com.owncloud.android.ui.fragment.util.SharePermissionManager
48+
import org.junit.Assert
4749
import org.junit.Rule
4850
import org.junit.Test
4951

@@ -79,7 +81,7 @@ class FileDisplayActivityIT : AbstractOnServerIT() {
7981
"admin",
8082
false,
8183
"",
82-
OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
84+
SharePermissionManager.CAN_EDIT_PERMISSIONS_FOR_FOLDER
8385
).execute(client).isSuccess
8486
)
8587

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)