flywithu/android-library
1
0
Fork 0
mirror of https://github.com/owncloud/android-library.git synced 2025-10-31 02:17:41 +00:00
Code Issues Releases Wiki Activity

Solve conflicts with get public shares branch

Browse Source
This commit is contained in:
davigonz 2019-03-06 13:29:51 +01:00
parent 1114c38ff7
commit 0614e7a985
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt
View File

@ -27,4 +27,4 @@ package com.owncloud.android.lib.resources.shares
import java.util.ArrayList import java.util.ArrayList
class ShareParserResult(val shares: ArrayList<RemoteShare>, val parserMessage: String) class ShareParserResult(val shares: ArrayList<RemoteShare>)

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

@ -79,7 +79,7 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
share share
} }
result.setData(ShareParserResult(ArrayList(resultData), "")) result.setData(ShareParserResult(ArrayList(resultData)))
} else { } else {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE) result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE)
@ -88,13 +88,13 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar
} else if (shareXmlParser?.isWrongParameter!!) { } else if (shareXmlParser?.isWrongParameter!!) {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER) result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER)
result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) result.httpPhrase = shareXmlParser?.message
} else if (shareXmlParser?.isNotFound!!) { } else if (shareXmlParser?.isNotFound!!) {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND) result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND)
result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) result.httpPhrase = shareXmlParser?.message
} else if (shareXmlParser?.isForbidden!!) { } else if (shareXmlParser?.isForbidden!!) {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_FORBIDDEN) result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_FORBIDDEN)
result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) result.httpPhrase = shareXmlParser?.message
} else { } else {
result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE) result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE)
} }