Merge branch 'trunk' into feat/CMM-872-support-HE-conversations-and-tickets-logic

Author: adalpari

.github/dependabot.yml

@@ -20,9 +20,6 @@ updates:
       # Gutenberg. As such, and as agreed, any update is paused. For more details, see
       # https://github.com/wordpress-mobile/WordPress-Android/pull/17936#issuecomment-1553227875
       - dependency-name: "com.google.android.exoplayer:exoplayer"
-      # Bumping 2.26.3 to 2.27.2 will break the mocks. For more details, see
-      # https://github.com/wiremock/wiremock/issues/1345#issuecomment-656060968
-      - dependency-name: "com.github.tomakehurst:wiremock"
       # List of React Native related dependencies that should be explicitly updated alongside a
       # React Native upgrade. For more details, see
       # https://github.com/wordpress-mobile/WordPress-Android/pull/18494#issuecomment-1566922244

WordPress/src/androidTest/java/org/wordpress/android/e2e/StatsTests.kt

@@ -13,11 +13,9 @@ import org.wordpress.android.e2e.pages.MySitesPage
 import org.wordpress.android.support.BaseTest
 import org.wordpress.android.support.ComposeEspressoLink
 import org.wordpress.android.support.WPSupportUtils
-import org.wordpress.android.wiremock.WireMockStub
-import org.wordpress.android.wiremock.WireMockUrlPath
 
 @HiltAndroidTest
