flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-06-07 16:06:08 +00:00
Code Issues Releases Wiki Activity

Kotlin 1.3.50

Browse Source
This commit is contained in:
Hannes Achleitner 2019-09-08 09:25:54 +02:00
parent 36df3d9287
commit 159bc0789e
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
// Libraries // Libraries
kotlinVersion = '1.3.21' kotlinVersion = '1.3.50'
} }
repositories { repositories {

20
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
View File

@ -104,19 +104,19 @@ class RemoteShare : Parcelable, Serializable {
fun readFromParcel(source: Parcel) { fun readFromParcel(source: Parcel) {
id = source.readLong() id = source.readLong()
shareWith = source.readString() shareWith = source.readString().toString()
path = source.readString() path = source.readString().toString()
token = source.readString() token = source.readString().toString()
sharedWithDisplayName = source.readString() sharedWithDisplayName = source.readString().toString()
sharedWithAdditionalInfo = source.readString() sharedWithAdditionalInfo = source.readString().toString()
name = source.readString() name = source.readString().toString()
shareLink = source.readString() shareLink = source.readString().toString()
fileSource = source.readLong() fileSource = source.readLong()
itemSource = source.readLong() itemSource = source.readLong()
try {
shareType = ShareType.valueOf(source.readString())
} catch (x: IllegalArgumentException) {
shareType = ShareType.NO_SHARED shareType = ShareType.NO_SHARED
try {
shareType = source.readString()?.let { ShareType.valueOf(it) }
} catch (x: IllegalArgumentException) {
} }
permissions = source.readInt() permissions = source.readInt()
sharedDate = source.readLong() sharedDate = source.readLong()

6
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt
View File

@ -47,7 +47,7 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
} }
var result: RemoteOperationResult<ShareParserResult> var result: RemoteOperationResult<ShareParserResult>
var resultData: List<RemoteShare>? val resultData: List<RemoteShare>?
try { try {
// Parse xml response and obtain the list of shares // Parse xml response and obtain the list of shares
@ -81,7 +81,9 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
share share
} }
result.setData(ShareParserResult(ArrayList(resultData))) if (resultData != null) {
result.setData(ShareParserResult(ArrayList(resultData.toMutableList())))
}
} else { } else {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE) result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE)