Skip to content
This repository was archived by the owner on Mar 19, 2024. It is now read-only.

Commit 0daa19c

Browse files
authored
Merge pull request #380 from owncloud/release/1.0.10
[Release] 1.0.10
2 parents b96a3e9 + 663e067 commit 0daa19c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

owncloudComLibrary/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
minSdkVersion 21
2626
targetSdkVersion 29
2727

28-
versionCode = 10000901
29-
versionName = "1.0.10-beta.1"
28+
versionCode = 10001000
29+
versionName = "1.0.10"
3030
}
3131

3232
lintOptions {

owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/GetRemoteStatusOperation.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult.ResultCo
3131
import com.owncloud.android.lib.resources.status.HttpScheme.HTTPS_PREFIX
3232
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX
3333
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME
34+
import okhttp3.HttpUrl.Companion.toHttpUrl
3435
import org.json.JSONException
3536
import timber.log.Timber
3637

@@ -63,7 +64,9 @@ class GetRemoteStatusOperation : RemoteOperation<RemoteServerInfo>() {
6364
return try {
6465
val requester = StatusRequester()
6566
val requestResult = requester.requestAndFollowRedirects(baseUrl, client)
66-
requester.handleRequestResult(requestResult, baseUrl)
67+
requester.handleRequestResult(requestResult, baseUrl).also {
68+
client.baseUri = Uri.parse(it.data.baseUrl)
69+
}
6770
} catch (e: JSONException) {
6871
RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED)
6972
} catch (e: Exception) {

0 commit comments

Comments
 (0)