diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogBuilder.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogBuilder.kt index ef9df143..7cf6ef28 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogBuilder.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogBuilder.kt @@ -22,18 +22,25 @@ */ package com.owncloud.android.lib.common.http +import timber.log.Timber +import java.util.Locale + object LogBuilder { - fun toLogString( + fun logHttp( networkPetition: NetworkPetition, networkNode: NetworkNode, description: String - ): String = "[Network, $networkPetition] [$networkNode] $description" + ) = Timber.d("[Network, $networkPetition] [$networkNode] $description") } enum class NetworkPetition { - REQUEST, RESPONSE + REQUEST, RESPONSE; + + override fun toString(): String = super.toString().toLowerCase(Locale.ROOT) } enum class NetworkNode { - INFO, HEADER, BODY + INFO, HEADER, BODY; + + override fun toString(): String = super.toString().toLowerCase(Locale.ROOT) } diff --git a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt index 400b6120..403b277a 100644 --- a/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt +++ b/owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/http/LogInterceptor.kt @@ -23,12 +23,11 @@ */ package com.owncloud.android.lib.common.http -import com.owncloud.android.lib.common.http.LogBuilder.toLogString +import com.owncloud.android.lib.common.http.LogBuilder.logHttp import com.owncloud.android.lib.common.http.NetworkNode.* import com.owncloud.android.lib.common.http.NetworkPetition.* import okhttp3.Interceptor import okhttp3.Response -import timber.log.Timber class LogInterceptor : Interceptor { @@ -39,28 +38,14 @@ class LogInterceptor : Interceptor { return response.also { if (httpLogsEnabled) { // Log request - Timber.d( - toLogString(REQUEST, INFO, "Type: ${it.request.method} URL: ${it.request.url}") - ) - it.headers.forEach { header -> - Timber.d(toLogString(REQUEST, HEADER, header.toString())) - } - Timber.d(toLogString(REQUEST, BODY, it.body.toString())) + logHttp(REQUEST, INFO, "Type: ${it.request.method} URL: ${it.request.url}") + it.headers.forEach { header -> logHttp(REQUEST, HEADER, header.toString()) } + logHttp(REQUEST, BODY, it.body.toString()) // Log response - Timber.d(toLogString(RESPONSE, INFO, "RequestId: ${it.request.header(HttpConstants.OC_X_REQUEST_ID)}")) - Timber.d( - toLogString( - RESPONSE, - INFO, - "Code: ${it.code} Message: ${it.message} IsSuccessful: ${it.isSuccessful}" - ) - ) - it.headers.forEach { header -> - Timber.d(toLogString(RESPONSE, HEADER, header.toString())) - } - Timber.d(toLogString(RESPONSE, BODY, it.body.toString())) - + logHttp(RESPONSE, INFO, "Code: ${it.code} Message: ${it.message} IsSuccessful: ${it.isSuccessful}") + it.headers.forEach { header -> logHttp(RESPONSE, HEADER, header.toString()) } + logHttp(RESPONSE, BODY, it.body.toString()) } } }