Merge branch 'refs/heads/develop' into feature/Boolti-355

Nexters · Dec 30, 2024 · 3a8a5f2 · 3a8a5f2
2 parents 781d278 + 49acd12
commit 3a8a5f2
Show file tree

Hide file tree

Showing 7 changed files with 259 additions and 194 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 minSdk = "26"
 targetSdk = "34"
-versionCode = "30"
-versionName = "1.9.0"
+versionCode = "32"
+versionName = "1.9.2"
 packageName = "com.nexters.boolti"
 compileSdk = "34"
 targetJvm = "17"

diff --git a/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeScreen.kt b/presentation/src/main/java/com/nexters/boolti/presentation/screen/home/HomeScreen.kt
@@ -1,6 +1,5 @@
 package com.nexters.boolti.presentation.screen.home
 
-import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.widget.Toast
@@ -78,8 +77,6 @@ fun HomeScreen(
 
     var dialog: GiftStatus? by rememberSaveable { mutableStateOf(null) }
 
-    removeInvalidDeepLink(LocalContext.current)
-
     LaunchedEffect(Unit) {
         viewModel.events.collect { event ->
             when (event) {
@@ -209,19 +206,6 @@ fun HomeScreen(
     }
 }
 
-/**
- * issue #209를 해결하기 위한 메서드.
- * 처리하지 말아야 할 deep link가 부적절한 destination과 match되는 것을 방지하기 위함.
- */
-private fun removeInvalidDeepLink(context: Context) {
-    runCatching {
-        val intent = context.requireActivity().intent
-        if (intent.action == null) return
-        val deepLink = intent.action!!
-        if (!deepLink.contains("home")) intent.setAction(null)
-    }
-}
-
 @Stable
 private enum class Destination(
     val route: String,

diff --git a/...rc/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailContentScreen.kt b/...rc/main/java/com/nexters/boolti/presentation/screen/showdetail/ShowDetailContentScreen.kt
@@ -29,7 +29,7 @@ fun ShowDetailContentScreen(
     val uriHandler = LocalUriHandler.current
     val scrollState = rememberScrollState()
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
-    val notice = uiState.showDetail.notice
+    val notice = uiState.showDetail?.notice ?: return
     val urlParser = UrlParser(notice)
 
     Scaffold(