Merge pull request #3 from pravee-n/master

Updated gradle, added metadata to base error object

Author: maniparas

README.md

@@ -24,7 +24,7 @@ allprojects {
 ```
 * Add the library dependency
 ```
-implementation 'com.github.ZoomCar:android-network-library:1.0.4'
+implementation 'com.github.ZoomCar:android-network-library:1.0.5'
 ```
 
 * Add third party dependencies, [Chuck Http Interceptor](https://github.com/jgilfelt/chuck) for logging, 

build.gradle

@@ -7,7 +7,7 @@ buildscript {
 
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0-alpha07"
+        classpath 'com.android.tools.build:gradle:4.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Jan 03 19:04:45 IST 2020
+#Mon Jun 29 17:06:34 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1-milestone-2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

zcnetwork/src/main/java/com/zoomcar/zcnetwork/core/ZcNetworkListener.kt

@@ -1,6 +1,7 @@
 package com.zoomcar.zcnetwork.core
 
 import com.bluelinelabs.logansquare.LoganSquare
+import com.google.gson.Gson
 import com.google.gson.JsonElement
 import com.zoomcar.zcnetwork.error.NetworkError
 import com.zoomcar.zcnetwork.models.BaseErrorVO
@@ -17,7 +18,7 @@ interface ZcNetworkListener {
     fun buildNetworkError(httpCode: Int, data: ByteArray): NetworkError {
         val baseErrorVO: BaseErrorVO
         return try {
-            baseErrorVO = LoganSquare.parse(String(data), BaseErrorVO::class.java)
+            baseErrorVO = Gson().fromJson(String(data), BaseErrorVO::class.java)
             NetworkError(httpCode, baseErrorVO)
         } catch (e: Exception) {
             e.printStackTrace()

zcnetwork/src/main/java/com/zoomcar/zcnetwork/models/BaseErrorVO.kt

@@ -3,19 +3,30 @@ package com.zoomcar.zcnetwork.models
 import android.os.Parcelable
 import com.bluelinelabs.logansquare.annotation.JsonField
 import com.bluelinelabs.logansquare.annotation.JsonObject
+import com.google.gson.annotations.SerializedName
 import kotlinx.android.parcel.Parcelize
+import kotlinx.android.parcel.RawValue
 
 @Parcelize
 @JsonObject
 open class BaseErrorVO : Parcelable {
     @JsonField
     var status: Int = 0
+
+    @SerializedName(value = "error_code")
     @JsonField(name = ["error_code"])
     var errorCode: Int = 0
+
+    @SerializedName(value = "error_title")
     @JsonField(name = ["error_title"])
     var errorTitle: String? = null
+
     @JsonField
     var msg: String? = null
+
     @JsonField
     var httpStatusCode: Int = 0
+
+    @JsonField(name = ["metadata"])
+    var metadata: MutableMap<String, @RawValue Any?>? = null
 }