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

Merge pull request #380 from owncloud/release/1.0.10

Browse Source 
[Release] 1.0.10
This commit is contained in:
Abel García de Prada 2021-03-22 11:23:32 +01:00 committed by GitHub
commit 0daa19cf90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
owncloudComLibrary/build.gradle
View File

@ -25,8 +25,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 29 targetSdkVersion 29
versionCode = 10000901 versionCode = 10001000
versionName = "1.0.10-beta.1" versionName = "1.0.10"
} }
lintOptions { lintOptions {

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

@ -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.HTTPS_PREFIX
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_PREFIX
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME
import okhttp3.HttpUrl.Companion.toHttpUrl
import org.json.JSONException import org.json.JSONException
import timber.log.Timber import timber.log.Timber
@ -63,7 +64,9 @@ class GetRemoteStatusOperation : RemoteOperation<RemoteServerInfo>() {
return try { return try {
val requester = StatusRequester() val requester = StatusRequester()
val requestResult = requester.requestAndFollowRedirects(baseUrl, client) 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) { } catch (e: JSONException) {
RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED) RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED)
} catch (e: Exception) { } catch (e: Exception) {