fix(network): enabled directly adding interceptor (#295)

* fix(network): enabled directly adding interceptor * no-op fix
androidPluto · Nov 28, 2023 · 3ddd237 · 3ddd237
1 parent 4e05af6
commit 3ddd237
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 19 deletions.
diff --git a/pluto-plugins/plugins/network/README.md b/pluto-plugins/plugins/network/README.md
@@ -39,7 +39,7 @@ dependencies {
 Add interceptor in your OkHttp Client Builder
 ```kotlin
 val client = OkHttpClient.Builder()
-  addPlutoOkhttpInterceptor()
+  .addInterceptor(PlutoOkhttpInterceptor)
   .build()
 ```
 <br>

diff --git a/...rk/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/PlutoKtorHelper.kt b/...rk/interceptor-ktor/lib/src/main/kotlin/com/pluto/plugins/network/ktor/PlutoKtorHelper.kt
@@ -1,5 +1,6 @@
 package com.pluto.plugins.network.ktor
 
+import androidx.annotation.Keep
 import com.pluto.plugins.network.intercept.NetworkInterceptor
 import com.pluto.plugins.network.ktor.internal.KtorRequestConverter.convert
 import com.pluto.plugins.network.ktor.internal.KtorResponseConverter.convert
@@ -38,6 +39,7 @@ fun HttpClient.addPlutoKtorInterceptor() {
     }
 }
 
+@Keep
 class PlutoKtorInterceptor {
     companion object : HttpClientPlugin<Unit, PlutoKtorInterceptor> {
 

diff --git a/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle b/pluto-plugins/plugins/network/interceptor-okhttp/lib-no-op/build.gradle
@@ -48,5 +48,6 @@ android {
 }
 
 dependencies {
+    implementation "androidx.core:core-ktx:$androidXCoreVersion"
     implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
 }
diff --git a/...okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt b/...okhttp/lib-no-op/src/main/java/com/pluto/plugins/network/okhttp/PlutoOkhttpInterceptor.kt
@@ -0,0 +1,17 @@
+package com.pluto.plugins.network.okhttp
+
+import androidx.annotation.Keep
+import okhttp3.Interceptor
+import okhttp3.Response
+
+@SuppressWarnings("UtilityClassWithPublicConstructor")
+@Keep
+class PlutoOkhttpInterceptor {
+    companion object : Interceptor {
+
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request = chain.request()
+            return chain.proceed(request)
+        }
+    }
+}
diff --git a/...erceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt b/...erceptor-okhttp/lib/src/main/kotlin/com/pluto/plugins/network/okhttp/PlutoOkhttpHelper.kt
@@ -3,9 +3,10 @@ package com.pluto.plugins.network.okhttp
 import okhttp3.OkHttpClient
 import javax.net.SocketFactory
 
+@Deprecated("add PlutoHttpInterceptor directly to OkHttpClient instead")
 fun OkHttpClient.Builder.addPlutoOkhttpInterceptor(): OkHttpClient.Builder {
     // todo add okhttp settings block here
     socketFactory(SocketFactory.getDefault())
-    addInterceptor(PlutoInterceptor())
+    addInterceptor(PlutoOkhttpInterceptor)
     return this
 }
diff --git a/...lugins/network/okhttp/PlutoInterceptor.kt → .../network/okhttp/PlutoOkhttpInterceptor.kt b/...lugins/network/okhttp/PlutoInterceptor.kt → .../network/okhttp/PlutoOkhttpInterceptor.kt
@@ -18,23 +18,22 @@ import okio.buffer
 import java.io.IOException
 
 @Keep
-internal class PlutoInterceptor : Interceptor {
+class PlutoOkhttpInterceptor {
+    companion object : Interceptor {
+        private const val NAME = "Okhttp"
 
-    override fun intercept(chain: Interceptor.Chain): Response {
-        val request = chain.request()
-        val networkInterceptor = NetworkInterceptor.intercept(request.convert(), NetworkInterceptor.Option(NAME))
-        val response: Response = try {
-            val builder = request.newBuilder().url(networkInterceptor.actualOrMockRequestUrl)
-            chain.proceed(builder.build())
-        } catch (e: IOException) {
-            networkInterceptor.onError(e)
-            throw e
+        override fun intercept(chain: Interceptor.Chain): Response {
+            val request = chain.request()
+            val networkInterceptor = NetworkInterceptor.intercept(request.convert(), NetworkInterceptor.Option(NAME))
+            val response: Response = try {
+                val builder = request.newBuilder().url(networkInterceptor.actualOrMockRequestUrl)
+                chain.proceed(builder.build())
+            } catch (e: IOException) {
+                networkInterceptor.onError(e)
+                throw e
+            }
+            return response.processBody { networkInterceptor.onResponse(it) }
         }
-        return response.processBody { networkInterceptor.onResponse(it) }
-    }
-
-    companion object {
-        private const val NAME = "Okhttp"
     }
 }
 

diff --git a/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt b/sample/src/main/java/com/sampleapp/functions/network/internal/okhttp/Network.kt
@@ -1,6 +1,6 @@
 package com.sampleapp.functions.network.internal.okhttp
 
-import com.pluto.plugins.network.okhttp.addPlutoOkhttpInterceptor
+import com.pluto.plugins.network.okhttp.PlutoOkhttpInterceptor
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
@@ -23,7 +23,7 @@ object Network {
         .readTimeout(READ_TIMEOUT, TimeUnit.SECONDS)
 //        .addInterceptor(GzipRequestInterceptor())
         .addInterceptor(HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.BODY))
-        .addPlutoOkhttpInterceptor()
+        .addInterceptor(PlutoOkhttpInterceptor)
         .build()
 
     fun <T> getService(cls: Class<T>): T {