Gutenberg Android X migration (#10020)

Author: marecar3

WordPress/build.gradle

@@ -62,12 +62,10 @@ android {
     }
 
     // Gutenberg's dependency - react-native-video is using
-    // Java API 1.8 so we need this when building from source
-    if (rootProject.ext.buildGutenbergFromSource) {
-        compileOptions {
-            sourceCompatibility JavaVersion.VERSION_1_8
-            targetCompatibility JavaVersion.VERSION_1_8
-        }
+    // Java API 1.8
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 
     flavorDimensions "buildType"

WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt

@@ -57,6 +57,7 @@ class SiteCreationDomainsViewModel @Inject constructor(
         get() = bgDispatcher + job
     private var isStarted = false
     private var segmentId by Delegates.notNull<Long>()
+    private var siteTitle: String? = null
 
     private val _uiState: MutableLiveData<DomainsUiState> = MutableLiveData()
     val uiState: LiveData<DomainsUiState> = _uiState
@@ -92,6 +93,7 @@ class SiteCreationDomainsViewModel @Inject constructor(
             return
         }
         this.segmentId = segmentId
+        this.siteTitle = siteTitle
         isStarted = true
         tracker.trackDomainsAccessed()
         // isNullOrBlank not smart-casting for some reason..
@@ -119,7 +121,12 @@ class SiteCreationDomainsViewModel @Inject constructor(
     }
 
     fun updateQuery(query: String) {
-        updateQueryInternal(UserQuery(query))
+        val siteTitle: String? = this.siteTitle
+        if (query.isBlank() && !siteTitle.isNullOrBlank()) {
+            updateQueryInternal(TitleQuery(siteTitle))
+        } else {
+            updateQueryInternal(UserQuery(query))
+        }
     }
 
     private fun updateQueryInternal(query: DomainSuggestionsQuery?) {

WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt

@@ -3,6 +3,7 @@ package org.wordpress.android.ui.sitecreation.domains
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.lifecycle.Observer
 import com.nhaarman.mockitokotlin2.firstValue
+import com.nhaarman.mockitokotlin2.lastValue
 import com.nhaarman.mockitokotlin2.secondValue
 import com.nhaarman.mockitokotlin2.thirdValue
 import com.nhaarman.mockitokotlin2.times
@@ -193,6 +194,34 @@ class SiteCreationDomainsViewModelTest {
         )
     }
 
+    /**
+     * Verifies the UI state after the user enters an empty query (presses clear button) with a non-empty site title
+     * which results in multiple domain suggestions.
+     */
+    @Test
+    fun verifyClearQueryWithNonEmptyTitleUiStateAfterResponseWithMultipleResults() = testWithSuccessResponse {
+        viewModel.start(MULTI_RESULT_DOMAIN_FETCH_QUERY.first, SEGMENT_ID)
+        viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
+        viewModel.updateQuery("")
+        val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
+        verify(uiStateObserver, times(6)).onChanged(captor.capture())
+        verifyVisibleItemsContentUiState(captor.lastValue, false, 20)
+    }
+
+    /**
+     * Verifies the UI state after the user enters an empty query (presses clear button) with an empty site title
+     * which results in initial UI state
+     */
+    @Test
+    fun verifyClearQueryWithEmptyTitleInitialState() = testWithSuccessResponse {
+        viewModel.start(null, SEGMENT_ID)
+        viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first)
+        viewModel.updateQuery("")
+        val captor = ArgumentCaptor.forClass(DomainsUiState::class.java)
+        verify(uiStateObserver, times(4)).onChanged(captor.capture())
+        verifyInitialContentUiState(captor.lastValue)
+    }
+
     /**
      * Verifies that help button is properly propagated.
      */

build.gradle

@@ -48,7 +48,7 @@ allprojects {
 
     configurations.all {
         resolutionStrategy {
-            force 'org.webkit:android-jsc:r224109'
+            force 'org.webkit:android-jsc:r241213'
         }
     }
 

libs/editor/WordPressEditor/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
 
     ext {
-        aztecVersion = 'v1.3.27'
+        aztecVersion = 'v1.3.28'
     }
 
     repositories {

libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java

@@ -32,7 +32,6 @@
 import androidx.lifecycle.LiveData;
 
 import com.android.volley.toolbox.ImageLoader;
-import com.facebook.react.bridge.ReadableArray;
 
 import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
@@ -271,7 +270,7 @@ public void onQueryCurrentProgressForUploadingMedia() {
                 },
                 new OnEditorMountListener() {
                     @Override
-                    public void onEditorDidMount(ReadableArray unsupportedBlocks) {
+                    public void onEditorDidMount(ArrayList<Object> unsupportedBlocks) {
                         mEditorDidMount = true;
                         mEditorFragmentListener.onEditorFragmentContentReady(unsupportedBlocks.size() > 0);