From a60c4909f4d892e1afcd89c94ca95f91b48ce988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Tue, 16 Mar 2021 11:11:39 +0100 Subject: [PATCH 1/2] Prepare 1.0.10 release --- owncloudComLibrary/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/owncloudComLibrary/build.gradle b/owncloudComLibrary/build.gradle index 2fece952..90ffbcd6 100644 --- a/owncloudComLibrary/build.gradle +++ b/owncloudComLibrary/build.gradle @@ -25,8 +25,8 @@ android { minSdkVersion 21 targetSdkVersion 29 - versionCode = 10000901 - versionName = "1.0.10-beta.1" + versionCode = 10001000 + versionName = "1.0.10" } lintOptions { From 663e067d08b469eefe65af91f12dddb10d3a80a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Abel=20Garci=CC=81a=20de=20Prada?= Date: Tue, 16 Mar 2021 12:40:51 +0100 Subject: [PATCH 2/2] Update client with latest url --- .../android/lib/resources/status/GetRemoteStatusOperation.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt index eeb2aadf..f4e1d452 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt @@ -31,6 +31,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo import com.owncloud.android.lib.resources.status.HttpScheme.HTTPS_PREFIX import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME +import okhttp3.HttpUrl.Companion.toHttpUrl import org.json.JSONException import timber.log.Timber @@ -63,7 +64,9 @@ class GetRemoteStatusOperation : RemoteOperation() { return try { val requester = StatusRequester() val requestResult = requester.requestAndFollowRedirects(baseUrl, client) - requester.handleRequestResult(requestResult, baseUrl) + requester.handleRequestResult(requestResult, baseUrl).also { + client.baseUri = Uri.parse(it.data.baseUrl) + } } catch (e: JSONException) { RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED) } catch (e: Exception) {