PR updates.

Author: onats1

README.md

@@ -31,8 +31,6 @@ Suggestion: This initialization should be in singleton format because new initia
 
 ## Key Exchange
 
-A key exchange request should be made at least once in the application's lifecycle. To perform this action, follow the example code shown below.
-
 ```kotlin
 class MainActivity : AppCompatActivity() {
 

pos-client-library/src/main/java/com/globalaccelerex/globalaccelerexandroidposclientlibrary/GAClientLib.kt

@@ -23,8 +23,6 @@ class GAClientLib private constructor(
     private val countryCode: Countries
 ) {
 
-    //variable to keep track of when key exchange has been made in the app.
-    private var hasPerformedKeyExchange: Boolean = false
     private val TAG = "GAClientLib"
 
     private val parametersRequest = ParameterRequest()
@@ -57,7 +55,6 @@ class GAClientLib private constructor(
      * [callingComponent] should be either [Fragment] or [Activity]
      * */
     fun makeParametersRequest(callingComponent: Activity) {
-        makeKeyExchangeWarning()
         parametersRequest.performParameterRequest(callingComponent)
     }
 
@@ -66,7 +63,6 @@ class GAClientLib private constructor(
      * [callingComponent] should be either [Fragment] or [Activity]
      * */
     fun makeParametersRequest(callingComponent: Fragment) {
-        makeKeyExchangeWarning()
         parametersRequest.performParameterRequest(callingComponent)
     }
 
@@ -76,7 +72,6 @@ class GAClientLib private constructor(
      * [callingComponent] should be either [Fragment] or [Activity]
      * */
     fun makeKeyExchangeRequest(callingComponent: Activity) {
-        this.hasPerformedKeyExchange = true
         keyExchangeRequest.performKeyExchange(
             callingComponent = callingComponent
         )
@@ -87,7 +82,6 @@ class GAClientLib private constructor(
      * [callingComponent] should be either [Fragment] or [Activity]
      * */
     fun makeKeyExchangeRequest(callingComponent: Fragment) {
-        this.hasPerformedKeyExchange = true
         keyExchangeRequest.performKeyExchange(
             callingComponent = callingComponent
         )
@@ -150,16 +144,4 @@ class GAClientLib private constructor(
         }
     }
 
-    /**
-     * Warning: Key exchange must be made at least once in the application's lifecycle
-     * */
-    private fun makeKeyExchangeWarning() {
-        if (!hasPerformedKeyExchange) {
-            Log.d(
-                TAG,
-                "It seems key exchange hasn't been made during this session. Make sure that is done at least once in the application's lifecycle"
-            )
-        }
-    }
-
 }

pos-client-library/src/main/java/com/globalaccelerex/globalaccelerexandroidposclientlibrary/baseAppUtils/Models.kt

@@ -2,20 +2,33 @@ package com.globalaccelerex.globalaccelerexandroidposclientlibrary.baseAppUtils
 
 import com.globalaccelerex.globalaccelerexandroidposclientlibrary.baseAppUtils.BaseAppConstants.MOBILE_MONEY_STATUS_CHECK
 import com.globalaccelerex.globalaccelerexandroidposclientlibrary.util.RequestStatus
+import com.google.gson.annotations.SerializedName
 
 data class PosParameters(
-    val BankLogo: String?,
-    val BankName: String?,
-    val BillerID: String?,
-    val City: String?,
-    val FooterMessage: String?,
-    val MerchantAddress: String?,
-    val MerchantCategoryCode: String?,
-    val MerchantID: String?,
-    val MerchantName: String?,
-    val PTSP: String?,
-    val State: String?,
-    val TerminalID: String?,
+    @SerializedName("BankLogo")
+    val bankLogo: String?,
+    @SerializedName("BankName")
+    val bankName: String?,
+    @SerializedName("BillerID")
+    val billerID: String?,
+    @SerializedName("City")
+    val city: String?,
+    @SerializedName("FooterMessage")
+    val footerMessage: String?,
+    @SerializedName("MerchantAddress")
+    val merchantAddress: String?,
+    @SerializedName("merchantCategoryCode")
+    val merchantCategoryCode: String?,
+    @SerializedName("MerchantID")
+    val merchantID: String?,
+    @SerializedName("MerchantName")
+    val merchantName: String?,
+    @SerializedName("PTSP")
+    val ptsp: String?,
+    @SerializedName("State")
+    val state: String?,
+    @SerializedName("TerminalID")
+    val terminalID: String?,
     val baseAppVersion: String?,
     val serialNumber: String?
 )