[MERGE] #458 -> develop

[FIX/#458] admob 보상형 광고 서버 null 처리방법 변경
team-yello · Jul 30, 2024 · 9eca240 · 9eca240
2 parents 02c9c43 + be898d0
commit 9eca240
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt b/app/src/main/java/com/el/yello/presentation/pay/PayActivity.kt
@@ -206,7 +206,7 @@ class PayActivity : BindingActivity<ActivityPayBinding>(R.layout.activity_pay) {
 
                 is UiState.Failure -> {
                     stopLoadingScreen(AD)
-                    toast(getString(R.string.internet_connection_error_msg))
+                    toast(getString(R.string.pay_ad_error_msg))
                 }
 
                 is UiState.Loading -> startLoadingScreen(AD)
@@ -450,7 +450,7 @@ class PayActivity : BindingActivity<ActivityPayBinding>(R.layout.activity_pay) {
         window?.clearFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE)
     }
 
-    private fun setBackPressedWhenLoading(){
+    private fun setBackPressedWhenLoading() {
         val callback = object : OnBackPressedCallback(true) {
             override fun handleOnBackPressed() {
                 if (!manager.isPurchasing.value) {

diff --git a/app/src/main/java/com/el/yello/presentation/pay/PayViewModel.kt b/app/src/main/java/com/el/yello/presentation/pay/PayViewModel.kt
@@ -140,11 +140,7 @@ class PayViewModel @Inject constructor(
                 )
             )
                 .onSuccess { reward ->
-                    if (reward == null) {
-                        _postRewardAdState.value = UiState.Failure(toString())
-                    } else {
-                        _postRewardAdState.value = UiState.Success(reward)
-                    }
+                    _postRewardAdState.value = UiState.Success(reward)
                 }
                 .onFailure {
                     _postRewardAdState.value = UiState.Failure(it.message.orEmpty())

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -355,6 +355,7 @@
     <string name="pay_ad_vote_for_point_reward_title">10 포인트를 얻었어요!</string>
     <string name="pay_ad_vote_for_point_reward_subtitle">1시간 뒤에 다시 이용 가능해요.</string>
     <string name="pay_ad_fail_to_load">광고 조회에 실패했습니다.</string>
+    <string name="pay_ad_error_msg">일시적인 오류가 발생했습니다. 고객센터로 문의해주세요.</string>
 
     <string name="pay_tv_guide_title">옐로플러스 구독 안내</string>
     <string name="pay_tv_guide_body_1">- 결제를 진행하시면 관련 약관에 동의하는 것으로 간주됩니다.</string>

diff --git a/build-logic/convention/src/main/kotlin/Constants.kt b/build-logic/convention/src/main/kotlin/Constants.kt
@@ -3,7 +3,7 @@ object Constants {
     const val compileSdk = 34
     const val minSdk = 28
     const val targetSdk = 34
-    const val versionCode = 48
-    const val versionName = "2.1"
+    const val versionCode = 49
+    const val versionName = "2.2"
     const val jvmVersion = "18"
 }