VladPolskiy/nextcloud-android-library
1
0
Fork 0
mirror of https://github.com/nextcloud/android-library.git synced 2025-07-23 00:49:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix git conflict

Browse Source 
Signed-off-by: alperozturk <alper_ozturk@proton.me>
This commit is contained in:
alperozturk
2025-07-18 08:57:43 +02:00
parent ffaef1f6e5
commit fd597d394a
1 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ class WebdavEntry constructor(
var unreadCommentsCount = 0
var isHasPreview = false
var note = ""
var sharees = arrayOfNulls<ShareeUser>(0)
var sharees = arrayOf<ShareeUser>()
var richWorkspace: String? = null
var isLocked = false
private set
@ -374,22 +374,18 @@ class WebdavEntry constructor(
if (prop != null && prop.value != null) {
if (prop.value is ArrayList<*>) {
val list = prop.value as ArrayList<*>
val tempList: MutableList<ShareeUser?> = ArrayList()
val tempList: MutableList<ShareeUser> = ArrayList()
for (i in list.indices) {
val element = list[i] as Element
val user = createShareeUser(element)
if (user != null) {
tempList.add(user)
}
tempList.add(user)
}
sharees = tempList.toTypedArray()
} else {
// single item or empty
val element = prop.value as Element
val user = createShareeUser(element)
if (user != null) {
sharees = arrayOf(user)
}
sharees = arrayOf(user)
}
}
@ -548,21 +544,11 @@ class WebdavEntry constructor(
return stringValue?.toLong() ?: 0L
}
private fun createShareeUser(element: Element): ShareeUser? {
private fun createShareeUser(element: Element): ShareeUser {
val displayName = extractDisplayName(element)
val userId = extractUserId(element)
val shareType = extractShareType(element)
val isSupportedShareType =
ShareType.EMAIL == shareType ||
ShareType.FEDERATED == shareType ||
ShareType.GROUP == shareType ||
ShareType.FEDERATED_GROUP == shareType ||
ShareType.ROOM == shareType
return if ((isSupportedShareType || displayName.isNotEmpty()) && userId.isNotEmpty()) {
ShareeUser(userId, displayName, shareType)
} else {
null
}
return ShareeUser(userId, displayName, shareType)
}
private fun extractDisplayName(element: Element): String {