Revert "initialize VisualDesignExperimentDataStore on a worker thread" (#6184)

Task/Issue URL:
https://app.asana.com/1/137249556945/project/1208671518894266/task/1210473006294609?focus=true

Reverts #6181, as it causes a crash when using the
Fire Button

Author: CrisBarreiro

app/src/main/java/com/duckduckgo/app/browser/omnibar/experiments/FadeOmnibarLayout.kt

@@ -44,6 +44,7 @@ import com.duckduckgo.app.browser.omnibar.Omnibar.ViewMode
 import com.duckduckgo.app.browser.omnibar.OmnibarLayout
 import com.duckduckgo.app.browser.omnibar.OmnibarLayoutViewModel.ViewState
 import com.duckduckgo.app.browser.omnibar.model.OmnibarPosition
+import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStore
 import com.duckduckgo.common.ui.view.gone
 import com.duckduckgo.common.ui.view.hide
 import com.duckduckgo.common.ui.view.show
@@ -63,6 +64,9 @@ class FadeOmnibarLayout @JvmOverloads constructor(
     defStyle: Int = 0,
 ) : OmnibarLayout(context, attrs, defStyle) {
 
+    @Inject
+    lateinit var experimentDataStore: VisualDesignExperimentDataStore
+
     @Inject
     lateinit var globalActivityStarter: GlobalActivityStarter
 

app/src/main/java/com/duckduckgo/app/launch/LaunchBridgeActivity.kt

@@ -20,35 +20,26 @@ import android.os.Bundle
 import androidx.activity.result.ActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.duckduckgo.anvil.annotations.InjectWith
 import com.duckduckgo.app.browser.BrowserActivity
 import com.duckduckgo.app.browser.R
 import com.duckduckgo.app.onboarding.ui.OnboardingActivity
-import com.duckduckgo.common.ui.experiments.visual.store.VisualDesignExperimentDataStoreInitializer
+import com.duckduckgo.common.ui.DuckDuckGoActivity
 import com.duckduckgo.daxprompts.api.DaxPromptBrowserComparisonNoParams
 import com.duckduckgo.daxprompts.api.DaxPromptDuckPlayerNoParams
 import com.duckduckgo.daxprompts.impl.ui.DaxPromptBrowserComparisonActivity.Companion.DAX_PROMPT_BROWSER_COMPARISON_SET_DEFAULT_EXTRA
 import com.duckduckgo.daxprompts.impl.ui.DaxPromptDuckPlayerActivity.Companion.DAX_PROMPT_DUCK_PLAYER_ACTIVITY_URL_EXTRA
 import com.duckduckgo.di.scopes.ActivityScope
 import com.duckduckgo.navigation.api.GlobalActivityStarter
-import dagger.android.AndroidInjection
-import dagger.android.DaggerActivity
 import javax.inject.Inject
 import kotlinx.coroutines.launch
 import logcat.logcat
 
 @InjectWith(ActivityScope::class)
-class LaunchBridgeActivity : DaggerActivity() {
+class LaunchBridgeActivity : DuckDuckGoActivity() {
 
-    @Inject lateinit var visualDesignExperimentDataStoreInitializer: VisualDesignExperimentDataStoreInitializer
-
-    @Inject lateinit var viewModelFactory: ViewModelProvider.NewInstanceFactory
-
-    private val viewModel: LaunchViewModel by lazy {
-        ViewModelProvider(this, viewModelFactory)[LaunchViewModel::class.java]
-    }
+    private val viewModel: LaunchViewModel by bindViewModel()
 
     private val startDaxPromptDuckPlayerActivityForResult =
         registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
@@ -78,7 +69,6 @@ class LaunchBridgeActivity : DaggerActivity() {
     lateinit var globalActivityStarter: GlobalActivityStarter
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidInjection.inject(this, bindingKey = DaggerActivity::class.java)
         val splashScreen = installSplashScreen()
         super.onCreate(savedInstanceState)
         splashScreen.setKeepOnScreenCondition { true }
@@ -87,10 +77,7 @@ class LaunchBridgeActivity : DaggerActivity() {
 
         configureObservers()
 
-        lifecycleScope.launch {
-            visualDesignExperimentDataStoreInitializer.initialize()
-            viewModel.determineViewToShow()
-        }
+        lifecycleScope.launch { viewModel.determineViewToShow() }
     }
 
     private fun configureObservers() {

common/common-ui/src/main/java/com/duckduckgo/common/ui/experiments/visual/store/VisualDesignExperimentDataStore.kt

@@ -18,15 +18,6 @@ package com.duckduckgo.common.ui.experiments.visual.store
 
 import kotlinx.coroutines.flow.StateFlow
 
-interface VisualDesignExperimentDataStoreInitializer {
-    /**
-     * Initializes the [VisualDesignExperimentDataStore].
-     *
-     * This is a special, idempotent function to be called while the splash screen is visible to pre-warm the store and allow for non-blocking, synchronous access afterwards.
-     */
-    suspend fun initialize(): VisualDesignExperimentDataStore
-}
-
 interface VisualDesignExperimentDataStore {
 
     /**

common/common-ui/src/main/java/com/duckduckgo/common/ui/experiments/visual/store/VisualDesignExperimentDataStoreImpl.kt

@@ -24,6 +24,8 @@ import com.duckduckgo.feature.toggles.api.FeatureTogglesInventory
 import com.duckduckgo.feature.toggles.api.Toggle
 import com.duckduckgo.privacy.config.api.PrivacyConfigCallbackPlugin
 import com.squareup.anvil.annotations.ContributesBinding
+import com.squareup.anvil.annotations.ContributesMultibinding
+import dagger.SingleInstanceIn
 import javax.inject.Inject
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -35,7 +37,13 @@ import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.runBlocking
 
-class VisualDesignExperimentDataStoreImpl(
+@ContributesBinding(
+    scope = AppScope::class,
+    boundType = VisualDesignExperimentDataStore::class,
+)
+@ContributesMultibinding(scope = AppScope::class, boundType = PrivacyConfigCallbackPlugin::class)
+@SingleInstanceIn(scope = AppScope::class)
+class VisualDesignExperimentDataStoreImpl @Inject constructor(
     @AppCoroutineScope private val appCoroutineScope: CoroutineScope,
     private val experimentalUIThemingFeature: ExperimentalUIThemingFeature,
     private val featureTogglesInventory: FeatureTogglesInventory,
@@ -83,6 +91,10 @@ class VisualDesignExperimentDataStoreImpl(
             initialValue = _duckAIFeatureFlagEnabled.value && isExperimentEnabled.value,
         )
 
+    /**
+     * This is a blocking call but it only blocks the main thread when the class initializes, so when the splash screen is visible.
+     * All subsequent calls are moved off of the main thread.
+     */
     private fun isAnyConflictingExperimentEnabled(): Boolean = runBlocking {
         val activeExperimentsNames = featureTogglesInventory.getAllActiveExperimentToggles().map { it.featureName().name }
         conflictingExperimentsNames.any { activeExperimentsNames.contains(it) }
@@ -115,30 +127,3 @@ class VisualDesignExperimentDataStoreImpl(
         }
     }
 }
-
-/**
- * Factory for integration with [VisualDesignExperimentDataStoreLazyProvider] and testing purposes,
- * to get an actual instance for your use case just inject [VisualDesignExperimentDataStore].
- */
-interface VisualDesignExperimentDataStoreImplFactory {
-    fun create(
-        appCoroutineScope: CoroutineScope,
-        experimentalUIThemingFeature: ExperimentalUIThemingFeature,
-        featureTogglesInventory: FeatureTogglesInventory,
-    ): VisualDesignExperimentDataStoreImpl
-}
-
-@ContributesBinding(scope = AppScope::class)
-class VisualDesignExperimentDataStoreImplFactoryImpl @Inject constructor() : VisualDesignExperimentDataStoreImplFactory {
-    override fun create(
-        appCoroutineScope: CoroutineScope,
-        experimentalUIThemingFeature: ExperimentalUIThemingFeature,
-        featureTogglesInventory: FeatureTogglesInventory,
-    ): VisualDesignExperimentDataStoreImpl {
-        return VisualDesignExperimentDataStoreImpl(
-            appCoroutineScope = appCoroutineScope,
-            experimentalUIThemingFeature = experimentalUIThemingFeature,
-            featureTogglesInventory = featureTogglesInventory,
-        )
-    }
-}