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

add logs for getremotestatus

Browse Source
This commit is contained in:
Schabi 2020-11-09 15:49:43 +01:00 committed by Christian Schabesberger
parent 2eff0bbc5c
commit e665af2a1e
2 changed files with 22 additions and 1 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/status/GetRemoteStatusOperation.kt
View File

@ -66,6 +66,8 @@ class GetRemoteStatusOperation : RemoteOperation<OwnCloudVersion>() {
return try {
val requester = StatusRequester()
val requestResult = requester.requestAndFollowRedirects(baseUrl, client)
Timber.d("==== GetRemoteStatusOperation result ====")
requestResult.printLog();
requester.handleRequestResult(requestResult, baseUrl)
} catch (e: JSONException) {
RemoteOperationResult(ResultCode.INSTANCE_NOT_CONFIGURED)

21
owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/StatusRequester.kt
View File

@ -32,6 +32,7 @@ import com.owncloud.android.lib.common.operations.RemoteOperationResult
import com.owncloud.android.lib.resources.status.HttpScheme.HTTPS_SCHEME
import com.owncloud.android.lib.resources.status.HttpScheme.HTTP_SCHEME
import org.json.JSONObject
import timber.log.Timber
import java.net.URL
import java.util.concurrent.TimeUnit
@ -69,7 +70,17 @@ internal class StatusRequester {
val getMethod: GetMethod,
val status: Int,
val redirectedToUnsecureLocation: Boolean
)
) {
fun printLog() {
Timber.d("""
===== status request result =====
- GetMethod status code: ${getMethod.statusCode},
- GetMethod status msg: ${getMethod.statusMessage},
- status: ${status},
- redirectedToUnsecureLocation: ${redirectedToUnsecureLocation}
""".trimIndent())
}
}
fun requestAndFollowRedirects(baseLocation: String, client: OwnCloudClient): RequestResult {
var currentLocation = baseLocation + OwnCloudClient.STATUS_PATH
@ -78,16 +89,24 @@ internal class StatusRequester {
while (true) {
val getMethod = getGetMethod(currentLocation)
Timber.d("StatusRequester, goto: ${currentLocation}")
status = client.executeHttpMethod(getMethod)
Timber.d("StatusRequester, resturn status: ${status}")
val result =
if (status.isSuccess()) RemoteOperationResult<OwnCloudVersion>(RemoteOperationResult.ResultCode.OK)
else RemoteOperationResult(getMethod)
Timber.d("StatusRequester, RemoteOperationResult: ${result}, isSuccess: ${result.isSuccess}")
if (result.redirectedLocation.isNullOrEmpty() || result.isSuccess) {
Timber.d("StatusRequester, Redirection location was null or empty and result was success")
return RequestResult(getMethod, status, redirectedToUnsecureLocation)
} else {
Timber.d("StatusRequester, go into next iteration")
val nextLocation = updateLocationWithRedirectPath(currentLocation, result.redirectedLocation)
Timber.d("StatusRequester, Next location: ${nextLocation}")
redirectedToUnsecureLocation =
isRedirectedToNonSecureConnection(
redirectedToUnsecureLocation,