fix: update shared data (#7)

Author: merlinpaypal

library/src/main/java/com/paypal/messages/ModalFragment.kt

@@ -386,17 +386,20 @@ internal class ModalFragment constructor(
 	 * See paypal-messaging-components/src/components/modal/v2/lib/zoid-polyfill.js for how it works.
 	 */
 	@JavascriptInterface
-	fun paypalMessageModalCallbackHandler(args: String) {
-		val json = JsonParser.parseString(args).asJsonObject
-		LogCat.debug(TAG, "CallbackHandler:\n  name = ${json.get("name")}\n  args = ${json.get("args")}")
+	fun paypalMessageModalCallbackHandler(passedParams: String) {
+		val params = if (passedParams != "") passedParams else "{\"name\": \"\", \"args\": [{}]"
+		val nameAndArgs = JsonParser.parseString(params).asJsonObject
+		val name = nameAndArgs.get("name").asString
+		val args = nameAndArgs.get("args").asJsonArray[0].asJsonObject
+		LogCat.debug(TAG, "CallbackHandler:\n  name = $name\n  args = $args")
 
 		// If __shared__ does not exist, use an empty object
-		val sharedJson = json.get("__shared__") ?: JsonParser.parseString("{}")
+		val sharedJson = args.get("__shared__") ?: JsonParser.parseString("{}")
 		val shared = jsonElementToMutableMap(sharedJson)
-		when (json.get("name").asString) {
+		when (name) {
 			"onClick" -> {
-				val linkName = json.get("link_name")?.asString
-				val linkSrc = json.get("link_src")?.asString
+				val linkName = args.get("link_name")?.asString
+				val linkSrc = args.get("link_src")?.asString
 				if (linkName == "Apply Now") {
 					this.onApply()
 				}
@@ -414,7 +417,7 @@ internal class ModalFragment constructor(
 			}
 
 			"onCalculate" -> {
-				val calculatorAmount = json.get("amount")?.asString
+				val calculatorAmount = args.get("amount")?.asString
 				this.onCalculate()
 				logEvent(
 					TrackingEvent(
@@ -448,18 +451,14 @@ internal class ModalFragment constructor(
 	private fun jsonValueToAny(jsonElement: JsonElement): Any {
 		return when {
 			jsonElement.isJsonPrimitive -> {
-				val jsonPrimitive = jsonElement.asJsonPrimitive
-				if (jsonPrimitive.isBoolean) {
-					jsonPrimitive.asBoolean
-				}
-				else if (jsonPrimitive.isNumber) {
-					jsonPrimitive.asNumber
-				}
-				else {
-					jsonPrimitive.asString
+				val primitive = jsonElement.asJsonPrimitive
+				when {
+					primitive.isBoolean -> primitive.asBoolean
+					primitive.isNumber -> primitive.asNumber
+					else -> primitive.asString
 				}
 			}
-
+			jsonElement.isJsonArray -> jsonElement.asJsonArray
 			jsonElement.isJsonObject -> jsonElementToMutableMap(jsonElement)
 			else -> throw IllegalArgumentException("Unsupported JSON element type: ${jsonElement::class.java.simpleName}")
 		}

library/src/main/java/com/paypal/messages/logger/Logger.kt

@@ -43,21 +43,26 @@ class Logger private constructor() {
 		initBasePayload()
 	}
 
+	private fun resetBasePayload(isInit: Boolean = false) {
+		LogCat.debug(TAG, if (isInit) "initBasePayload" else "resetBasePayload")
+		this.payload = TrackingPayload(
+			clientId = clientId,
+			merchantId = null,
+			partnerAttributionId = null,
+			// merchantProfileHash will be later defined by pulling from LocalStorage
+			merchantProfileHash = null,
+			deviceId = Settings.Secure.ANDROID_ID,
+			// TODO Determine SessionId for Logger
+			sessionId = "random for now, TBD at later point to what this is specifically",
+			integrationName = integrationName,
+			integrationVersion = integrationVersion,
+			components = mutableListOf(),
+		)
+	}
+
 	private fun initBasePayload() {
 		if (clientId !== "") {
-			this.payload = TrackingPayload(
-				clientId = clientId,
-				merchantId = null,
-				partnerAttributionId = null,
-				// merchantProfileHash can be later defined after a message request by pulling from paypalmessagelocalstorage
-				merchantProfileHash = null,
-				deviceId = Settings.Secure.ANDROID_ID,
-				// TODO Determine SessionId for Logger
-				sessionId = "random for now, TBD at later point to what this is specifically",
-				integrationName = integrationName,
-				integrationVersion = integrationVersion,
-				components = mutableListOf(),
-			)
+			resetBasePayload(true)
 		}
 		else {
 			val exception = InvalidCheckoutConfigException()
@@ -113,18 +118,16 @@ class Logger private constructor() {
 			delay(5000) // Wait 5 seconds before sending our payload
 
 			val localStorage = LocalStorage(context)
-			LogCat.debug(TAG, localStorage.merchantHash.toString())
-			finalPayload.components.forEach { component ->
-				component.instanceId?.let { LogCat.debug(TAG, it) }
-				component.events.forEach { event ->
-					LogCat.debug(TAG, event.eventType.toString())
-				}
+			val hash = localStorage.merchantHash
+			val payloadSummary = finalPayload.components.joinToString("\n") {
+				val eventsString = it.events.joinToString { event -> event.eventType.toString() }
+				"  type: ${it.type}\n  instanceId: ${it.instanceId}\n  events: $eventsString\n"
 			}
+			LogCat.debug(TAG, "merchantHash: ${hash}\npayloadSummary:\n$payloadSummary")
 
+			finalPayload.merchantProfileHash = hash
 			Api.callLoggerEndpoint(finalPayload)
-
-			// After our response has completed, we can reset our base payload.
-			initBasePayload()
+			resetBasePayload()
 		}
 	}
 }

library/src/main/java/com/paypal/messages/logger/TrackingPayload.kt

@@ -13,7 +13,7 @@ data class TrackingPayload(
 	@SerializedName("partner_attribution_id")
 	val partnerAttributionId: String? = null,
 	@SerializedName("merchant_profile_hash")
-	val merchantProfileHash: String? = null,
+	var merchantProfileHash: String? = null,
 
 	// Global Details
 	@SerializedName("device_id")