@@ -73,7 +73,7 @@ class WebdavEntry constructor(
73
73
var unreadCommentsCount = 0
74
74
var isHasPreview = false
75
75
var note = " "
76
- var sharees = arrayOfNulls <ShareeUser >(0 )
76
+ var sharees = arrayOf <ShareeUser >()
77
77
var richWorkspace: String? = null
78
78
var isLocked = false
79
79
private set
@@ -374,22 +374,18 @@ class WebdavEntry constructor(
374
374
if (prop != null && prop.value != null ) {
375
375
if (prop.value is ArrayList <* >) {
376
376
val list = prop.value as ArrayList <* >
377
- val tempList: MutableList <ShareeUser ? > = ArrayList ()
377
+ val tempList: MutableList <ShareeUser > = ArrayList ()
378
378
for (i in list.indices) {
379
379
val element = list[i] as Element
380
380
val user = createShareeUser(element)
381
- if (user != null ) {
382
- tempList.add(user)
383
- }
381
+ tempList.add(user)
384
382
}
385
383
sharees = tempList.toTypedArray()
386
384
} else {
387
385
// single item or empty
388
386
val element = prop.value as Element
389
387
val user = createShareeUser(element)
390
- if (user != null ) {
391
- sharees = arrayOf(user)
392
- }
388
+ sharees = arrayOf(user)
393
389
}
394
390
}
395
391
@@ -548,20 +544,11 @@ class WebdavEntry constructor(
548
544
return stringValue?.toLong() ? : 0L
549
545
}
550
546
551
- private fun createShareeUser (element : Element ): ShareeUser ? {
547
+ private fun createShareeUser (element : Element ): ShareeUser {
552
548
val displayName = extractDisplayName(element)
553
549
val userId = extractUserId(element)
554
550
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)
565
552
}
566
553
567
554
private fun extractDisplayName (element : Element ): String {
0 commit comments