From cec327e4b551ad0c1f900652ca0620d6d8a4db2b Mon Sep 17 00:00:00 2001 From: vedant aggarwal Date: Fri, 13 Sep 2024 00:33:00 +0530 Subject: [PATCH] TP-69510 | Send Money Revamp Migration Crash Fix (#12524) --- .../navi/pay/common/utils/NaviPayCommonUtils.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 3f26b501fc..2dfcb6fc2a 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 @@ -290,14 +290,14 @@ object NaviPayCommonUtils { dateTime: String?, timeZone: DateTimeZone = DateTimeZone.getDefault() ): DateTime? { - dateTime?.let { - if (it.contains(other = Z) || it.matches(regex = TIME_ZONE_OFFSET)) { - return DateTime.parse(it).withZone(timeZone) - } else { - val updatedDateTime = "${it}Z" - return DateTime.parse(updatedDateTime).withZone(timeZone) - } - } ?: return null + return if (dateTime.isNullOrBlank()) { + null + } else if (dateTime.contains(other = Z) || dateTime.matches(regex = TIME_ZONE_OFFSET)) { + DateTime.parse(dateTime).withZone(timeZone) + } else { + val updatedDateTime = "${dateTime}Z" + DateTime.parse(updatedDateTime).withZone(timeZone) + } } fun getDateTimeObjectFromEpochString(epochMillis: Long): DateTime {