From 6ca9608a80efabf234b7126d685ce9e3adbb8eb8 Mon Sep 17 00:00:00 2001 From: Koitharu Date: Thu, 7 Apr 2022 17:23:01 +0300 Subject: [PATCH] Remove CurlLoggingInterceptor --- .../core/network/CurlLoggingInterceptor.kt | 56 ------------------- .../kotatsu/core/network/NetworkModule.kt | 4 -- 2 files changed, 60 deletions(-) delete mode 100644 app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt deleted file mode 100644 index e5bf2deca..000000000 --- a/app/src/main/java/org/koitharu/kotatsu/core/network/CurlLoggingInterceptor.kt +++ /dev/null @@ -1,56 +0,0 @@ -package org.koitharu.kotatsu.core.network - -import android.util.Log -import okhttp3.Interceptor -import okhttp3.Request -import okhttp3.Response -import okio.Buffer -import java.io.IOException -import java.nio.charset.StandardCharsets - -private const val TAG = "CURL" - -class CurlLoggingInterceptor( - private val extraCurlOptions: String? = null, -) : Interceptor { - - @Throws(IOException::class) - override fun intercept(chain: Interceptor.Chain): Response { - val request: Request = chain.request() - var compressed = false - val curlCmd = StringBuilder("curl") - if (extraCurlOptions != null) { - curlCmd.append(" ").append(extraCurlOptions) - } - curlCmd.append(" -X ").append(request.method) - val headers = request.headers - var i = 0 - val count = headers.size - while (i < count) { - val name = headers.name(i) - val value = headers.value(i) - if ("Accept-Encoding".equals(name, ignoreCase = true) && "gzip".equals(value, - ignoreCase = true) - ) { - compressed = true - } - curlCmd.append(" -H " + "\"").append(name).append(": ").append(value).append("\"") - i++ - } - val requestBody = request.body - if (requestBody != null) { - val buffer = Buffer() - requestBody.writeTo(buffer) - val contentType = requestBody.contentType() - val charset = contentType?.charset(StandardCharsets.UTF_8) ?: StandardCharsets.UTF_8 - curlCmd.append(" --data $'") - .append(buffer.readString(charset).replace("\n", "\\n")) - .append("'") - } - curlCmd.append(if (compressed) " --compressed " else " ").append(request.url) - Log.d(TAG, "╭--- cURL (" + request.url + ")") - Log.d(TAG, curlCmd.toString()) - Log.d(TAG, "╰--- (copy and paste the above line to a terminal)") - return chain.proceed(request) - } -} \ No newline at end of file diff --git a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt index 4e7f0eb1c..48b009a33 100644 --- a/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt +++ b/app/src/main/java/org/koitharu/kotatsu/core/network/NetworkModule.kt @@ -5,7 +5,6 @@ import okhttp3.CookieJar import okhttp3.OkHttpClient import org.koin.dsl.bind import org.koin.dsl.module -import org.koitharu.kotatsu.BuildConfig import org.koitharu.kotatsu.core.parser.MangaLoaderContextImpl import org.koitharu.kotatsu.local.data.LocalStorageManager import org.koitharu.kotatsu.parsers.MangaLoaderContext @@ -22,9 +21,6 @@ val networkModule cache(get().createHttpCache()) addInterceptor(UserAgentInterceptor()) addInterceptor(CloudFlareInterceptor()) - if (BuildConfig.DEBUG) { - addNetworkInterceptor(CurlLoggingInterceptor()) - } }.build() } single { MangaLoaderContextImpl(get(), get(), get()) }