header fix & updating deprecated functions

Author: ihsanbal

app/src/main/java/ihsanbal/com/logginginterceptor/LogApplication.kt

@@ -9,8 +9,8 @@ import ihsanbal.com.logginginterceptor.di.NetModule
  * @author ihsan on 09/02/2017.
  */
 class LogApplication : Application() {
+
     var appComponent: NetComponent? = null
-        private set
 
     override fun onCreate() {
         super.onCreate()

app/src/main/java/ihsanbal/com/logginginterceptor/di/NetModule.kt

@@ -16,14 +16,14 @@ import okio.source
 import retrofit2.Retrofit
 import retrofit2.adapter.rxjava.RxJavaCallAdapterFactory
 import retrofit2.converter.gson.GsonConverterFactory
-import java.util.concurrent.Executors
 import javax.inject.Singleton
 
 /**
  * @author ihsan on 09/02/2017.
  */
 @Module
 class NetModule(private val mEndPoint: String, private val mAssetManager: AssetManager) {
+
     @Provides
     @Singleton
     fun provideOkHttpClient(): OkHttpClient {
@@ -34,7 +34,7 @@ class NetModule(private val mEndPoint: String, private val mAssetManager: AssetM
                 .log(INFO)
                 .addHeader("version", BuildConfig.VERSION_NAME)
                 .addQueryParam("query", "0")
-                .enableAndroidStudioV3LogsHack(true)
+//                .enableAndroidStudioV3LogsHack(true)
 //                .logger(object : Logger {
 //                    override fun log(level: Int, tag: String?, msg: String?) {
 //                        Log.e("$tag - $level", "$msg")
@@ -46,7 +46,6 @@ class NetModule(private val mEndPoint: String, private val mAssetManager: AssetM
                         return mAssetManager.open(String.format("mock/%s.json", segment)).source().buffer().readUtf8()
                     }
                 })
-                .executor(Executors.newSingleThreadExecutor())
                 .build())
         return client.build()
     }

build.gradle

@@ -21,14 +21,14 @@ buildscript {
     dependencies {
         //noinspection
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.android.tools.build:gradle:3.5.3'
+        classpath 'com.android.tools.build:gradle:3.6.1'
     }
 }
 
 project.ext {
     groupId = 'com.github.ihsanbal'
     artifactId = 'LoggingInterceptor'
-    snapshot = '3.1.0-rc1'
+    snapshot = '3.1.0-rc2'
 }
 
 allprojects {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Feb 19 23:49:27 EST 2020
+#Sun Mar 01 21:51:28 EST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip

lib/src/main/java/com/ihsanbal/logging/LoggingInterceptor.kt

@@ -23,12 +23,7 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
             return chain.proceed(request)
         }
 
-        Printer.printJsonRequest(
-                builder,
-                request.body,
-                request.url.toUrl().toString(),
-                request.headers,
-                request.method)
+        printlnRequestLog(request)
 
         val startNs = System.nanoTime()
         val response: Response
@@ -40,6 +35,11 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
         }
         val receivedMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - startNs)
 
+        printlnResponseLog(receivedMs, response, request)
+        return response
+    }
+
+    private fun printlnResponseLog(receivedMs: Long, response: Response, request: Request) {
         Printer.printJsonResponse(
                 builder,
                 receivedMs,
@@ -50,16 +50,20 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
                 request.url.encodedPathSegments,
                 response.message,
                 request.url.toString())
-        return response
+    }
+
+    private fun printlnRequestLog(request: Request) {
+        Printer.printJsonRequest(
+                builder,
+                request.body,
+                request.url.toUrl().toString(),
+                request.headers,
+                request.method)
     }
 
     private fun proceedResponse(chain: Interceptor.Chain, request: Request): Response {
         return if (builder.isMockEnabled && builder.listener != null) {
-            try {
-                TimeUnit.MILLISECONDS.sleep(builder.sleepMs)
-            } catch (e: InterruptedException) {
-                e.printStackTrace()
-            }
+            TimeUnit.MILLISECONDS.sleep(builder.sleepMs)
             Response.Builder()
                     .body(builder.listener!!.getJsonResponse(request)?.toResponseBody("application/json".toMediaTypeOrNull()))
                     .request(chain.request())
@@ -83,7 +87,7 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
                 httpUrlBuilder.addQueryParameter(key, builder.httpUrl[key])
             }
         }
-        return request.newBuilder().url(httpUrlBuilder?.build()!!).build()
+        return requestBuilder.url(httpUrlBuilder?.build()!!).build()
     }
 
     @Suppress("unused")
@@ -101,8 +105,6 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
             private set
         var logger: Logger? = null
             private set
-        var executor: Executor? = null
-            private set
         var isMockEnabled = false
         var sleepMs: Long = 0
         var listener: BufferListener? = null
@@ -213,9 +215,9 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
          * @return Builder
          * @see Logger
          */
+        @Deprecated(message = "Create your own Logcat filter for best result", level = DeprecationLevel.ERROR)
         fun executor(executor: Executor?): Builder {
-            this.executor = executor
-            return this
+            TODO("Deprecated")
         }
 
         /**
@@ -240,6 +242,8 @@ class LoggingInterceptor private constructor(private val builder: Builder) : Int
          * @return Builder
          * @see Logger
          */
+        @Deprecated(message = "Android studio has resolved problem for latest versions",
+                level = DeprecationLevel.WARNING)
         fun enableAndroidStudioV3LogsHack(useHack: Boolean): Builder {
             isLogHackEnable = useHack
             return this