Add site settings for third-party blocks and theme style gating by jkmassel · Pull Request #22785 · wordpress-mobile/WordPress-Android

jkmassel · 2026-04-09T21:48:56Z

Summary

Extracts the site settings changes from #22579 and layers them on top of #22765.

New "Use Third-Party Blocks" site setting — toggle in Site Settings gated behind GutenbergKitPluginsFeature and editor assets route support, with DB migration (v70→71), full data model plumbing (SiteSettingsModel, SiteSettingsInterface, WPComSiteSettings), and preference XML
Enhanced "Use Theme Styles" gating — contextual warnings when the site lacks editor settings support (disabled) or when the active theme is not a block theme
SiteSettingsProvider interface — injectable abstraction over SiteSettingsTable for reading site settings and determining block editor default, replacing static SiteUtils calls
EditorSettingsRepository + ThemeRepository — discovers editor settings / editor assets route support via WpApiClient.apiRoot().get() and fetches the active theme to detect block theme support; results cached in per-site AppPrefs
Background capability fetch — MySiteViewModel.onResume() triggers fetchEditorCapabilitiesForSite so results are available before the user opens Site Settings; failures show a snackbar when there's no cached data, otherwise fall back silently

Test plan

Verify DB migration runs cleanly on upgrade (v70→71) (the app will crash if not, so this should be pretty straightforward)
Toggle both settings on, force-quit the app, then reopen Site Settings and verify both toggles still reflect the new state — exercises the DB read-back path, which schema-creation alone won't surface

Theme Style Tests:

Before testing, ensure that the following feature flags are enabled:

Experimental Features > "Experimental Block Editor"

When the app is not signed into WP.com:

Log into vanilla.wpmt.co, view Site Settings – note that theme styles are available but there's a notice about things potentially not looking right. Draft a new post, note that the editor is styled.
Log into jetpack.wpmt.co, view Site Settings – note that theme styles are available without a warning. Draft a new post, note that the editor uses a custom font (it might be easier to see the difference if you disable theme styles then look again).

When the app is signed into WP.com:

View site settings for wpmobilep2.wordpress.com. Note that theme styles are supported. Start drafting a new post – note that the title is themed.
View site settings for jetpack.wpmt.co – note that theme styles are available without a warning. Draft a new post, note that the editor uses a custom font.

Third-Party Blocks Tests:

Before testing, ensure that the following feature flags are enabled:

Experimental Features > "Experimental Block Editor"
Debug Settings > `gutenberg_kit_plugins`

When the app is not signed into WP.com:

Log into vanilla.wpmt.co, view Site Settings – note that third-party blocks are unavailable on this site.
Log into jetpack.wpmt.co, view Site Settings – note that third-party blocks are available. Draft a new post. Try out some of the Jetpack blocks to validate that they work.

When the app is signed into WP.com:

View site settings for jetpack.wpmt.co – note that third-party blocks are available. Draft a new post. Try out some of the Jetpack blocks to validate that they work.
View site settings for wpmobilep2.wordpress.com – note that third-party blocks are available. Draft a new post. Try out some of the Jetpack blocks to validate that they work.
View site settings for an atomic site – note that third-party blocks are available. Draft a new post. Try out some of the Jetpack blocks to validate that they work.

dangermattic · 2026-04-09T21:49:39Z

	2 Warnings
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

wpmobilebot · 2026-04-09T22:22:49Z

📲 You can test the changes from this Pull Request in WordPress Android by scanning the QR code below to install the corresponding build.

	App Name	WordPress Android
	Build Type	Debug
	Version	pr22785-305ccc3
	Build Number	`1488`
	Application ID	`org.wordpress.android.prealpha`
	Commit	`305ccc3`
	Installation URL	15emgl90j6mj0

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-04-09T22:23:33Z

📲 You can test the changes from this Pull Request in Jetpack Android by scanning the QR code below to install the corresponding build.

	App Name	Jetpack Android
	Build Type	Debug
	Version	pr22785-305ccc3
	Build Number	`1488`
	Application ID	`com.jetpack.android.prealpha`
	Commit	`305ccc3`
	Installation URL	1sn77jk64skf0

Automatticians: You can use our internal self-serve MC tool to give yourself access to those builds if needed.

wpmobilebot · 2026-04-15T20:23:02Z

🤖 Build Failure Analysis

This build has failures. Claude has analyzed them - check the build annotations for details.

wpmobilebot · 2026-04-15T21:48:08Z

Project dependencies changes

list

! Upgraded Dependencies
rs.wordpress.api:android:alpha-2026-04-20, (changed from trunk-0d94794142482d1b7f9395c0afef57ac991c452e)
rs.wordpress.api:kotlin:alpha-2026-04-20, (changed from trunk-0d94794142482d1b7f9395c0afef57ac991c452e)

