1
0
mirror of https://github.com/owncloud/android-library.git synced 2026-08-11 08:22:56 +00:00

Merge pull request #266 from hannesa2/AndroidStudio-3.5.0

Android Studio 3.5.0
This commit is contained in:
David González Verdugo
2019-09-24 09:42:09 +02:00
committed by GitHub
7 changed files with 18 additions and 59 deletions
+1 -1
View File
@@ -16,7 +16,7 @@ allOpen {
}
android {
compileSdkVersion 28
compileSdkVersion 29
defaultConfig {
minSdkVersion 19
@@ -104,19 +104,19 @@ class RemoteShare : Parcelable, Serializable {
fun readFromParcel(source: Parcel) {
id = source.readLong()
shareWith = source.readString()
path = source.readString()
token = source.readString()
sharedWithDisplayName = source.readString()
sharedWithAdditionalInfo = source.readString()
name = source.readString()
shareLink = source.readString()
shareWith = source.readString().toString()
path = source.readString().toString()
token = source.readString().toString()
sharedWithDisplayName = source.readString().toString()
sharedWithAdditionalInfo = source.readString().toString()
name = source.readString().toString()
shareLink = source.readString().toString()
fileSource = source.readLong()
itemSource = source.readLong()
shareType = ShareType.NO_SHARED
try {
shareType = ShareType.valueOf(source.readString())
shareType = source.readString()?.let { ShareType.valueOf(it) }
} catch (x: IllegalArgumentException) {
shareType = ShareType.NO_SHARED
}
permissions = source.readInt()
sharedDate = source.readLong()
@@ -47,7 +47,7 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
}
var result: RemoteOperationResult<ShareParserResult>
var resultData: List<RemoteShare>?
val resultData: List<RemoteShare>?
try {
// Parse xml response and obtain the list of shares
@@ -81,7 +81,9 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
share
}
result.setData(ShareParserResult(ArrayList(resultData)))
if (resultData != null) {
result.setData(ShareParserResult(ArrayList(resultData.toMutableList())))
}
} else {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE)