From 0614e7a9854ec4bb0228f581e3497dff810b163b Mon Sep 17 00:00:00 2001 From: davigonz Date: Wed, 6 Mar 2019 13:29:51 +0100 Subject: [PATCH] Solve conflicts with get public shares branch --- .../android/lib/resources/shares/ShareParserResult.kt | 2 +- .../shares/ShareToRemoteOperationResultParser.kt | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt index 24e6a000..96de17b6 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt @@ -27,4 +27,4 @@ package com.owncloud.android.lib.resources.shares import java.util.ArrayList -class ShareParserResult(val shares: ArrayList, val parserMessage: String) +class ShareParserResult(val shares: ArrayList) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt index 06e8d506..5406fb36 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt @@ -79,7 +79,7 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar share } - result.setData(ShareParserResult(ArrayList(resultData), "")) + result.setData(ShareParserResult(ArrayList(resultData))) } else { result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE) @@ -88,13 +88,13 @@ class ShareToRemoteOperationResultParser(private var shareXmlParser: ShareXMLPar } else if (shareXmlParser?.isWrongParameter!!) { result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_WRONG_PARAMETER) - result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) + result.httpPhrase = shareXmlParser?.message } else if (shareXmlParser?.isNotFound!!) { result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_NOT_FOUND) - result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) + result.httpPhrase = shareXmlParser?.message } else if (shareXmlParser?.isForbidden!!) { result = RemoteOperationResult(RemoteOperationResult.ResultCode.SHARE_FORBIDDEN) - result.data = ShareParserResult(arrayListOf(), shareXmlParser?.message!!) + result.httpPhrase = shareXmlParser?.message } else { result = RemoteOperationResult(RemoteOperationResult.ResultCode.WRONG_SERVER_RESPONSE) }