From 8552d8d97a44fb5523f0a5b08a0e432cdd1ae935 Mon Sep 17 00:00:00 2001
From: Shaurya Rehan <shaurya.rehan@navi.com>
Date: Wed, 11 Sep 2024 16:16:16 +0530
Subject: [PATCH] NTP-1857 | DateTimeFormatter parsing crash fix (#12481)

---
 .../kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt    | 4 ++--
 .../src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt
index 0e2f5e59eb..3f26b501fc 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/common/utils/NaviPayCommonUtils.kt
@@ -90,7 +90,7 @@ import com.navi.pay.utils.NAVI_PAY_LOCAL_URI_SCHEME
 import com.navi.pay.utils.NAVI_PAY_NON_ENCRYPT_SHARED_PREF_DATA_KEYS
 import com.navi.pay.utils.NAVI_PAY_TRANSACTION_HISTORY_TAG_SEPARATOR
 import com.navi.pay.utils.NEEDS_RESULT
-import com.navi.pay.utils.PLUS
+import com.navi.pay.utils.TIME_ZONE_OFFSET
 import com.navi.pay.utils.Z
 import com.navi.pay.utils.customHide
 import com.navi.pay.utils.getBankNameAccountNumberText
@@ -291,7 +291,7 @@ object NaviPayCommonUtils {
         timeZone: DateTimeZone = DateTimeZone.getDefault()
     ): DateTime? {
         dateTime?.let {
-            if (it.contains(other = Z) || it.contains(other = PLUS)) {
+            if (it.contains(other = Z) || it.matches(regex = TIME_ZONE_OFFSET)) {
                 return DateTime.parse(it).withZone(timeZone)
             } else {
                 val updatedDateTime = "${it}Z"
diff --git a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt
index 7b0e9f75ac..3ac8c9da1a 100644
--- a/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt
+++ b/android/navi-pay/src/main/kotlin/com/navi/pay/utils/NaviPayConstants.kt
@@ -439,7 +439,7 @@ const val UPI_NUMBER_STATUS_NEW = "NEW"
 
 // Regex Constants
 val NOTES_REGEX = Regex(pattern = "^[a-zA-Z0-9 \\-]*\$")
-val TIME_ZONE_OFFSET = Regex(pattern = "[-+]\\d{2}:\\d{2}\$")
+val TIME_ZONE_OFFSET = Regex(pattern = ".*[-+]\\d{2}:\\d{2}\$")
 val UPI_NUMBER_VALIDATION_REGEX = Regex("^\\d{8,10}\$")
 val UPI_ID_VALIDATION_REGEX = Regex(pattern = ".+@.{2,}")
 val SEARCH_QUERY_VALIDATION_REGEX = Regex("^\\+?\\d+\$")