From 71442867d145120256c93bc2fb11334a0ad8d64b Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 12:04:44 -0400 Subject: [PATCH 01/36] Point to gutenberg mobile android x migraiton --- libs/editor/WordPressEditor/build.gradle | 2 +- libs/gutenberg-mobile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 617765bdb60c..42f18c2fa730 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - aztecVersion = 'v1.3.27' + aztecVersion = '794497db64e63a5751265f484ea07a2fa5d0b0d0' } repositories { diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index fe34c2c609a0..5e198e3ac6e3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit fe34c2c609a04ca2f0d9a519bc434ad30a5b1ce6 +Subproject commit 5e198e3ac6e3889659dfa1ea35dd811146406b7f From 2f982bf8f98b423f3dcd767e47fa6a2e2ecbc9b6 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 15:53:39 -0400 Subject: [PATCH 02/36] Remove force resolutionStrategy for org.webkit:android-jsc as it's not needed for RN60 add packingOptions as we can't build without it --- WordPress/build.gradle | 7 +++++++ build.gradle | 6 ------ libs/gutenberg-mobile | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index c0f2184f0f3f..28cea9427501 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -71,6 +71,13 @@ android { } } + // We need specific packagingOptions in order to build the + // Gutenberg with newest jsc-android dependency(241213.1.0) + packagingOptions { + pickFirst '**/libjsc.so' + pickFirst '**/libc++_shared.so' + } + flavorDimensions "buildType" productFlavors { diff --git a/build.gradle b/build.gradle index d4e5c7fd42db..34b7aa045bce 100644 --- a/build.gradle +++ b/build.gradle @@ -46,12 +46,6 @@ allprojects { } } - configurations.all { - resolutionStrategy { - force 'org.webkit:android-jsc:r224109' - } - } - task checkstyle(type: Checkstyle) { source 'src' diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 5e198e3ac6e3..defb50bc0178 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 5e198e3ac6e3889659dfa1ea35dd811146406b7f +Subproject commit defb50bc0178a1d54f1243a639a90d11ef260b0f From ea6d830b5702ac316cfdfd77da7a612b399619c1 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 16:48:05 -0400 Subject: [PATCH 03/36] Update gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index defb50bc0178..a3cab39422e0 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit defb50bc0178a1d54f1243a639a90d11ef260b0f +Subproject commit a3cab39422e0900c6566b56d7e5d1cb7117f9515 From 20e1019c32fad8caa60c36fd13a11f2dfd13ecf7 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 17:22:28 -0400 Subject: [PATCH 04/36] Point to the latest aztec ref Point to the latest gutenberg mobile ref --- libs/editor/WordPressEditor/build.gradle | 2 +- libs/gutenberg-mobile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 42f18c2fa730..dcffd3d66208 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - aztecVersion = '794497db64e63a5751265f484ea07a2fa5d0b0d0' + aztecVersion = 'd5a3dfec60987a8ff0b8717bd204390b6e42d0bd' } repositories { diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index a3cab39422e0..cdd7e982c91b 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit a3cab39422e0900c6566b56d7e5d1cb7117f9515 +Subproject commit cdd7e982c91b3f76181032ec6887693d6c84c37a From 1d88e61fdbf003af87cb6607e6b1cbfd1f0707ef Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 18:42:33 -0400 Subject: [PATCH 05/36] Update gutenberg mobile reference --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index cdd7e982c91b..cc8eaed8c9a7 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit cdd7e982c91b3f76181032ec6887693d6c84c37a +Subproject commit cc8eaed8c9a719332a224826c9612542a693284a From 365bec5df46c7f81ffa86d67951d1818f73f461c Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 18:55:46 -0400 Subject: [PATCH 06/36] Update gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index cc8eaed8c9a7..09b12556ba3f 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit cc8eaed8c9a719332a224826c9612542a693284a +Subproject commit 09b12556ba3fe062a13f58dc9353d08d2525fd54 From ce6cf7e9269c695c75062c142bc554e24e2df2f1 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 19:11:53 -0400 Subject: [PATCH 07/36] Update gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 09b12556ba3f..957994498e37 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 09b12556ba3fe062a13f58dc9353d08d2525fd54 +Subproject commit 957994498e37a80126269d3d49fc0b682fe17129 From b62137cbe8d4144f495690fa1c9b4542389cf118 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 10 Jun 2019 19:22:27 -0400 Subject: [PATCH 08/36] Updated gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 957994498e37..f9aba409dfa5 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 957994498e37a80126269d3d49fc0b682fe17129 +Subproject commit f9aba409dfa5017d49fb41677650fde4b5f92d14 From f10d7d1738b3e61dead3654efd63c51d567f96ff Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 17:18:13 -0400 Subject: [PATCH 09/36] Force android-jsc:r241213 Rollback aztecVersion to 1.3.27 Remove packagingOptions from build.gradle --- WordPress/build.gradle | 7 ------- build.gradle | 6 ++++++ libs/editor/WordPressEditor/build.gradle | 2 +- libs/gutenberg-mobile | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index 02736cfaa5d6..dca449a66707 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -71,13 +71,6 @@ android { } } - // We need specific packagingOptions in order to build the - // Gutenberg with newest jsc-android dependency(241213.1.0) - packagingOptions { - pickFirst '**/libjsc.so' - pickFirst '**/libc++_shared.so' - } - flavorDimensions "buildType" productFlavors { diff --git a/build.gradle b/build.gradle index 931ee446fabd..3385f78b0ca3 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,12 @@ allprojects { } } + configurations.all { + resolutionStrategy { + force 'org.webkit:android-jsc:r241213' + } + } + task checkstyle(type: Checkstyle) { source 'src' diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index dcffd3d66208..617765bdb60c 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - aztecVersion = 'd5a3dfec60987a8ff0b8717bd204390b6e42d0bd' + aztecVersion = 'v1.3.27' } repositories { diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index f9aba409dfa5..7d8f0e97546e 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit f9aba409dfa5017d49fb41677650fde4b5f92d14 +Subproject commit 7d8f0e97546e1ec61d68fe1df26e676ca1dac9de From 813480cc524b39f596d94b4bc2c3ccab956f4852 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 17:48:10 -0400 Subject: [PATCH 10/36] Update gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 7d8f0e97546e..116fb5f3fdd3 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 7d8f0e97546e1ec61d68fe1df26e676ca1dac9de +Subproject commit 116fb5f3fdd35fba5f8fa1e1d4528e6e40ba4ecf From 671b1ab7883c0bd528f394be6f5098d2e3ecdb3d Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 14 Jun 2019 18:06:01 -0400 Subject: [PATCH 11/36] Point to the latest gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 116fb5f3fdd3..82de3b63811a 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 116fb5f3fdd35fba5f8fa1e1d4528e6e40ba4ecf +Subproject commit 82de3b63811a35ae9f56f3bb1018bbffddeef41f From 27b164225ef6a32d299714c0cfefd443fa6c5714 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 17 Jun 2019 10:34:49 -0400 Subject: [PATCH 12/36] Updated gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 82de3b63811a..0c8622e7a15c 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 82de3b63811a35ae9f56f3bb1018bbffddeef41f +Subproject commit 0c8622e7a15ca1fe7795aeaab256c3b127bf71ec From cb8b3a8e57e8a6b68cf69a4124aec70550cf6315 Mon Sep 17 00:00:00 2001 From: James Treanor Date: Tue, 18 Jun 2019 09:25:14 +0100 Subject: [PATCH 13/36] Gutenberg/Android X: Apply Java 1.8 compileOptions even when building from binaries --- WordPress/build.gradle | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/WordPress/build.gradle b/WordPress/build.gradle index e5318b1b31b4..401b661dfff4 100644 --- a/WordPress/build.gradle +++ b/WordPress/build.gradle @@ -63,12 +63,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" From 13239a0c5fe6be861ca5bff4c0621739adc58595 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 18 Jun 2019 10:55:43 -0400 Subject: [PATCH 14/36] Updated gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 0c8622e7a15c..0c0e44548625 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 0c8622e7a15ca1fe7795aeaab256c3b127bf71ec +Subproject commit 0c0e44548625f29ba97ef11cdfb3a0092bdeac0e From 10cd05b2e918dee6f0d9e6836e8abc29f7f38d97 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Thu, 20 Jun 2019 12:14:12 -0400 Subject: [PATCH 15/36] Update gutenberg-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 0c0e44548625..e904262debcb 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 0c0e44548625f29ba97ef11cdfb3a0092bdeac0e +Subproject commit e904262debcb449f4b418cc0cbb90eb78d5b29cc From 8833238ce5ba5480b3564623afd019ec0561ae2c Mon Sep 17 00:00:00 2001 From: Danilo Ercoli Date: Fri, 21 Jun 2019 14:01:51 +0200 Subject: [PATCH 16/36] Update GB-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index e904262debcb..f9a71f5dbdaa 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit e904262debcb449f4b418cc0cbb90eb78d5b29cc +Subproject commit f9a71f5dbdaa61d1d00ef41a266caa33cdbe3a5c From 21ba3f54b8b0e96e37b7015643225227e667e85a Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 21 Jun 2019 11:04:03 -0400 Subject: [PATCH 17/36] Updated gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index f9a71f5dbdaa..c387c0c9c5d7 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit f9a71f5dbdaa61d1d00ef41a266caa33cdbe3a5c +Subproject commit c387c0c9c5d7a7caa8df917dc01a7ec9e446657a From 60e2a48556fec0e39cbcd48966200f9a21ab82db Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 21 Jun 2019 23:03:56 -0400 Subject: [PATCH 18/36] Updated gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index c387c0c9c5d7..5e14eba86ef5 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit c387c0c9c5d7a7caa8df917dc01a7ec9e446657a +Subproject commit 5e14eba86ef5183ac93bebe927df566def51dcd4 From 4647b17791115f55ca7ff62e3360917e5e000f87 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Tue, 25 Jun 2019 11:53:05 -0400 Subject: [PATCH 19/36] Update gb-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 5e14eba86ef5..48aa34da4a1b 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 5e14eba86ef5183ac93bebe927df566def51dcd4 +Subproject commit 48aa34da4a1b5c3f82b8154d2ae06a18a2f9467f From c3e46204a1cad8aef6ca31a83bcd4f45bba904cd Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 26 Jun 2019 11:27:22 -0400 Subject: [PATCH 20/36] Update gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 48aa34da4a1b..9dc16d6f5f3a 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 48aa34da4a1b5c3f82b8154d2ae06a18a2f9467f +Subproject commit 9dc16d6f5f3adb0b728f59e183728fde78a85132 From d84a48f9f8ca192c750d3fef2b89d16648b95693 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 28 Jun 2019 10:32:30 -0400 Subject: [PATCH 21/36] Update gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 9dc16d6f5f3a..14c952b446d9 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 9dc16d6f5f3adb0b728f59e183728fde78a85132 +Subproject commit 14c952b446d91fbf24a024d09336302b66fb6b85 From 82a81f207cfe4b578cc0f3bcb402c545a64c8e6f Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Fri, 5 Jul 2019 11:28:39 -0400 Subject: [PATCH 22/36] Update gb mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 40091e2379e9..3c91f406f299 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 40091e2379e9164935e29a9ec926e9cf48002597 +Subproject commit 3c91f406f2997efb174fa38c7329b8d0f24ff7a0 From 2025e75156f401d5a24ce01af109590dc5ccf192 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 8 Jul 2019 11:00:10 -0400 Subject: [PATCH 23/36] Updated gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 3c91f406f299..7445cc3d9315 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 3c91f406f2997efb174fa38c7329b8d0f24ff7a0 +Subproject commit 7445cc3d93158cf4d97d608894f4b229967ddb43 From d5738263e83ab43d0707bc7a0a512082a7bbc9b0 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 8 Jul 2019 13:10:32 -0400 Subject: [PATCH 24/36] Updated release notes --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index fd5e9fd24741..bb7efcb05b75 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,5 +1,6 @@ 12.9 ----- +* Block Editor: Video block is now available in the Inserter 12.8 ----- From f17d2584cb31ec1d566ee148321e6c5f4b46a284 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Mon, 8 Jul 2019 13:40:05 -0400 Subject: [PATCH 25/36] Update gutenberg mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 7445cc3d9315..c9ad20f4dc15 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 7445cc3d93158cf4d97d608894f4b229967ddb43 +Subproject commit c9ad20f4dc158726656f849b2071fa5f17099ade From 4592ba40d7f06b2035fba674032d2a0b01c33486 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jul 2019 00:04:43 -0700 Subject: [PATCH 26/36] Added mutable siteTitle field to use for refreshing title domain search when user query is cleared --- .../sitecreation/domains/SiteCreationDomainsViewModel.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt b/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt index 826891d82798..4696404527cf 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModel.kt +++ b/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() + private var siteTitle: String? = null private val _uiState: MutableLiveData = MutableLiveData() val uiState: LiveData = _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?) { From ab306a3cb68a22ee043e34942b8a1ffb1b0138c9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jul 2019 00:05:44 -0700 Subject: [PATCH 27/36] Added tests for domain results after clear button is pressed --- .../SiteCreationDomainsViewModelTest.kt | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt index fc9635e4a603..89413c07d04d 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt +++ b/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. */ From 8f1dc24d14b26473368c21cb846d0f33db64b646 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 9 Jul 2019 12:08:23 -0700 Subject: [PATCH 28/36] Removed semicolons, fixed ktlint check --- .../sitecreation/domains/SiteCreationDomainsViewModelTest.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt index 89413c07d04d..cb564e184ca7 100644 --- a/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt +++ b/WordPress/src/test/java/org/wordpress/android/ui/sitecreation/domains/SiteCreationDomainsViewModelTest.kt @@ -202,7 +202,7 @@ class SiteCreationDomainsViewModelTest { fun verifyClearQueryWithNonEmptyTitleUiStateAfterResponseWithMultipleResults() = testWithSuccessResponse { viewModel.start(MULTI_RESULT_DOMAIN_FETCH_QUERY.first, SEGMENT_ID) viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first) - viewModel.updateQuery(""); + viewModel.updateQuery("") val captor = ArgumentCaptor.forClass(DomainsUiState::class.java) verify(uiStateObserver, times(6)).onChanged(captor.capture()) verifyVisibleItemsContentUiState(captor.lastValue, false, 20) @@ -216,7 +216,7 @@ class SiteCreationDomainsViewModelTest { fun verifyClearQueryWithEmptyTitleInitialState() = testWithSuccessResponse { viewModel.start(null, SEGMENT_ID) viewModel.updateQuery(MULTI_RESULT_DOMAIN_FETCH_QUERY.first) - viewModel.updateQuery(""); + viewModel.updateQuery("") val captor = ArgumentCaptor.forClass(DomainsUiState::class.java) verify(uiStateObserver, times(4)).onChanged(captor.capture()) verifyInitialContentUiState(captor.lastValue) From 7f118dd6e80c11be1986ff27f540e44f397eaa8b Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 12:09:04 +0300 Subject: [PATCH 29/36] Update gb-mobile ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index c9ad20f4dc15..a1b834dece29 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit c9ad20f4dc158726656f849b2071fa5f17099ade +Subproject commit a1b834dece290c5d28e80cc264d94642095b25e1 From fa7412c76b01fcde91aa5e8502dc82169ac17a1e Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 12:09:12 +0300 Subject: [PATCH 30/36] Update Aztec hash --- libs/editor/WordPressEditor/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 617765bdb60c..40a14111f91a 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - aztecVersion = 'v1.3.27' + aztecVersion = 'f80c55aa45d6ec5c045016e3c9e8c8e9e1bbc3ad' } repositories { From ca80c116ca86601df8fde320f4490ddec065c3a6 Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 13:38:20 +0300 Subject: [PATCH 31/36] Update gb-mobile hash --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index a1b834dece29..1d8b65895bfe 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit a1b834dece290c5d28e80cc264d94642095b25e1 +Subproject commit 1d8b65895bfecce5457b957f8bd32fe57b560749 From c63e1e73eb62f7d973dd34ab789fe259e087374b Mon Sep 17 00:00:00 2001 From: Stefanos Togkoulidis Date: Wed, 10 Jul 2019 15:00:16 +0300 Subject: [PATCH 32/36] Update gb-mobile ref, don't use React classes --- .../org/wordpress/android/editor/GutenbergEditorFragment.java | 3 +-- libs/gutenberg-mobile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java b/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java index afab3d1f8ce1..d40ad3633989 100644 --- a/libs/editor/WordPressEditor/src/main/java/org/wordpress/android/editor/GutenbergEditorFragment.java +++ b/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 unsupportedBlocks) { mEditorDidMount = true; mEditorFragmentListener.onEditorFragmentContentReady(unsupportedBlocks.size() > 0); diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 1d8b65895bfe..4107bf6e0166 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 1d8b65895bfecce5457b957f8bd32fe57b560749 +Subproject commit 4107bf6e016660445289add2dee82f4b16ade9bf From a0c572185e2af06f669a0a1e694edf42bbe66875 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 11:23:38 -0400 Subject: [PATCH 33/36] Revert "Updated release notes" This reverts commit d5738263e83ab43d0707bc7a0a512082a7bbc9b0. --- RELEASE-NOTES.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index bb7efcb05b75..fd5e9fd24741 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -1,6 +1,5 @@ 12.9 ----- -* Block Editor: Video block is now available in the Inserter 12.8 ----- From 07c301aabe4d17b6efbca9dcd2dbfa8f32888136 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 11:39:32 -0400 Subject: [PATCH 34/36] Update gutenberg ref --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index 4107bf6e0166..b0a7b8552511 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit 4107bf6e016660445289add2dee82f4b16ade9bf +Subproject commit b0a7b855251104f211336a36463a9de2f7ba24e6 From 68c66eda812d8f69367d7c0204f3d805b06b8504 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 14:00:38 -0400 Subject: [PATCH 35/36] Point aztec to v1.3.28 Update gb mobile ref --- libs/editor/WordPressEditor/build.gradle | 2 +- libs/gutenberg-mobile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/editor/WordPressEditor/build.gradle b/libs/editor/WordPressEditor/build.gradle index 40a14111f91a..2a6d01ff81f7 100644 --- a/libs/editor/WordPressEditor/build.gradle +++ b/libs/editor/WordPressEditor/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - aztecVersion = 'f80c55aa45d6ec5c045016e3c9e8c8e9e1bbc3ad' + aztecVersion = 'v1.3.28' } repositories { diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index b0a7b8552511..a412674e4246 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit b0a7b855251104f211336a36463a9de2f7ba24e6 +Subproject commit a412674e4246a082ef1d80ce559b3f7d5c0994bf From b1f25379c4abd7c59bf03e7fb6b26b8de228d4b8 Mon Sep 17 00:00:00 2001 From: Marko Savic Date: Wed, 10 Jul 2019 14:31:59 -0400 Subject: [PATCH 36/36] Update gb mobile ref to point to develop --- libs/gutenberg-mobile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/gutenberg-mobile b/libs/gutenberg-mobile index a412674e4246..ec73e52948d4 160000 --- a/libs/gutenberg-mobile +++ b/libs/gutenberg-mobile @@ -1 +1 @@ -Subproject commit a412674e4246a082ef1d80ce559b3f7d5c0994bf +Subproject commit ec73e52948d46b8abe5707a295590be64920f395