Skip to content

Commit 11b3961

Browse files
committed
do not filter share types
Signed-off-by: alperozturk <[email protected]>
1 parent 8a6b272 commit 11b3961

File tree

1 file changed

+6
-19
lines changed
  • library/src/main/java/com/owncloud/android/lib/common/network

1 file changed

+6
-19
lines changed

library/src/main/java/com/owncloud/android/lib/common/network/WebdavEntry.kt

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class WebdavEntry constructor(
7373
var unreadCommentsCount = 0
7474
var isHasPreview = false
7575
var note = ""
76-
var sharees = arrayOfNulls<ShareeUser>(0)
76+
var sharees = arrayOf<ShareeUser>()
7777
var richWorkspace: String? = null
7878
var isLocked = false
7979
private set
@@ -374,22 +374,18 @@ class WebdavEntry constructor(
374374
if (prop != null && prop.value != null) {
375375
if (prop.value is ArrayList<*>) {
376376
val list = prop.value as ArrayList<*>
377-
val tempList: MutableList<ShareeUser?> = ArrayList()
377+
val tempList: MutableList<ShareeUser> = ArrayList()
378378
for (i in list.indices) {
379379
val element = list[i] as Element
380380
val user = createShareeUser(element)
381-
if (user != null) {
382-
tempList.add(user)
383-
}
381+
tempList.add(user)
384382
}
385383
sharees = tempList.toTypedArray()
386384
} else {
387385
// single item or empty
388386
val element = prop.value as Element
389387
val user = createShareeUser(element)
390-
if (user != null) {
391-
sharees = arrayOf(user)
392-
}
388+
sharees = arrayOf(user)
393389
}
394390
}
395391

@@ -548,20 +544,11 @@ class WebdavEntry constructor(
548544
return stringValue?.toLong() ?: 0L
549545
}
550546

551-
private fun createShareeUser(element: Element): ShareeUser? {
547+
private fun createShareeUser(element: Element): ShareeUser {
552548
val displayName = extractDisplayName(element)
553549
val userId = extractUserId(element)
554550
val shareType = extractShareType(element)
555-
val isSupportedShareType =
556-
ShareType.EMAIL == shareType ||
557-
ShareType.FEDERATED == shareType ||
558-
ShareType.GROUP == shareType ||
559-
ShareType.ROOM == shareType
560-
return if ((isSupportedShareType || displayName.isNotEmpty()) && userId.isNotEmpty()) {
561-
ShareeUser(userId, displayName, shareType)
562-
} else {
563-
null
564-
}
551+
return ShareeUser(userId, displayName, shareType)
565552
}
566553

567554
private fun extractDisplayName(element: Element): String {

0 commit comments

Comments
 (0)