Merge pull request #6 from shishir5/add_method_to_add_interceptors

shishir5 · web-flow · commit a83885542987 · 2022-07-25T23:56:34.000+05:30
Add method to add interceptors
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,8 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
+
 
 android {
     compileSdkVersion 29
@@ -29,8 +30,9 @@ android {
         targetCompatibility JavaVersion.VERSION_1_8
     }
 
-    androidExtensions {
-        experimental = true
+
+    buildFeatures {
+        dataBinding true
     }
 }
 
diff --git a/app/src/main/java/com/zoomcar/networkclient/MainActivity.kt b/app/src/main/java/com/zoomcar/networkclient/MainActivity.kt
@@ -3,21 +3,23 @@ package com.zoomcar.networkclient
 import android.os.Bundle
 import android.util.Log
 import androidx.appcompat.app.AppCompatActivity
+import androidx.databinding.DataBindingUtil
 import com.bluelinelabs.logansquare.LoganSquare
 import com.google.gson.JsonElement
+import com.zoomcar.networkclient.databinding.ActivityMainBinding
 import com.zoomcar.zcnetwork.core.ZcNetworkBuilder
 import com.zoomcar.zcnetwork.core.ZcNetworkListener
 import com.zoomcar.zcnetwork.error.NetworkError
 import com.zoomcar.zcnetwork.utils.LibTag
 import com.zoomcar.zcnetwork.utils.ZcRequestType
-import kotlinx.android.synthetic.main.activity_main.*
 
 class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        button.setOnClickListener {
+        val binding: ActivityMainBinding =
+            DataBindingUtil.setContentView(this, R.layout.activity_main)
+        binding.button.setOnClickListener {
             val zcNetworkBuilder: ZcNetworkBuilder = ZcNetworkBuilder()
                 .setActivity(this)
                 .setBodyParams(hashMapOf("title" to "foo", "body" to "bar", "userId" to 1))
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -1,19 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".MainActivity">
+<layout>
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".MainActivity">
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Press Me!"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Press Me!"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</layout>
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.3.61"
+    ext.kotlin_version = "1.4.32"
     repositories {
         google()
         jcenter()
diff --git a/zcnetwork/build.gradle b/zcnetwork/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
-apply plugin: 'kotlin-kapt'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'kotlin-parcelize'
 
 android {
     compileSdkVersion 28
diff --git a/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkBuilder.kt b/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkBuilder.kt
@@ -3,6 +3,7 @@ package com.zoomcar.zcnetwork.core
 import android.app.Activity
 import androidx.fragment.app.Fragment
 import com.zoomcar.zcnetwork.utils.ZcRequestType
+import okhttp3.Interceptor
 
 /*
   * @created 08/01/2020 - 12:35 PM
@@ -22,6 +23,7 @@ class ZcNetworkBuilder {
     private lateinit var requestType: ZcRequestType
     private var useDefaultService: Boolean = true
     private var baseUrl: String? = null
+    private var interceptors: MutableList<Interceptor> = mutableListOf()
 
     fun setActivity(activity: Activity): ZcNetworkBuilder = apply { this.activity = activity }
     fun setFragment(fragment: Fragment): ZcNetworkBuilder = apply { this.fragment = fragment }
@@ -40,7 +42,11 @@ class ZcNetworkBuilder {
     fun setListener(listener: ZcNetworkListener): ZcNetworkBuilder =
         apply { this.listener = listener }
 
+    fun addInterceptor(interceptor: Interceptor): ZcNetworkBuilder =
+        apply { this.interceptors.add(interceptor)}
+
     fun setTag(tag: String): ZcNetworkBuilder = apply { this.tag = tag }
+    fun addInterceptor(tag: String): ZcNetworkBuilder = apply { this.tag = tag }
     fun setUrl(url: String): ZcNetworkBuilder = apply { this.url = url }
     fun setRequestType(requestType: ZcRequestType) = apply { this.requestType = requestType }
     fun setBaseUrl(baseUrl: String) = apply { this.baseUrl = baseUrl }
@@ -57,7 +63,8 @@ class ZcNetworkBuilder {
             tag,
             url,
             useDefaultService,
-            bodyParams
+            bodyParams,
+            interceptors
         )
     }
 }
diff --git a/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkManager.kt b/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkManager.kt
@@ -18,6 +18,7 @@ import com.zoomcar.zcnetwork.utils.NetworkResponseStatus.FAILURE
 import com.zoomcar.zcnetwork.utils.NetworkResponseStatus.SUCCESS
 import com.zoomcar.zcnetwork.utils.ZcRequestType
 import com.zoomcar.zcnetwork.utils.getTimeDifferenceInMillis
+import okhttp3.Interceptor
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -33,6 +34,7 @@ object ZcNetworkManager {
     private var zcRequestManager: ZcRequestManager? = null
     private var isDebugLogEnabled: Boolean = false
     private var baseUrl: String? = null
+    private var interceptors: MutableList<Interceptor> = mutableListOf()
 
     fun builder(applicationContext: Context): ZcNetworkManager =
         apply { this.applicationContext = applicationContext }
@@ -45,14 +47,19 @@ object ZcNetworkManager {
             this.analyticsListener = analyticsListener
         }
 
+    fun addInterceptor(interceptor: Interceptor): ZcNetworkManager =
+        apply {
+            this.interceptors.add(interceptor)
+        }
+
     fun addBaseUrl(baseUrl: String?): ZcNetworkManager = apply { this.baseUrl = baseUrl }
 
     fun build() {
         if (this.baseUrl == null) throw java.lang.IllegalArgumentException(
             CustomExceptions.NO_BASE_URL
         )
         zcRequestManager =
-            ZcRequestManager.getInstance(applicationContext, isDebugLogEnabled, baseUrl!!)
+            ZcRequestManager.getInstance(applicationContext, isDebugLogEnabled, baseUrl!!, interceptors)
     }
 
     fun request(
@@ -66,7 +73,8 @@ object ZcNetworkManager {
         tag: String? = null,
         url: String,
         defaultService: Boolean = true,
-        bodyParams: HashMap<String, Any>
+        bodyParams: HashMap<String, Any>,
+        interceptors: MutableList<Interceptor>
     ) {
 
         if (zcRequestManager == null) throw IllegalArgumentException(NOT_INITIALIZED)
@@ -153,7 +161,7 @@ object ZcNetworkManager {
         val call: Call<JsonElement>?
         if (defaultService) {
             val apiService =
-                ZcRequestManager.getInstance(applicationContext, baseUrl = this.baseUrl!!)
+                ZcRequestManager.getInstance(applicationContext, baseUrl = this.baseUrl!!, interceptor = interceptors)
                     .getDefaultApiService()
             call = when (requestType) {
                 ZcRequestType.GET -> apiService.getResource(url, requestParams)
@@ -171,7 +179,7 @@ object ZcNetworkManager {
         applicationContext: Context
     ) {
         if (headerParams != null) {
-            ZcRequestManager.getInstance(applicationContext, baseUrl = baseUrl!!)
+            ZcRequestManager.getInstance(applicationContext, baseUrl = baseUrl!!, interceptor = interceptors)
                 .setHeaderParams(headerParams)
         }
     }
diff --git a/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcRequestManager.kt b/zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcRequestManager.kt
@@ -5,6 +5,7 @@ import com.readystatesoftware.chuck.ChuckInterceptor
 import com.zoomcar.zcnetwork.utils.TimeoutDefaults
 import com.zoomcar.zcnetwork.utils.TimeoutHeaders
 import okhttp3.HttpUrl
+import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import okhttp3.Request
 import okhttp3.logging.HttpLoggingInterceptor
@@ -20,7 +21,8 @@ import java.util.concurrent.TimeUnit
 class ZcRequestManager(
     private val applicationContext: Context,
     private val isDebugLogEnabled: Boolean,
-    baseUrl: String
+    baseUrl: String,
+    private val interceptors: List<Interceptor>
 ) {
 
     private lateinit var defaultApiService: ZcApiService
@@ -41,11 +43,17 @@ class ZcRequestManager(
         fun getInstance(
             applicationContext: Context,
             debugLogEnabled: Boolean = false,
-            baseUrl: String
+            baseUrl: String,
+            interceptor: List<Interceptor> = listOf()
         ) =
             instance ?: synchronized(applicationContext) {
                 instance
-                    ?: ZcRequestManager(applicationContext, debugLogEnabled, baseUrl).also {
+                    ?: ZcRequestManager(
+                        applicationContext,
+                        debugLogEnabled,
+                        baseUrl,
+                        interceptor
+                    ).also {
                         instance = it
                     }
             }
@@ -90,6 +98,9 @@ class ZcRequestManager(
             val logging = HttpLoggingInterceptor()
             logging.level = HttpLoggingInterceptor.Level.BODY
             builder.addInterceptor(logging)
+            interceptors.map {
+                builder.addInterceptor(it)
+            }
             builder.addInterceptor(ChuckInterceptor(applicationContext))
         }
 
diff --git a/zcnetwork/src/main/java/com/zoomcar/zcnetwork/models/BaseErrorVO.kt b/zcnetwork/src/main/java/com/zoomcar/zcnetwork/models/BaseErrorVO.kt
@@ -11,6 +11,7 @@ import kotlinx.android.parcel.RawValue
 @JsonObject
 open class BaseErrorVO : Parcelable {
     @JsonField
+    @SerializedName(value = "status")
     var status: Int = 0
 
     @SerializedName(value = "error_code")
@@ -21,12 +22,15 @@ open class BaseErrorVO : Parcelable {
     @JsonField(name = ["error_title"])
     var errorTitle: String? = null
 
+    @SerializedName("msg")
     @JsonField
     var msg: String? = null
 
     @JsonField
+    @SerializedName("httpStatusCode")
     var httpStatusCode: Int = 0
 
     @JsonField(name = ["metadata"])
+    @SerializedName("metadata")
     var metadata: MutableMap<String, @RawValue Any?>? = null
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`apply plugin: 'com.android.application'`
`2`	`2`	`apply plugin: 'kotlin-android'`
`3`		`-apply plugin: 'kotlin-android-extensions'`
`4`	`3`	`apply plugin: 'kotlin-kapt'`
	`4`	`+apply plugin: 'kotlin-parcelize'`
	`5`	`+`
`5`	`6`
`6`	`7`	`android {`
`7`	`8`	`compileSdkVersion 29`
`@@ -29,8 +30,9 @@ android {`
`29`	`30`	`targetCompatibility JavaVersion.VERSION_1_8`
`30`	`31`	`}`
`31`	`32`
`32`		`- androidExtensions {`
`33`		`- experimental = true`
	`33`	`+`
	`34`	`+ buildFeatures {`
	`35`	`+ dataBinding true`
`34`	`36`	`}`
`35`	`37`	`}`
`36`	`38`