From 7acd473ab52e5eab78098b7267bfa4d2c9fe3932 Mon Sep 17 00:00:00 2001 From: pmj1459 <76741702+minju1459@users.noreply.github.com> Date: Sun, 7 Apr 2024 13:15:37 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[FIX/#438]=20=EA=B5=AC=EB=8F=85=EC=83=81?= =?UTF-8?q?=ED=83=9C=20CANCELED=20=EC=8B=9C=20expiredDate=20NullOrBlank=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/el/yello/presentation/main/MainActivity.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt b/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt index 77cdb199..4f6e04e3 100644 --- a/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt +++ b/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt @@ -221,6 +221,7 @@ class MainActivity : BindingActivity(R.layout.activity_main is Success -> { if (state.data?.subscribe != CANCELED) return@onEach // TODO : 도메인 모델에 변환된 날짜로 파싱되도록 보완 + if (state.data?.expiredDate.toString().isNullOrBlank()) return@onEach val expiredDateString = state.data?.expiredDate.toString() val expiredDate = SimpleDateFormat(EXPIRED_DATE_FORMAT).parse(expiredDateString) ?: return@onEach @@ -348,7 +349,7 @@ class MainActivity : BindingActivity(R.layout.activity_main const val PUSH_TYPE_OPEN_VOTE = "OPEN_VOTE" const val BACK_PRESSED_INTERVAL = 2000 - const val EXPIRED_DATE_FORMAT = "yyyy-MM-dd" + const val EXPIRED_DATE_FORMAT = "yyyy.MM.dd" const val PAY_RESUBS_DIALOG = "PayResubsNoticeDialog" private const val EVENT_CLICK_RECOMMEND_NAVIGATION = "click_recommend_navigation" private const val TAG_NOTICE_DIALOG = "NOTICE_DIALOG" From d0e20fc49e75af6ad7fe15dc2ff44348a3a8cfbc Mon Sep 17 00:00:00 2001 From: pmj1459 <76741702+minju1459@users.noreply.github.com> Date: Sun, 7 Apr 2024 15:22:08 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[FIX/#438]=20expiredDate=20format=20?= =?UTF-8?q?=EB=B3=B5=EA=B5=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/el/yello/presentation/main/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt b/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt index 4f6e04e3..6f50227c 100644 --- a/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt +++ b/app/src/main/java/com/el/yello/presentation/main/MainActivity.kt @@ -349,7 +349,7 @@ class MainActivity : BindingActivity(R.layout.activity_main const val PUSH_TYPE_OPEN_VOTE = "OPEN_VOTE" const val BACK_PRESSED_INTERVAL = 2000 - const val EXPIRED_DATE_FORMAT = "yyyy.MM.dd" + const val EXPIRED_DATE_FORMAT = "yyyy-MM-dd" const val PAY_RESUBS_DIALOG = "PayResubsNoticeDialog" private const val EVENT_CLICK_RECOMMEND_NAVIGATION = "click_recommend_navigation" private const val TAG_NOTICE_DIALOG = "NOTICE_DIALOG"