-class StatsTests : BaseTest(listOf(WireMockStub(urlPath = WireMockUrlPath.FEATURE_RESPONSE, fileName = "new-stats-feature-response.json"))) {
+class StatsTests : BaseTest() {
     @Before
     fun setUp() {
         Assume.assumeTrue(BuildConfig.IS_JETPACK_APP)

WordPress/src/androidTest/java/org/wordpress/android/support/BaseTest.java

@@ -1,26 +1,15 @@
 package org.wordpress.android.support;
 
-import android.app.Instrumentation;
-import android.util.Log;
 
-import androidx.annotation.Nullable;
+import androidx.annotation.NonNull;
 import androidx.compose.ui.test.junit4.ComposeTestRule;
 import androidx.test.espresso.accessibility.AccessibilityChecks;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
-import androidx.test.platform.app.InstrumentationRegistry;
-
-import com.fasterxml.jackson.databind.util.ISO8601Utils;
-import com.github.jknack.handlebars.Helper;
-import com.github.jknack.handlebars.Options;
-import com.github.tomakehurst.wiremock.client.WireMock;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.ResponseTemplateTransformer;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.DateOffset;
-import com.github.tomakehurst.wiremock.extension.responsetemplating.helpers.HandlebarsHelper;
-import com.github.tomakehurst.wiremock.junit.WireMockRule;
+
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult;
 import com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResult.AccessibilityCheckResultType;
+import com.google.gson.internal.bind.util.ISO8601Utils;
 
-import org.apache.commons.lang3.LocaleUtils;
 import org.hamcrest.Matcher;
 import org.hamcrest.Matchers;
 import org.junit.Before;
@@ -31,25 +20,17 @@
 import org.wordpress.android.e2e.flows.LoginFlow;
 import org.wordpress.android.e2e.pages.MePage;
 import org.wordpress.android.e2e.pages.MySitesPage;
-import org.wordpress.android.editor.Utils;
-import org.wordpress.android.mocks.AndroidNotifier;
-import org.wordpress.android.mocks.AssetFileSource;
 import org.wordpress.android.rules.RetryTestRule;
 import org.wordpress.android.ui.WPLaunchActivity;
-import org.wordpress.android.wiremock.WireMockStub;
 
-import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Locale;
 import java.util.TimeZone;
 
 import dagger.hilt.android.testing.HiltAndroidRule;
 
 import static androidx.compose.ui.test.junit4.AndroidComposeTestRule_androidKt.createComposeRule;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static com.google.android.apps.common.testing.accessibility.framework.AccessibilityCheckResultUtils.matchesTypes;
 import static org.hamcrest.Matchers.anyOf;
 import static org.hamcrest.Matchers.is;
@@ -60,7 +41,6 @@
 
 public class BaseTest {
     static final String TAG = BaseTest.class.getSimpleName();
-    public static final int WIREMOCK_PORT = 8080;
 
     @Rule(order = 0)
     public HiltAndroidRule mHiltRule = new HiltAndroidRule(this);
@@ -76,52 +56,8 @@ public class BaseTest {
             = new ActivityScenarioRule<>(WPLaunchActivity.class);
 
     @Rule(order = 4)
-    public WireMockRule wireMockRule;
-
-    @Rule(order = 5)
     public RetryTestRule retryTestRule = new RetryTestRule();
 
-    public BaseTest() {
-        this(null);
-    }
-
-    /**
-     * Constructor
-     *
-     * @param wireMockStubs the wiremock stubs to use for this specific test.
-     */
-    public BaseTest(@Nullable final List<WireMockStub> wireMockStubs) {
-        Instrumentation instrumentation = InstrumentationRegistry.getInstrumentation();
-        wireMockRule = new WireMockRule(
-                options().port(WIREMOCK_PORT)
-                         .fileSource(
-                             new AssetFileSource(instrumentation.getContext().getAssets())
-                         )
-
-                         .extensions(new ResponseTemplateTransformer(true, new HashMap<String, Helper>() {
-                             {
-                                 put("fnow", new UnlocalizedDateHelper());
-                             }
-                         }))
-                         .notifier(new AndroidNotifier()));
-        if (wireMockStubs != null && !wireMockStubs.isEmpty()) {
-            for (WireMockStub wireMockStub : wireMockStubs) {
-                try {
-                    final String result = Utils.getStringFromInputStream(
-                            instrumentation.getContext().getClassLoader().getResourceAsStream(
-                                    wireMockStub.getFileName()
-                            )
-                    );
-                    // This is where we can stub out
-                    wireMockRule.stubFor(WireMock.get(WireMock.urlPathMatching(wireMockStub.getUrlPath().getPath()))
-                                                 .willReturn(WireMock.aResponse().withBody(result)));
-                } catch (final Exception exception) {
-                    Log.e(TAG, "Problem stubbing endpoint", exception);
-                }
-            }
-        }
-    }
-
     @Before
     public void setup() {
         Matcher<? super AccessibilityCheckResult> nonErrorLevelMatcher =
@@ -172,27 +108,6 @@ private void wpLogout() {
     }
 }
 
-class UnlocalizedDateHelper extends HandlebarsHelper<Object> {
-    @Override public Object apply(Object context, Options options) throws IOException {
-        String format = options.hash("format", null);
-        String offset = options.hash("offset", null);
-        String timezone = options.hash("timezone", null);
-        String localeCode = options.hash("locale", "en_US_POSIX");
-
-        Date date = new Date();
-        if (offset != null) {
-            date = new DateOffset(offset).shift(date);
-        }
-
-        Locale locale = Locale.getDefault();
-        if (localeCode != null) {
-            locale = LocaleUtils.toLocale(localeCode);
-        }
-
-        return new LocaleAwareRenderableDate(date, format, timezone, locale);
-    }
-}
-
 class LocaleAwareRenderableDate {
     private static final long DIVIDE_MILLISECONDS_TO_SECONDS = 1000L;
 
@@ -208,7 +123,7 @@ class LocaleAwareRenderableDate {
         this.mLocale = locale;
     }
 
-    @Override
+    @NonNull @Override
     public String toString() {
         if (mFormat != null) {
             if (mFormat.equals("epoch")) {

WordPress/src/androidTest/java/org/wordpress/android/support/MockingInterceptor.kt

@@ -16,7 +16,6 @@ class MockingInterceptor : Interceptor {
             val newUrl = request.url.newBuilder()
                 .scheme("http")
                 .host("localhost")
-                .port(BaseTest.WIREMOCK_PORT)
                 .build()
             val newRequest = request.newBuilder()
                 .url(newUrl)

WordPress/src/androidTest/java/org/wordpress/android/util/StatsMocksReader.kt

@@ -8,8 +8,7 @@ class StatsMocksReader {
             MutableList<StatsKeyValueData> {
         val todayMarker = "{{now format='yyyy-MM-dd'}}"
         val readString = this.readAssetsFile("mocks/mappings/wpcom/stats/$fileName.json")
-        val wireMockJSON = JSONObject(readString)
-        val arrayRaw = wireMockJSON
+        val arrayRaw = JSONObject(readString)
             .getJSONObject("response")
             .getJSONObject("jsonBody")
             .getJSONObject("days")

WordPress/src/androidTest/java/org/wordpress/android/wiremock/WireMockStub.kt

@@ -22,7 +22,7 @@
 import java.io.OutputStream;
 
 public class WordPressDB {
-    private static final int DATABASE_VERSION = 69;
+    private static final int DATABASE_VERSION = 70;
 
 
     // Warning renaming DATABASE_NAME could break previous App backups (see: xml/backup_scheme.xml)
@@ -184,6 +184,9 @@ public WordPressDB(Context ctx) {
                 // so the table creation depended on that screen being opened. Now that we need this table in other
                 // places, we have to be sure the table exists even if PublicizeListActivity was never opened.
                 PublicizeTable.createTables(mDb);
+            case 69:
+                // add editor theme styles site setting
+                mDb.execSQL(SiteSettingsModel.ADD_USE_THEME_STYLES);
         }
         mDb.setVersion(DATABASE_VERSION);
     }

WordPress/src/main/java/org/wordpress/android/WordPressDB.java

@@ -69,6 +69,7 @@ public class SiteSettingsModel {
     private static final String AMP_ENABLED_COLUMN_NAME = "ampEnabled";
     private static final String JETPACK_SEARCH_SUPPORTED_COLUMN_NAME = "jetpackSearchSupported";
     private static final String JETPACK_SEARCH_ENABLED_COLUMN_NAME = "jetpackSearchEnabled";
+    private static final String USE_THEME_STYLES_COLUMN_NAME = "useThemeStyles";
 
     public static final String SETTINGS_TABLE_NAME = "site_settings";
 
@@ -104,6 +105,8 @@ public class SiteSettingsModel {
                                                    + " add " + JETPACK_SEARCH_SUPPORTED_COLUMN_NAME + " BOOLEAN;";
     public static final String ADD_SITE_ICON = "alter table " + SETTINGS_TABLE_NAME
                                                + " add " + SITE_ICON_COLUMN_NAME + " INTEGER;";
+    public static final String ADD_USE_THEME_STYLES = "alter table " + SETTINGS_TABLE_NAME
+                                                      + " add " + USE_THEME_STYLES_COLUMN_NAME + " BOOLEAN DEFAULT 1;";
 
     public static final String CREATE_SETTINGS_TABLE_SQL =
             "CREATE TABLE IF NOT EXISTS "
@@ -194,6 +197,7 @@ public class SiteSettingsModel {
     public boolean ampEnabled;
     public boolean jetpackSearchSupported;
     public boolean jetpackSearchEnabled;
+    public boolean useThemeStyles = true;
     public String quotaDiskSpace;
 
     @Override
@@ -238,6 +242,7 @@ && equals(timezone, otherModel.timezone)
                && ampSupported == otherModel.ampSupported
                && jetpackSearchEnabled == otherModel.jetpackSearchEnabled
                && jetpackSearchSupported == otherModel.jetpackSearchSupported
+               && useThemeStyles == otherModel.useThemeStyles
                && maxLinks == otherModel.maxLinks
                && equals(defaultPostFormat, otherModel.defaultPostFormat)
                && holdForModeration != null
@@ -303,6 +308,7 @@ public void copyFrom(SiteSettingsModel other) {
         ampEnabled = other.ampEnabled;
         jetpackSearchSupported = other.jetpackSearchSupported;
         jetpackSearchEnabled = other.jetpackSearchEnabled;
+        useThemeStyles = other.useThemeStyles;
         if (other.holdForModeration != null) {
             holdForModeration = new ArrayList<>(other.holdForModeration);
         }
@@ -367,6 +373,7 @@ public void deserializeOptionsDatabaseCursor(Cursor cursor, SparseArrayCompat<Ca
         ampEnabled = getBooleanFromCursor(cursor, AMP_ENABLED_COLUMN_NAME);
         jetpackSearchSupported = getBooleanFromCursor(cursor, JETPACK_SEARCH_SUPPORTED_COLUMN_NAME);
         jetpackSearchEnabled = getBooleanFromCursor(cursor, JETPACK_SEARCH_ENABLED_COLUMN_NAME);
+        useThemeStyles = getBooleanFromCursor(cursor, USE_THEME_STYLES_COLUMN_NAME);
 
         String moderationKeys = getStringFromCursor(cursor, MODERATION_KEYS_COLUMN_NAME);
         String denylistKeys = getStringFromCursor(cursor, DENYLIST_KEYS_COLUMN_NAME);
@@ -459,6 +466,7 @@ public ContentValues serializeToDatabase() {
         values.put(AMP_ENABLED_COLUMN_NAME, ampEnabled);
         values.put(JETPACK_SEARCH_SUPPORTED_COLUMN_NAME, jetpackSearchSupported);
         values.put(JETPACK_SEARCH_ENABLED_COLUMN_NAME, jetpackSearchEnabled);
+        values.put(USE_THEME_STYLES_COLUMN_NAME, useThemeStyles);
 
         StringBuilder moderationKeys = new StringBuilder();
         if (holdForModeration != null) {

WordPress/src/main/java/org/wordpress/android/models/SiteSettingsModel.java

@@ -171,10 +171,8 @@ import org.wordpress.android.ui.posts.reactnative.ReactNativeRequestHandler
 import org.wordpress.android.ui.posts.sharemessage.EditJetpackSocialShareMessageActivity
 import org.wordpress.android.ui.posts.sharemessage.EditJetpackSocialShareMessageActivity.Companion.createIntent
 import org.wordpress.android.ui.prefs.AppPrefs
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 import org.wordpress.android.ui.prefs.SiteSettingsInterface
 import org.wordpress.android.ui.prefs.SiteSettingsInterface.SiteSettingsListener
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
 import org.wordpress.android.ui.reader.utils.ReaderUtilsWrapper
 import org.wordpress.android.ui.suggestion.SuggestionActivity
 import org.wordpress.android.ui.suggestion.SuggestionType
@@ -210,7 +208,6 @@ import org.wordpress.android.util.analytics.AnalyticsTrackerWrapper
 import org.wordpress.android.util.analytics.AnalyticsUtils
 import org.wordpress.android.util.analytics.AnalyticsUtils.BlockEditorEnabledSource
 import org.wordpress.android.util.config.ContactSupportFeatureConfig
-import org.wordpress.android.util.config.GutenbergKitFeature
 import org.wordpress.android.util.config.GutenbergKitPluginsFeature
 import org.wordpress.android.util.config.PostConflictResolutionFeatureConfig
 import org.wordpress.android.util.extensions.setLiftOnScrollTargetViewIdAndRequestLayout
@@ -380,9 +377,7 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
 
     @Inject lateinit var postConflictResolutionFeatureConfig: PostConflictResolutionFeatureConfig
 
-    @Inject lateinit var gutenbergKitFeature: GutenbergKitFeature
     @Inject lateinit var gutenbergKitPluginsFeature: GutenbergKitPluginsFeature
-    @Inject lateinit var experimentalFeatures: ExperimentalFeatures
 
     @Inject lateinit var activityNavigator: ActivityNavigator
 
@@ -2309,9 +2304,7 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
 
             val featureConfig = GutenbergKitSettingsBuilder.FeatureConfig(
                 isPluginsFeatureEnabled = gutenbergKitPluginsFeature.isEnabled(),
-                isThemeStylesFeatureEnabled = experimentalFeatures.isEnabled(
-                    Feature.EXPERIMENTAL_BLOCK_EDITOR_THEME_STYLES
-                )
+                isThemeStylesFeatureEnabled = siteSettings?.useThemeStyles ?: true
             )
 
             val appConfig = GutenbergKitSettingsBuilder.AppConfig(

WordPress/src/main/java/org/wordpress/android/ui/posts/GutenbergKitActivity.kt

@@ -8,8 +8,6 @@ import org.wordpress.android.fluxc.model.SiteModel
 import org.wordpress.android.fluxc.network.UserAgent
 import org.wordpress.android.fluxc.store.AccountStore
 import org.wordpress.android.modules.BG_THREAD
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures
-import org.wordpress.android.ui.prefs.experimentalfeatures.ExperimentalFeatures.Feature
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.AppLog.T
 import org.wordpress.android.util.PerAppLocaleManager
@@ -33,7 +31,6 @@ class GutenbergKitWarmupHelper @Inject constructor(
     private val perAppLocaleManager: PerAppLocaleManager,
     private val gutenbergKitFeatureChecker: GutenbergKitFeatureChecker,
     private val gutenbergKitPluginsFeature: GutenbergKitPluginsFeature,
-    private val experimentalFeatures: ExperimentalFeatures,
     @Named(BG_THREAD) private val bgDispatcher: CoroutineDispatcher
 ) {
     private var lastWarmedUpSiteId: Long? = null
@@ -141,9 +138,8 @@ class GutenbergKitWarmupHelper @Inject constructor(
 
         val featureConfig = GutenbergKitSettingsBuilder.FeatureConfig(
             isPluginsFeatureEnabled = gutenbergKitPluginsFeature.isEnabled(),
-            isThemeStylesFeatureEnabled = experimentalFeatures.isEnabled(
-                Feature.EXPERIMENTAL_BLOCK_EDITOR_THEME_STYLES
-            )
+            // Default to true during warmup; actual value will be used when editor launches
+            isThemeStylesFeatureEnabled = true
         )
 
         val settings = GutenbergKitSettingsBuilder.buildSettings(