fix: allow messages to be updated any time (#34)

demo/src/main/java/com/paypal/messagesdemo/XmlActivity.kt

@@ -190,7 +190,7 @@ class XmlActivity : AppCompatActivity() {
 		binding = ActivityMessageBinding.inflate(layoutInflater)
 		setContentView(binding.root)
 
-		PayPalMessageConfig.setGlobalAnalytics()
+		PayPalMessageConfig.setGlobalAnalytics("", "")
 		val config = PayPalMessageConfig(data = PayPalMessageData(clientID = "someClientID"))
 		val message = PayPalMessageView(context = this, config = config)
 		message.getConfig()

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

@@ -67,7 +67,6 @@ class PayPalMessageView @JvmOverloads constructor(
 ) : FrameLayout(context, attributeSet, defStyleAttr), OnActionCompleted {
 	private val TAG = "PayPalMessage"
 	private var messageTextView: TextView
-	private var updateInProgress = false
 	private var instanceId = UUID.randomUUID()
 
 	fun getConfig(): MessageConfig {
@@ -441,23 +440,18 @@ class PayPalMessageView @JvmOverloads constructor(
 	 * This function updates message content uses [Api.getMessageWithHash] to fetch the data.
 	 */
 	private fun updateMessageContent() {
-		LogCat.debug(TAG, "updateMessageContent config: ${getConfig()}")
-		if (!updateInProgress) {
-			// Call OnLoading callback and prepare view for the process
-			onLoading.invoke()
-			messageTextView.visibility = View.GONE
-			updateInProgress = true
-			LogCat.debug(TAG, "Firing request to get message")
-
-			requestDuration = measureTimeMillis {
-				Api.getMessageWithHash(
-					context,
-					getConfig(),
-					this.instanceId,
-					this,
-				)
-			}.toInt()
-		}
+		// Call OnLoading callback and prepare view for the process
+		onLoading.invoke()
+		LogCat.debug(TAG, "Firing request to get message with config: ${getConfig()}")
+
+		requestDuration = measureTimeMillis {
+			Api.getMessageWithHash(
+				context,
+				getConfig(),
+				this.instanceId,
+				this,
+			)
+		}.toInt()
 	}
 
 	override fun onActionCompleted(result: ApiResult) {
@@ -487,7 +481,6 @@ class PayPalMessageView @JvmOverloads constructor(
 				result.error?.let { this.onError(it) }
 			}
 		}
-		updateInProgress = false
 	}
 
 	/**

library/src/main/java/com/paypal/messages/analytics/AnalyticsLogger.kt

@@ -1,7 +1,6 @@
 package com.paypal.messages.analytics
 
 import android.content.Context
-import com.paypal.messages.config.GlobalAnalytics
 import com.paypal.messages.io.Api
 import com.paypal.messages.io.LocalStorage
 import com.paypal.messages.utils.LogCat

library/src/main/java/com/paypal/messages/config/GlobalAnalytics.kt → library/src/main/java/com/paypal/messages/analytics/GlobalAnalytics.kt

@@ -1,4 +1,4 @@
-package com.paypal.messages.config
+package com.paypal.messages.analytics
 
 object GlobalAnalytics {
 	var integrationName: String = ""

library/src/main/java/com/paypal/messages/config/message/PayPalMessageConfig.kt

@@ -1,6 +1,6 @@
 package com.paypal.messages.config.message
 
-import com.paypal.messages.config.GlobalAnalytics
+import com.paypal.messages.analytics.GlobalAnalytics
 
 /**
  * [PayPalMessageConfig] is the main configuration model for interacting with the PayPalMessage component
@@ -19,8 +19,8 @@ data class PayPalMessageConfig(
 
 	companion object {
 		fun setGlobalAnalytics(
-			integrationName: String = "",
-			integrationVersion: String = "",
+			integrationName: String,
+			integrationVersion: String,
 			deviceId: String = "",
 			sessionId: String = "",
 		) {

library/src/main/java/com/paypal/messages/io/Api.kt

@@ -170,7 +170,10 @@ object Api {
 				return ApiResult.getFailureWithDebugId(response.headers)
 			}
 
-			LogCat.debug(TAG, "callMessageHashEndpoint response: $bodyJson")
+			LogCat.debug(
+				TAG,
+				"callMessageHashEndpoint response: ${bodyJson?.let { JSONObject(it).toString(2) }}}",
+			)
 
 			val hashResponse = gson.fromJson(bodyJson, ApiHashData.Response::class.java)
 			return ApiResult.Success(hashResponse)
@@ -221,12 +224,14 @@ object Api {
 	}
 
 	internal fun createLoggerRequest(json: String): Request {
+		LogCat.debug(TAG, "json after removal: ${JSONObject(json).toString(2)}")
 		val request = Request.Builder().apply {
 			url(env.url(Env.Endpoints.LOGGER))
 			post(json.toRequestBody("application/json".toMediaType()))
 		}.build()
 
-		val jsonNoFdata = json.replace(""""fdata":".*?"""".toRegex(), "")
+		val jsonNoFdata = JSONObject(json).toString(2)
+			.replace(""""fdata":.*?",""".toRegex(), "")
 		LogCat.debug(TAG, "createLoggerRequest: $request\npayloadJson: $jsonNoFdata")
 		return request
 	}

library/src/main/java/com/paypal/messages/config/message/KoverExcludeGenerated.kt → library/src/main/java/com/paypal/messages/utils/KoverExcludeGenerated.kt

@@ -1,4 +1,4 @@
-package com.paypal.messages.config.message
+package com.paypal.messages.utils
 
 @Retention(AnnotationRetention.RUNTIME)
 @Target(

library/src/test/java/com/paypal/messages/config/GlobalAnalyticsTest.kt → library/src/test/java/com/paypal/messages/analytics/GlobalAnalyticsTest.kt

@@ -1,4 +1,4 @@
-package com.paypal.messages.config
+package com.paypal.messages.analytics
 
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Test

library/src/test/java/com/paypal/messages/config/message/PayPalMessageConfigTest.kt

@@ -1,6 +1,6 @@
 package com.paypal.messages.config.message
 
-import com.paypal.messages.config.GlobalAnalytics
+import com.paypal.messages.analytics.GlobalAnalytics
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertNotEquals
 import org.junit.jupiter.api.Test
@@ -50,7 +50,7 @@ class PayPalMessageConfigTest {
 	// It is also required for full test coverage as calculated by kover
 	@Test
 	fun testSetGlobalAnalyticsWithNoValues() {
-		PayPalMessageConfig.setGlobalAnalytics()
+		PayPalMessageConfig.setGlobalAnalytics("", "")
 
 		assertEquals("", GlobalAnalytics.integrationName)
 		assertEquals("", GlobalAnalytics.integrationVersion)

scripts/pre-commit

@@ -12,18 +12,14 @@ if [[ "$stagedFilesCount" -eq "0" ]]; then
 fi
 
 echo "Found $stagedFilesCount staged files."
-echo git diff --staged --name-only | grep -E '(library|demo)'
+git diff --staged --name-only | grep -E '(library|demo)'
 echo ""
 echo "Running ktFormat to fix any auto-fixable issues"
 
-git stash --keep-index --quiet
-
 ./gradlew ktFormat
 
-git add library/
-git add demo/
-
-git stash pop --quiet
+# Only re-add staged files that are in library/ or demo/ folders
+git diff --staged --name-only | grep -E '(library|demo)' | xargs git add
 
 echo "***********************************************"
 echo "Added changed files to commit"