Duck.ai: Tabs lifecycle

Author: malmstein

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

@@ -4470,7 +4470,8 @@ class BrowserTabViewModel @Inject constructor(
             val params = duckChat.createWasUsedBeforePixelParams()
             pixel.fire(DuckChatPixelName.DUCK_CHAT_OPEN_BROWSER_MENU, parameters = params)
         }
-        duckChat.openDuckChat()
+        val url = duckChat.getDuckChatUrl("", false)
+        onUserSubmittedQuery(url)
     }
 
     fun onDuckChatOmnibarButtonClicked(
@@ -4481,11 +4482,14 @@ class BrowserTabViewModel @Inject constructor(
         viewModelScope.launch {
             command.value = HideKeyboardForChat
         }
-        when {
-            hasFocus && isNtp && query.isNullOrBlank() -> duckChat.openDuckChat()
-            hasFocus -> duckChat.openDuckChatWithAutoPrompt(query ?: "")
-            else -> duckChat.openDuckChat()
+
+        val url = when {
+            hasFocus && isNtp && query.isNullOrBlank() -> duckChat.getDuckChatUrl(query ?: "", false)
+            hasFocus -> duckChat.getDuckChatUrl(query ?: "", true)
+            else -> duckChat.getDuckChatUrl(query ?: "", false)
         }
+
+        onUserSubmittedQuery(url)
     }
 
     fun onVpnMenuClicked() {

duckchat/duckchat-api/src/main/java/com/duckduckgo/duckchat/api/DuckChat.kt

@@ -46,6 +46,11 @@ interface DuckChat {
      */
     fun openDuckChatWithPrefill(query: String)
 
+    /**
+     * Returns the Duck Chat URL to be used
+     */
+    fun getDuckChatUrl(query: String, autoPrompt: Boolean): String
+
     /**
      * Determines whether a given [Uri] is a DuckChat URL.
      *

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/RealDuckChat.kt

@@ -481,6 +481,13 @@ class RealDuckChat @Inject constructor(
         openDuckChat(parameters, forceNewSession = true)
     }
 
+    override fun getDuckChatUrl(query: String, autoPrompt: Boolean): String {
+        logcat { "Duck.ai: getDuckChatUrl query $query autoPrompt $autoPrompt" }
+        val parameters = addChatParameters(query, autoPrompt = autoPrompt)
+        val url = appendParameters(parameters, duckChatLink)
+        return url
+    }
+
     private fun addChatParameters(
         query: String,
         autoPrompt: Boolean,