Skip to content

Commit 41fbe35

Browse files
committed
fix tab livecycle in non input screen mode
1 parent e9a0ef1 commit 41fbe35

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

app/src/main/java/com/duckduckgo/app/browser/BrowserTabViewModel.kt

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,18 +1138,12 @@ class BrowserTabViewModel @Inject constructor(
11381138
when (val type = specialUrlDetector.determineType(trimmedInput)) {
11391139
is ShouldLaunchDuckChatLink -> {
11401140
runCatching {
1141-
if (duckAiFeatureState.showFullScreenMode.value) {
1142-
logcat { "Duck.ai: ShouldLaunchDuckChatLink $urlToNavigate" }
1143-
site?.nextUrl = urlToNavigate
1144-
command.value = NavigationCommand.Navigate(urlToNavigate, getUrlHeaders(urlToNavigate))
1141+
logcat { "Duck.ai: ShouldLaunchDuckChatLink $urlToNavigate" }
1142+
val queryParameter = urlToNavigate.toUri().getQueryParameter(QUERY)
1143+
if (queryParameter != null) {
1144+
duckChat.openDuckChatWithPrefill(queryParameter)
11451145
} else {
1146-
val queryParameter = urlToNavigate.toUri().getQueryParameter(QUERY)
1147-
logcat { "Duck.ai: ShouldLaunchDuckChatLink queryParameter $queryParameter" }
1148-
if (queryParameter != null) {
1149-
duckChat.openDuckChatWithPrefill(queryParameter)
1150-
} else {
1151-
duckChat.openDuckChat()
1152-
}
1146+
duckChat.openDuckChat()
11531147
}
11541148
return
11551149
}

app/src/main/java/com/duckduckgo/app/browser/SpecialUrlDetector.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import com.duckduckgo.app.browser.SpecialUrlDetector.UrlType
3030
import com.duckduckgo.app.browser.applinks.ExternalAppIntentFlagsFeature
3131
import com.duckduckgo.app.browser.duckchat.AIChatQueryDetectionFeature
3232
import com.duckduckgo.app.pixels.remoteconfig.AndroidBrowserConfigFeature
33+
import com.duckduckgo.duckchat.api.DuckAiFeatureState
3334
import com.duckduckgo.duckchat.api.DuckChat
3435
import com.duckduckgo.duckplayer.api.DuckPlayer
3536
import com.duckduckgo.privacy.config.api.AmpLinkType
@@ -49,6 +50,7 @@ class SpecialUrlDetectorImpl(
4950
private val externalAppIntentFlagsFeature: ExternalAppIntentFlagsFeature,
5051
private val duckPlayer: DuckPlayer,
5152
private val duckChat: DuckChat,
53+
private val duckAiFeatureState: DuckAiFeatureState,
5254
private val aiChatQueryDetectionFeature: AIChatQueryDetectionFeature,
5355
private val androidBrowserConfigFeature: AndroidBrowserConfigFeature,
5456
) : SpecialUrlDetector {
@@ -107,7 +109,7 @@ class SpecialUrlDetectorImpl(
107109

108110
val uri = uriString.toUri()
109111

110-
if (duckChat.isDuckChatUrl(uri)) {
112+
if (duckChat.isDuckChatUrl(uri) && !duckAiFeatureState.showFullScreenMode.value) {
111113
return UrlType.ShouldLaunchDuckChatLink
112114
}
113115

app/src/main/java/com/duckduckgo/app/browser/di/BrowserModule.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ import com.duckduckgo.downloads.api.FileDownloader
8484
import com.duckduckgo.downloads.impl.AndroidFileDownloader
8585
import com.duckduckgo.downloads.impl.DataUriDownloader
8686
import com.duckduckgo.downloads.impl.FileDownloadCallback
87+
import com.duckduckgo.duckchat.api.DuckAiFeatureState
8788
import com.duckduckgo.duckchat.api.DuckChat
8889
import com.duckduckgo.duckplayer.api.DuckPlayer
8990
import com.duckduckgo.experiments.api.VariantManager
@@ -193,6 +194,7 @@ class BrowserModule {
193194
externalAppIntentFlagsFeature: ExternalAppIntentFlagsFeature,
194195
duckPlayer: DuckPlayer,
195196
duckChat: DuckChat,
197+
duckChaFeatureState: DuckAiFeatureState,
196198
aiChatQueryDetectionFeature: AIChatQueryDetectionFeature,
197199
androidBrowserConfigFeature: AndroidBrowserConfigFeature,
198200
): SpecialUrlDetector = SpecialUrlDetectorImpl(
@@ -203,6 +205,7 @@ class BrowserModule {
203205
externalAppIntentFlagsFeature,
204206
duckPlayer,
205207
duckChat,
208+
duckChaFeatureState,
206209
aiChatQueryDetectionFeature,
207210
androidBrowserConfigFeature,
208211
)

0 commit comments

Comments
 (0)