mirror of
https://github.com/owncloud/android-library.git
synced 2025-06-07 16:06:08 +00:00
Apply CR changes
This commit is contained in:
parent
c8d93400e0
commit
b2b32c048b
@ -225,74 +225,96 @@ class ShareXMLParser {
|
|||||||
|
|
||||||
val name = parser.name
|
val name = parser.name
|
||||||
|
|
||||||
if (name.equals(NODE_ELEMENT, ignoreCase = true)) {
|
when {
|
||||||
// patch to work around servers responding with extra <element> surrounding all
|
name.equals(NODE_ELEMENT, ignoreCase = true) -> {
|
||||||
// the shares on the same file before
|
// patch to work around servers responding with extra <element> surrounding all
|
||||||
// https://github.com/owncloud/core/issues/6992 was fixed
|
// the shares on the same file before
|
||||||
readElement(parser, shares)
|
// https://github.com/owncloud/core/issues/6992 was fixed
|
||||||
|
readElement(parser, shares)
|
||||||
} else if (name.equals(NODE_ID, ignoreCase = true)) {
|
|
||||||
remoteShare.id = Integer.parseInt(readNode(parser, NODE_ID)).toLong()
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_ITEM_TYPE, ignoreCase = true)) {
|
|
||||||
remoteShare.isFolder = readNode(parser, NODE_ITEM_TYPE).equals(TYPE_FOLDER, ignoreCase = true)
|
|
||||||
fixPathForFolder(remoteShare)
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_ITEM_SOURCE, ignoreCase = true)) {
|
|
||||||
remoteShare.itemSource = java.lang.Long.parseLong(readNode(parser, NODE_ITEM_SOURCE))
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_PARENT, ignoreCase = true)) {
|
|
||||||
readNode(parser, NODE_PARENT)
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_SHARE_TYPE, ignoreCase = true)) {
|
|
||||||
val value = Integer.parseInt(readNode(parser, NODE_SHARE_TYPE))
|
|
||||||
remoteShare.shareType = ShareType.fromValue(value)
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_SHARE_WITH, ignoreCase = true)) {
|
|
||||||
remoteShare.shareWith = readNode(parser, NODE_SHARE_WITH)
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_FILE_SOURCE, ignoreCase = true)) {
|
|
||||||
remoteShare.fileSource = java.lang.Long.parseLong(readNode(parser, NODE_FILE_SOURCE))
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_PATH, ignoreCase = true)) {
|
|
||||||
remoteShare.path = readNode(parser, NODE_PATH)
|
|
||||||
fixPathForFolder(remoteShare)
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_PERMISSIONS, ignoreCase = true)) {
|
|
||||||
remoteShare.permissions = Integer.parseInt(readNode(parser, NODE_PERMISSIONS))
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_STIME, ignoreCase = true)) {
|
|
||||||
remoteShare.sharedDate = java.lang.Long.parseLong(readNode(parser, NODE_STIME))
|
|
||||||
|
|
||||||
} else if (name.equals(NODE_EXPIRATION, ignoreCase = true)) {
|
|
||||||
val value = readNode(parser, NODE_EXPIRATION)
|
|
||||||
if (value.isNotEmpty()) {
|
|
||||||
remoteShare.expirationDate = WebdavUtils.parseResponseDate(value)!!.time
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_TOKEN, ignoreCase = true)) {
|
name.equals(NODE_ID, ignoreCase = true) -> {
|
||||||
remoteShare.token = readNode(parser, NODE_TOKEN)
|
remoteShare.id = Integer.parseInt(readNode(parser, NODE_ID)).toLong()
|
||||||
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_STORAGE, ignoreCase = true)) {
|
name.equals(NODE_ITEM_TYPE, ignoreCase = true) -> {
|
||||||
readNode(parser, NODE_STORAGE)
|
remoteShare.isFolder = readNode(parser, NODE_ITEM_TYPE).equals(TYPE_FOLDER, ignoreCase = true)
|
||||||
} else if (name.equals(NODE_MAIL_SEND, ignoreCase = true)) {
|
fixPathForFolder(remoteShare)
|
||||||
readNode(parser, NODE_MAIL_SEND)
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_SHARE_WITH_DISPLAY_NAME, ignoreCase = true)) {
|
name.equals(NODE_ITEM_SOURCE, ignoreCase = true) -> {
|
||||||
remoteShare.sharedWithDisplayName = readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME)
|
remoteShare.itemSource = java.lang.Long.parseLong(readNode(parser, NODE_ITEM_SOURCE))
|
||||||
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_SHARE_WITH_ADDITIONAL_INFO, ignoreCase = true)) {
|
name.equals(NODE_PARENT, ignoreCase = true) -> {
|
||||||
remoteShare.sharedWithAdditionalInfo = readNode(parser, NODE_SHARE_WITH_ADDITIONAL_INFO)
|
readNode(parser, NODE_PARENT)
|
||||||
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_URL, ignoreCase = true)) {
|
name.equals(NODE_SHARE_TYPE, ignoreCase = true) -> {
|
||||||
val value = readNode(parser, NODE_URL)
|
val value = Integer.parseInt(readNode(parser, NODE_SHARE_TYPE))
|
||||||
remoteShare.shareLink = value
|
remoteShare.shareType = ShareType.fromValue(value)
|
||||||
|
}
|
||||||
|
|
||||||
} else if (name.equals(NODE_NAME, ignoreCase = true)) {
|
name.equals(NODE_SHARE_WITH, ignoreCase = true) -> {
|
||||||
remoteShare.name = readNode(parser, NODE_NAME)
|
remoteShare.shareWith = readNode(parser, NODE_SHARE_WITH)
|
||||||
|
}
|
||||||
|
|
||||||
} else {
|
name.equals(NODE_FILE_SOURCE, ignoreCase = true) -> {
|
||||||
skip(parser)
|
remoteShare.fileSource = java.lang.Long.parseLong(readNode(parser, NODE_FILE_SOURCE))
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_PATH, ignoreCase = true) -> {
|
||||||
|
remoteShare.path = readNode(parser, NODE_PATH)
|
||||||
|
fixPathForFolder(remoteShare)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_PERMISSIONS, ignoreCase = true) -> {
|
||||||
|
remoteShare.permissions = Integer.parseInt(readNode(parser, NODE_PERMISSIONS))
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_STIME, ignoreCase = true) -> {
|
||||||
|
remoteShare.sharedDate = java.lang.Long.parseLong(readNode(parser, NODE_STIME))
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_EXPIRATION, ignoreCase = true) -> {
|
||||||
|
val value = readNode(parser, NODE_EXPIRATION)
|
||||||
|
if (value.isNotEmpty()) {
|
||||||
|
remoteShare.expirationDate = WebdavUtils.parseResponseDate(value)!!.time
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_TOKEN, ignoreCase = true) -> {
|
||||||
|
remoteShare.token = readNode(parser, NODE_TOKEN)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_STORAGE, ignoreCase = true) -> {
|
||||||
|
readNode(parser, NODE_STORAGE)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_MAIL_SEND, ignoreCase = true) -> {
|
||||||
|
readNode(parser, NODE_MAIL_SEND)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_SHARE_WITH_DISPLAY_NAME, ignoreCase = true) -> {
|
||||||
|
remoteShare.sharedWithDisplayName = readNode(parser, NODE_SHARE_WITH_DISPLAY_NAME)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_SHARE_WITH_ADDITIONAL_INFO, ignoreCase = true) -> {
|
||||||
|
remoteShare.sharedWithAdditionalInfo = readNode(parser, NODE_SHARE_WITH_ADDITIONAL_INFO)
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_URL, ignoreCase = true) -> {
|
||||||
|
val value = readNode(parser, NODE_URL)
|
||||||
|
remoteShare.shareLink = value
|
||||||
|
}
|
||||||
|
|
||||||
|
name.equals(NODE_NAME, ignoreCase = true) -> {
|
||||||
|
remoteShare.name = readNode(parser, NODE_NAME)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
skip(parser)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user