From 033a37db0c0f4f6136ec27acdeae7e2f8511a66a Mon Sep 17 00:00:00 2001 From: adalpari Date: Mon, 8 Jun 2026 16:11:43 +0200 Subject: [PATCH] Fix NPE in Site Settings when refreshing GBKit toggle with null site MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The refresh runs from an async onSettingsUpdated callback that only guards with isAdded(), so mSite can be null when isBlockEditorDefault — a non-null Kotlin param — is invoked, crashing on the generated null check. Co-Authored-By: Claude Opus 4.8 (1M context) --- .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java index f634cf2fed35..5b553bc3adc6 100644 --- a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java +++ b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java @@ -1191,7 +1191,7 @@ public void initPreferences() { * posts" on this screen), not only at first inflation. */ private void refreshGutenbergKitToggleAvailability() { - if (mGutenbergKitPref == null) return; + if (mGutenbergKitPref == null || mSite == null) return; if (mSiteSettingsProvider.isBlockEditorDefault(mSite)) { mGutenbergKitPref.setEnabled(true); mGutenbergKitPref.setSummary(R.string.site_settings_gutenberg_kit_enabled_summary);