Remove references related to My Site Dashboard default tab experiment.

Author: zwarm

WordPress/src/main/java/org/wordpress/android/AppInitializer.kt

@@ -81,7 +81,6 @@ import org.wordpress.android.support.ZendeskHelper
 import org.wordpress.android.ui.ActivityId
 import org.wordpress.android.ui.debug.cookies.DebugCookieManager
 import org.wordpress.android.ui.mysite.SelectedSiteRepository
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.notifications.SystemNotificationsTracker
 import org.wordpress.android.ui.notifications.services.NotificationsUpdateServiceStarter
 import org.wordpress.android.ui.notifications.utils.NotificationsUtils
@@ -154,7 +153,6 @@ class AppInitializer @Inject constructor(
     @Inject lateinit var debugCookieManager: DebugCookieManager
     @Inject @Named(APPLICATION_SCOPE) lateinit var appScope: CoroutineScope
     @Inject lateinit var selectedSiteRepository: SelectedSiteRepository
-    @Inject lateinit var mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
 
     // For development and production `AnalyticsTrackerNosara`, for testing a mocked `Tracker` will be injected.
     @Inject lateinit var tracker: Tracker
@@ -308,8 +306,6 @@ class AppInitializer @Inject constructor(
 
         debugCookieManager.sync()
 
-        initAnalyticsExperimentPropertiesIfNeeded()
-
         initialized = true
     }
 
@@ -683,11 +679,6 @@ class AppInitializer @Inject constructor(
         EmojiCompat.init(config)
     }
 
-    /* If default tab experiment is running, pass along to tracker */
-    private fun initAnalyticsExperimentPropertiesIfNeeded() {
-        mySiteDefaultTabExperiment.checkAndSetTrackingPropertiesIfNeeded()
-    }
-
     @Suppress("unused")
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun onAppComesFromBackground() {

WordPress/src/main/java/org/wordpress/android/ui/accounts/LoginEpilogueViewModel.kt

@@ -4,7 +4,6 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MediatorLiveData
 import androidx.lifecycle.ViewModel
 import org.wordpress.android.fluxc.store.SiteStore
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.viewmodel.Event
@@ -14,8 +13,7 @@ import javax.inject.Inject
 class LoginEpilogueViewModel @Inject constructor(
     private val appPrefsWrapper: AppPrefsWrapper,
     private val buildConfigWrapper: BuildConfigWrapper,
-    private val siteStore: SiteStore,
-    private val mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
+    private val siteStore: SiteStore
 ) : ViewModel() {
     private val _navigationEvents = MediatorLiveData<Event<LoginNavigationEvents>>()
     val navigationEvents: LiveData<Event<LoginNavigationEvents>> = _navigationEvents
@@ -32,10 +30,6 @@ class LoginEpilogueViewModel @Inject constructor(
         if (!siteStore.hasSite()) handleNoSitesFound() else handleSitesFound()
     }
 
-    fun checkAndSetVariantForMySiteDefaultTabExperiment() {
-        mySiteDefaultTabExperiment.checkAndSetVariantIfNeeded()
-    }
-
     private fun handleNoSitesFound() {
         if (buildConfigWrapper.isJetpackApp && !buildConfigWrapper.isSiteCreationEnabled) {
             _navigationEvents.postValue(Event(LoginNavigationEvents.ShowNoJetpackSites))

WordPress/src/main/java/org/wordpress/android/ui/accounts/login/LoginEpilogueFragment.java

@@ -173,7 +173,6 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     public void onActivityCreated(@Nullable Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         if (savedInstanceState == null) {
-            mParentViewModel.checkAndSetVariantForMySiteDefaultTabExperiment();
             AnalyticsTracker.track(AnalyticsTracker.Stat.LOGIN_EPILOGUE_VIEWED);
             mUnifiedLoginTracker.track(Step.SUCCESS);
         }

WordPress/src/main/java/org/wordpress/android/ui/main/WPMainActivity.java

@@ -1380,7 +1380,6 @@ public void onAuthenticationChanged(OnAuthenticationChanged event) {
                     // We'll handle it in onAccountChanged so we know we have
                     // updated account info.
                     AppPrefs.setShouldTrackMagicLinkSignup(true);
-                    mViewModel.checkAndSetVariantForMySiteDefaultTabExperiment();
                     mDispatcher.dispatch(AccountActionBuilder.newFetchAccountAction());
                     if (mJetpackConnectSource != null) {
                         ActivityLauncher.continueJetpackConnect(this, mJetpackConnectSource, getSelectedSite());

WordPress/src/main/java/org/wordpress/android/ui/mysite/cards/CardsBuilder.kt

@@ -11,7 +11,6 @@ import org.wordpress.android.ui.mysite.cards.dashboard.CardsBuilder
 import org.wordpress.android.ui.mysite.cards.quickactions.QuickActionsCardBuilder
 import org.wordpress.android.ui.mysite.cards.quicklinksribbon.QuickLinkRibbonBuilder
 import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartCardBuilder
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.utils.ListItemInteraction
 import org.wordpress.android.util.BuildConfigWrapper
 import org.wordpress.android.util.config.QuickStartDynamicCardsFeatureConfig
@@ -24,8 +23,7 @@ class CardsBuilder @Inject constructor(
     private val quickActionsCardBuilder: QuickActionsCardBuilder,
     private val quickStartCardBuilder: QuickStartCardBuilder,
     private val quickLinkRibbonBuilder: QuickLinkRibbonBuilder,
-    private val dashboardCardsBuilder: CardsBuilder,
-    private val mySiteDefaultTabExperiment: MySiteDefaultTabExperiment
+    private val dashboardCardsBuilder: CardsBuilder
 ) {
     fun build(
         quickActionsCardBuilderParams: QuickActionsCardBuilderParams,
@@ -55,10 +53,7 @@ class CardsBuilder @Inject constructor(
     }
 
     private fun shouldShowQuickActionsCard(isMySiteTabsEnabled: Boolean): Boolean {
-        val isDefaultTabVariantAssignedInExperiment =
-                mySiteDefaultTabExperiment.isExperimentRunning() && mySiteDefaultTabExperiment.isVariantAssigned()
-        return buildConfigWrapper.isQuickActionEnabled &&
-                (!isMySiteTabsEnabled || !isDefaultTabVariantAssignedInExperiment)
+        return buildConfigWrapper.isQuickActionEnabled && !isMySiteTabsEnabled
     }
 
     private fun trackAndBuildDomainRegistrationCard(

WordPress/src/main/java/org/wordpress/android/viewmodel/main/WPMainActivityViewModel.kt

@@ -32,7 +32,6 @@ import org.wordpress.android.ui.main.MainFabUiState
 import org.wordpress.android.ui.mysite.SelectedSiteRepository
 import org.wordpress.android.ui.mysite.cards.dashboard.bloggingprompts.BloggingPromptAttribution
 import org.wordpress.android.ui.mysite.cards.quickstart.QuickStartRepository
-import org.wordpress.android.ui.mysite.tabs.MySiteDefaultTabExperiment
 import org.wordpress.android.ui.prefs.AppPrefsWrapper
 import org.wordpress.android.ui.utils.UiString.UiStringText
 import org.wordpress.android.ui.whatsnew.FeatureAnnouncementProvider
@@ -65,7 +64,6 @@ class WPMainActivityViewModel @Inject constructor(
     private val selectedSiteRepository: SelectedSiteRepository,
     private val accountStore: AccountStore,
     private val siteStore: SiteStore,
-    private val mySiteDefaultTabExperiment: MySiteDefaultTabExperiment,
     private val bloggingPromptsFeatureConfig: BloggingPromptsFeatureConfig,
     private val bloggingPromptsStore: BloggingPromptsStore,
     @Named(UI_THREAD) private val mainDispatcher: CoroutineDispatcher
@@ -298,10 +296,6 @@ class WPMainActivityViewModel @Inject constructor(
         _switchToMySite.value = Event(Unit)
     }
 
-    fun checkAndSetVariantForMySiteDefaultTabExperiment() {
-        mySiteDefaultTabExperiment.checkAndSetVariantIfNeeded()
-    }
-
     fun onResume(site: SiteModel?, isOnMySitePageWithValidSite: Boolean) {
         val showFab = if (buildConfigWrapper.isCreateFabEnabled) isOnMySitePageWithValidSite else false
         setMainFabUiState(showFab, site)