tree

 +--- project :libs:fluxc
-|    \--- rs.wordpress.api:android:trunk-0d94794142482d1b7f9395c0afef57ac991c452e
-|         +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         +--- com.squareup.okhttp3:okhttp-tls:5.3.2
-|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         |    +--- com.squareup.okio:okio:3.16.4 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -> 2.3.20 (*)
-|         +--- net.java.dev.jna:jna:5.18.1
-|         +--- rs.wordpress.api:kotlin:trunk-0d94794142482d1b7f9395c0afef57ac991c452e
-|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-tls:5.3.2 (*)
-|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.20 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.20 (*)
+|    \--- rs.wordpress.api:android:alpha-2026-04-20
+|         +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         +--- com.squareup.okhttp3:okhttp-tls:5.3.2
+|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         |    +--- com.squareup.okio:okio:3.16.4 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.2.21 -> 2.3.20 (*)
+|         +--- net.java.dev.jna:jna:5.18.1
+|         +--- rs.wordpress.api:kotlin:alpha-2026-04-20
+|         |    +--- com.squareup.okhttp3:okhttp:5.3.2 (*)
+|         |    +--- com.squareup.okhttp3:okhttp-tls:5.3.2 (*)
+|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.20 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 -> 2.3.20 (*)
-\--- rs.wordpress.api:android:trunk-0d94794142482d1b7f9395c0afef57ac991c452e (*)
+\--- rs.wordpress.api:android:alpha-2026-04-20 (*)

codecov · 2026-04-21T19:36:02Z

Codecov Report

❌ Patch coverage is 52.87356% with 82 lines in your changes missing coverage. Please review.
✅ Project coverage is 37.18%. Comparing base (61bd1ed) to head (305ccc3).

Files with missing lines	Patch %	Lines
.../java/org/wordpress/android/ui/prefs/AppPrefs.java	0.00%	27 Missing ⚠️
...press/android/datasets/SiteSettingsProviderImpl.kt	35.71%	9 Missing ⚠️
...s/android/repositories/EditorSettingsRepository.kt	88.57%	8 Missing ⚠️
...roid/ui/newstats/datasource/StatsDataSourceImpl.kt	0.00%	8 Missing ⚠️
.../org/wordpress/android/ui/prefs/AppPrefsWrapper.kt	0.00%	7 Missing ⚠️
...fluxc/network/rest/wpapi/rs/WpApiClientProvider.kt	0.00%	7 Missing ⚠️
...org/wordpress/android/ui/mysite/MySiteViewModel.kt	71.42%	5 Missing and 1 partial ⚠️
...rg/wordpress/android/models/SiteSettingsModel.java	0.00%	3 Missing ⚠️
.../wordpress/android/repositories/ThemeRepository.kt	83.33%	2 Missing ⚠️
...dpress/android/ui/prefs/SiteSettingsInterface.java	0.00%	2 Missing ⚠️
... and 2 more

Additional details and impacted files

@@            Coverage Diff             @@
##            trunk   #22785      +/-   ##
==========================================
+ Coverage   37.15%   37.18%   +0.02%     
==========================================
  Files        2314     2317       +3     
  Lines      124297   124468     +171     
  Branches    16882    16896      +14     
==========================================
+ Hits        46188    46280      +92     
- Misses      74366    74444      +78     
- Partials     3743     3744       +1

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Add a new "Use Third-Party Blocks" toggle in Site Settings, gated behind GutenbergKit and editor assets support. Enhance the existing "Use Theme Styles" toggle with contextual warnings when the site lacks editor settings support or uses a non-block theme. Includes SiteSettingsProvider interface for injectable access to site settings from the local DB, replacing static SiteUtils calls for block editor default detection. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Gate the "Use Third-Party Blocks" toggle behind the remote gutenberg_kit_plugins feature flag in addition to the existing GutenbergKit and editor assets checks. Also simplify the summary string by removing "and styles" per reviewer feedback. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

…tion Add ThemeRepository to fetch the active theme via WP API and determine if it is a block theme. Add EditorSettingsRepository to discover editor settings and editor assets route support via manifest/API root queries. Wire SiteSettingsFragment to use EditorSettingsRepository for gating theme styles and third-party blocks toggles. Also adds manifest route fetching methods to WpApiClientProvider for discovering available REST routes on WP.com and self-hosted sites. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Remove fetchWpComManifestRoutes and fetchSiteManifestRoutes from WpApiClientProvider. EditorSettingsRepository now uses the standard WpApiClient.request { it.apiRoot().get() } for all site types, which already handles WP.com vs self-hosted URL resolution. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Call `EditorSettingsRepository.fetchEditorCapabilitiesForSite` when the user lands on My Site so the route-discovery and theme-detection results are available by the time they open Site Settings. On failure, a snackbar is shown and cached prefs retain their previous values so settings degrade to disabled rather than crashing.

