Merge branch 'trunk' into issue-15480/email_encoding_rfc_3986

Author: ovitrif

RELEASE-NOTES.txt

@@ -2,6 +2,7 @@
 
 20.5
 -----
+* [*] Use larger thumbnail previews for recommended themes during site creation [https://github.com/wordpress-mobile/WordPress-Android/pull/16848]
 
 
 20.4

WordPress/build.gradle

@@ -109,8 +109,6 @@ android {
         buildConfigField "boolean", "SITE_NAME", "false"
         buildConfigField "boolean", "LAND_ON_THE_EDITOR", "false"
         buildConfigField "boolean", "BLOGGING_PROMPTS", "false"
-        buildConfigField "boolean", "MY_SITE_DEFAULT_TAB_EXPERIMENT", "false"
-        buildConfigField "boolean", "MY_SITE_DEFAULT_TAB_EXPERIMENT_VARIANT_DASHBOARD", "false"
         buildConfigField "boolean", "STATS_REVAMP_V2", "false"
         buildConfigField "boolean", "QUICK_START_EXISTING_USERS_V2", "false"
         buildConfigField "boolean", "QRCODE_AUTH_FLOW", "false"

WordPress/src/androidTest/java/org/wordpress/android/AppInitializerTest.kt

@@ -0,0 +1,22 @@
+package org.wordpress.android
+
+import androidx.lifecycle.ProcessLifecycleOwner
+import dagger.hilt.android.testing.HiltAndroidTest
+import org.junit.Assert.assertFalse
+import org.junit.Test
+import org.wordpress.android.AppInitializer.ApplicationLifecycleMonitor
+import org.wordpress.android.support.BaseTest
+
+/**
+ * This tests if [ProcessLifecycleOwner] observer works at the app startup.
+ *
+ * [WordPress.appIsInTheBackground] is set to false when [ApplicationLifecycleMonitor.onAppComesFromBackground] is
+ * called.
+ */
+@HiltAndroidTest
+class AppInitializerTest : BaseTest() {
+    @Test
+    fun verifyOnAppComesFromBackgroundCalled() {
+        assertFalse(WordPress.appIsInTheBackground)
+    }
+}

WordPress/src/androidTest/java/org/wordpress/android/e2e/pages/MySitesPage.java

@@ -175,6 +175,7 @@ public void goToBackup() {
     public StatsPage goToStats() {
         goToMenuTab();
         clickQuickActionOrSiteMenuItem(R.id.quick_action_stats_button, R.string.stats);
+        idleFor(4000);
         dismissJetpackAdIfPresent();
         waitForElementToBeDisplayedWithoutFailure(R.id.tabLayout);
 

WordPress/src/jetpack/res/values/strings.xml

@@ -26,4 +26,7 @@
 
     <!-- About button in Me -->
     <string name="me_btn_about">About Jetpack</string>
+
+    <!-- My Site Initial Tab Default value -->
+    <string name="initial_screen_entry_value_default_key" translatable="false">@string/initial_screen_entry_value_home</string>
 </resources>

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/MySiteViewModel.kt

@@ -164,7 +164,7 @@ class MySiteViewModel @Inject constructor(
     private val quickStartTracker: QuickStartTracker,
     private val dispatcher: Dispatcher
 ) : ScopedViewModel(mainDispatcher) {
-    private var isDefaultABExperimentTabSet: Boolean = false
+    private var isDefaultTabSet: Boolean = false
     private val _onSnackbarMessage = MutableLiveData<Event<SnackbarMessageHolder>>()
     private val _onTechInputDialogShown = MutableLiveData<Event<TextInputDialogModel>>()
     private val _onBasicDialogShown = MutableLiveData<Event<SiteDialogModel>>()
@@ -209,9 +209,10 @@ class MySiteViewModel @Inject constructor(
             listOf(MySiteTabType.ALL)
         }
 
-    private val defaultABExperimentTab: MySiteTabType
+    private val defaultTab: MySiteTabType
         get() = if (isMySiteTabsEnabled) {
-            if (appPrefsWrapper.getMySiteInitialScreen() == MySiteTabType.SITE_MENU.label) {
+            if (appPrefsWrapper.getMySiteInitialScreen(buildConfigWrapper.isJetpackApp) ==
+                    MySiteTabType.SITE_MENU.label) {
                 MySiteTabType.SITE_MENU
             } else {
                 MySiteTabType.DASHBOARD
@@ -530,20 +531,20 @@ class MySiteViewModel @Inject constructor(
         _onNavigation.value = Event(SiteNavigationAction.OpenJetpackPoweredBottomSheet)
     }
 
-    private fun shouldEnableQuickLinkRibbonFocusPoints() = defaultABExperimentTab == MySiteTabType.DASHBOARD
+    private fun shouldEnableQuickLinkRibbonFocusPoints() = defaultTab == MySiteTabType.DASHBOARD
 
-    private fun shouldEnableSiteItemsFocusPoints() = defaultABExperimentTab != MySiteTabType.DASHBOARD
+    private fun shouldEnableSiteItemsFocusPoints() = defaultTab != MySiteTabType.DASHBOARD
 
     private fun getCardTypeExclusionFiltersForTab(tabType: MySiteTabType) = when (tabType) {
         MySiteTabType.SITE_MENU -> mutableListOf<Type>().apply {
             add(Type.DASHBOARD_CARDS)
-            if (defaultABExperimentTab == MySiteTabType.DASHBOARD) {
+            if (defaultTab == MySiteTabType.DASHBOARD) {
                 add(Type.QUICK_START_CARD)
             }
             add(Type.QUICK_LINK_RIBBON)
         }
         MySiteTabType.DASHBOARD -> mutableListOf<Type>().apply {
-            if (defaultABExperimentTab == MySiteTabType.SITE_MENU) {
+            if (defaultTab == MySiteTabType.SITE_MENU) {
                 add(Type.QUICK_START_CARD)
             }
             add(Type.DOMAIN_REGISTRATION_CARD)
@@ -553,8 +554,8 @@ class MySiteViewModel @Inject constructor(
     }
 
     private fun shouldIncludeDynamicCards(tabType: MySiteTabType) = when (tabType) {
-        MySiteTabType.SITE_MENU -> defaultABExperimentTab != MySiteTabType.DASHBOARD
-        MySiteTabType.DASHBOARD -> defaultABExperimentTab != MySiteTabType.SITE_MENU
+        MySiteTabType.SITE_MENU -> defaultTab != MySiteTabType.DASHBOARD
+        MySiteTabType.DASHBOARD -> defaultTab != MySiteTabType.SITE_MENU
         MySiteTabType.ALL -> true
     }
 
@@ -720,7 +721,7 @@ class MySiteViewModel @Inject constructor(
 
     private fun onQuickStartTaskTypeItemClick(type: QuickStartTaskType) {
         clearActiveQuickStartTask()
-        if (defaultABExperimentTab == MySiteTabType.DASHBOARD) {
+        if (defaultTab == MySiteTabType.DASHBOARD) {
             cardsTracker.trackQuickStartCardItemClicked(type)
         } else {
             quickStartTracker.track(Stat.QUICK_START_TAPPED, mapOf(TYPE to type.toString()))
@@ -1074,7 +1075,7 @@ class MySiteViewModel @Inject constructor(
     }
 
     fun onCreateSiteResult() {
-        isDefaultABExperimentTabSet = false
+        isDefaultTabSet = false
         selectDefaultTabIfNeeded()
     }
 
@@ -1269,9 +1270,9 @@ class MySiteViewModel @Inject constructor(
     @Suppress("NestedBlockDepth")
     private fun selectDefaultTabIfNeeded() {
         if (!isMySiteTabsEnabled) return
-        val index = orderedTabTypes.indexOf(defaultABExperimentTab)
+        val index = orderedTabTypes.indexOf(defaultTab)
         if (index != -1) {
-            if (isDefaultABExperimentTabSet) {
+            if (isDefaultTabSet) {
                 // This logic checks if the current default tab is the same as the tab
                 // set as initial screen, if yes then return
                 _selectTab.value?.let { tab ->
@@ -1281,7 +1282,7 @@ class MySiteViewModel @Inject constructor(
             }
             quickStartRepository.quickStartTaskOriginTab = orderedTabTypes[index]
             _selectTab.postValue(Event(TabNavigation(index, smoothAnimation = false)))
-            isDefaultABExperimentTabSet = true
+            isDefaultTabSet = true
         }
     }
 
@@ -1290,7 +1291,7 @@ class MySiteViewModel @Inject constructor(
                 .forEach { domainRegistrationCardShownTracker.trackShown(it.type) }
         siteSelected.cardAndItems.filterIsInstance<DashboardCards>().forEach { cardsTracker.trackShown(it) }
         siteSelected.cardAndItems.filterIsInstance<QuickStartCard>()
-                .firstOrNull()?.let { quickStartTracker.trackShown(it.type, defaultABExperimentTab) }
+                .firstOrNull()?.let { quickStartTracker.trackShown(it.type, defaultTab) }
         siteSelected.dashboardCardsAndItems.filterIsInstance<QuickStartCard>()
                 .firstOrNull()?.let { cardsTracker.trackQuickStartCardShown(quickStartRepository.quickStartType) }
     }