X Tutup
Skip to content

Commit 18b003c

Browse files
committed
Consolidate CHAT_ID_PARAM constant into DuckChatConstants
Move the duplicated CHAT_ID_PARAM constant from three separate companion objects into the shared DuckChatConstants object to reduce code duplication and maintenance risk. - RealDuckChat.kt: remove private const, add import - DuckChatContextualViewModel.kt: remove companion object, add import - InputScreenViewModel.kt: remove private const, add import - DuckChatConstants.kt: add shared CHAT_ID_PARAM constant
1 parent b3c3d55 commit 18b003c

File tree

4 files changed

+4
-6
lines changed

4 files changed

+4
-6
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package com.duckduckgo.duckchat.impl
1919
object DuckChatConstants {
2020
const val HOST_DUCK_AI = "duck.ai"
2121
const val JS_MESSAGING_FEATURE_NAME = "aiChat"
22+
const val CHAT_ID_PARAM = "chatID"
2223

2324
object JsResponseKeys {
2425
const val OK = "ok"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ import com.duckduckgo.di.scopes.AppScope
3636
import com.duckduckgo.duckchat.api.DuckAiFeatureState
3737
import com.duckduckgo.duckchat.api.DuckChat
3838
import com.duckduckgo.duckchat.api.DuckChatSettingsNoParams
39+
import com.duckduckgo.duckchat.impl.DuckChatConstants.CHAT_ID_PARAM
3940
import com.duckduckgo.duckchat.impl.DuckChatConstants.HOST_DUCK_AI
4041
import com.duckduckgo.duckchat.impl.clearing.DuckChatDeleter
4142
import com.duckduckgo.duckchat.impl.feature.AIChatImageUploadFeature
@@ -850,7 +851,6 @@ class RealDuckChat @Inject constructor(
850851
private const val PLACEMENT_QUERY_VALUE = "sidebar"
851852
private const val BANG_QUERY_NAME = "bang"
852853
private const val BANG_QUERY_VALUE = "true"
853-
private const val CHAT_ID_PARAM = "chatID"
854854
private const val DEFAULT_SESSION_ALIVE = 60
855855
private const val REVOKE_URL = "https://duckduckgo.com/revoke-duckai-access"
856856
}

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/contextual/DuckChatContextualViewModel.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import com.duckduckgo.anvil.annotations.ContributesViewModel
2323
import com.duckduckgo.common.utils.DispatcherProvider
2424
import com.duckduckgo.di.scopes.FragmentScope
2525
import com.duckduckgo.duckchat.api.DuckChat
26+
import com.duckduckgo.duckchat.impl.DuckChatConstants.CHAT_ID_PARAM
2627
import com.duckduckgo.duckchat.impl.DuckChatInternal
2728
import com.duckduckgo.duckchat.impl.helper.DuckChatJSHelper
2829
import com.duckduckgo.duckchat.impl.helper.NativeAction
@@ -542,8 +543,4 @@ class DuckChatContextualViewModel @Inject constructor(
542543
val elapsedMs = timeProvider.currentTimeMillis() - lastClosedTimestamp
543544
return elapsedMs <= timeoutMs
544545
}
545-
546-
companion object {
547-
private const val CHAT_ID_PARAM = "chatID"
548-
}
549546
}

duckchat/duckchat-impl/src/main/java/com/duckduckgo/duckchat/impl/inputscreen/ui/viewmodel/InputScreenViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import com.duckduckgo.common.utils.SingleLiveEvent
4444
import com.duckduckgo.common.utils.extensions.toBinaryString
4545
import com.duckduckgo.duckchat.api.DuckAiFeatureState
4646
import com.duckduckgo.duckchat.api.DuckChat
47+
import com.duckduckgo.duckchat.impl.DuckChatConstants.CHAT_ID_PARAM
4748
import com.duckduckgo.duckchat.impl.feature.DuckChatFeature
4849
import com.duckduckgo.duckchat.impl.inputscreen.ui.InputScreenConfigResolver
4950
import com.duckduckgo.duckchat.impl.inputscreen.ui.command.Command
@@ -803,7 +804,6 @@ class InputScreenViewModel @AssistedInject constructor(
803804
companion object {
804805
const val DUCK_SCHEME = "duck"
805806
private const val CHAT_SUGGESTIONS_DEBOUNCE_MS = 150L
806-
private const val CHAT_ID_PARAM = "chatID"
807807
}
808808
}
809809

0 commit comments

Comments
 (0)
X Tutup