12 tests covering pref delegation, route discovery persistence, theme detection, API errors, transport-level error isolation (one fetch failing doesn't block the other), and the both-fail case. Also fix MySiteViewModelTest for new constructor param.

Points at Automattic/wordpress-rs#1285 which fixes route discovery on WP.com simple sites so editor-assets and editor-settings routes appear in the API root response. Also adapts StatsDataSourceImpl to the new StatsUtmKeys API (String replaced with List<StatsUtmKey>).

Switch from hasRoute (exact path match) to hasRouteForEndpoint (namespace + endpoint) so that WP.com sites — whose route keys include a sites/{site_id} prefix — are correctly detected. Requires wordpress-rs PR #1285 which adds hasRouteForEndpoint to WpApiDetails and the ApiUrlResolver parameter.

Call fetchEditorCapabilitiesForSite during pull-to-refresh so editor settings prefs stay current without requiring a full screen resume. Show snackbar on failure in both paths.

Base automatically changed from jkmassel/wpapiclient-wpcom-support to trunk April 15, 2026 18:31

jkmassel force-pushed the jkmassel/site-settings-rust branch 3 times, most recently from 540e9af to d50de44 Compare April 15, 2026 19:58

jkmassel force-pushed the jkmassel/site-settings-rust branch from 937ccc1 to 1ed0f7a Compare April 15, 2026 21:43

jkmassel force-pushed the jkmassel/site-settings-rust branch 9 times, most recently from 5ff6521 to 50fca51 Compare April 16, 2026 16:41

jkmassel force-pushed the jkmassel/site-settings-rust branch from 6fad2fb to 694d6d1 Compare April 21, 2026 21:18

jkmassel self-assigned this Apr 22, 2026

jkmassel and others added 8 commits April 22, 2026 09:06

Add EditorSettingsRepository tests

8a87215

12 tests covering pref delegation, route discovery persistence, theme detection, API errors, transport-level error isolation (one fetch failing doesn't block the other), and the both-fail case. Also fix MySiteViewModelTest for new constructor param.

jkmassel added 2 commits April 22, 2026 09:06

Refresh editor capabilities on pull-to-refresh

04ab757

Call fetchEditorCapabilitiesForSite during pull-to-refresh so editor settings prefs stay current without requiring a full screen resume. Show snackbar on failure in both paths.

Update wordpress-rs to alpha-2026-04-20

305ccc3

jkmassel force-pushed the jkmassel/site-settings-rust branch from 694d6d1 to 305ccc3 Compare April 22, 2026 15:06

jkmassel marked this pull request as ready for review April 22, 2026 15:24

jkmassel requested a review from a team as a code owner April 22, 2026 15:24

jkmassel requested review from nbradbury and removed request for a team April 22, 2026 15:24

jkmassel added [Type] Enhancement Gutenberg Editing and display of Gutenberg blocks. Site Management [Status] Needs Manual Testing labels Apr 22, 2026

jkmassel mentioned this pull request Apr 22, 2026

Add EditorCapabilityResolver to centralize editor-capability gating #22812

Open

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add site settings for third-party blocks and theme style gating#22785

Add site settings for third-party blocks and theme style gating#22785
jkmassel wants to merge 10 commits intotrunkfrom
jkmassel/site-settings-rust

jkmassel commented Apr 9, 2026 •

edited

Loading

Uh oh!

dangermattic commented Apr 9, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 9, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 9, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 15, 2026 •

edited

Loading

Uh oh!

wpmobilebot commented Apr 15, 2026 •

edited

Loading

Uh oh!

codecov Bot commented Apr 21, 2026 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

jkmassel commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Test plan

Theme Style Tests:

Third-Party Blocks Tests:

Uh oh!

dangermattic commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

🤖 Build Failure Analysis

Uh oh!

wpmobilebot commented Apr 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Project dependencies changes

Uh oh!

codecov Bot commented Apr 21, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jkmassel commented Apr 9, 2026 •

edited

Loading

dangermattic commented Apr 9, 2026 •

edited

Loading

wpmobilebot commented Apr 9, 2026 •

edited

Loading

wpmobilebot commented Apr 9, 2026 •

edited

Loading

wpmobilebot commented Apr 15, 2026 •

edited

Loading

wpmobilebot commented Apr 15, 2026 •

edited

Loading

codecov Bot commented Apr 21, 2026 •

edited

Loading