Refactor: Move GutenbergKit configuration logic to appropriate locations (#22172)

* refactor: Move GutenbergKit configuration logic to appropriate locations

Continues the refactoring effort to reduce GutenbergKitActivity responsibilities
by moving fragment configuration logic closer to where it belongs.

Changes:
- Add companion object factory methods to SiteConfig.fromSiteModel() and PostConfig.fromPostModel()
- Move buildAuthorizationData() method from activity to GutenbergKitSettingsBuilder
- Add newInstanceWithBuilder() factory method to GutenbergKitEditorFragment
- Consolidate configuration parameters into GutenbergKitConfig wrapper object
- Remove duplicate configuration building methods from activity
- Clean up unused imports

The activity now delegates configuration building to the appropriate classes
rather than handling detailed fragment setup logic itself. This improves
separation of concerns and makes the fragment more self-contained.

* refactor: Restore FeatureConfig data class and embed in AppConfig

Maintains better separation of concerns by keeping feature-related
configuration grouped together instead of scattering individual
feature flags throughout AppConfig.

Changes:
- Restore FeatureConfig data class with feature flags
- Add featureConfig property to AppConfig instead of individual flags
- Update buildSettings method to use appConfig.featureConfig
- Update activity to create FeatureConfig separately

This preserves logical grouping while still consolidating parameters.

* refactor: Keep FeatureConfig as separate parameter in buildSettings

Restores the original API design where FeatureConfig remains a separate
parameter to buildSettings method instead of being embedded in AppConfig.

Changes:
- Remove featureConfig from AppConfig data class
- Restore featureConfig parameter to buildSettings method
- Add featureConfig to GutenbergKitConfig wrapper
- Update fragment to pass featureConfig separately
- Update activity to create separate featureConfig

This maintains better separation of concerns and preserves the logical
grouping of related configuration parameters.

* refactor: Simplify fromSiteModel to use single parameter

Remove redundant siteId parameter and use SiteModel.siteId directly.
This simplifies the factory method while maintaining the same functionality.

* fix: Restore original webEditor and selfHostedSiteId logic

Fixes logical changes in buildAuthorizationData to match original implementation:
- Add webEditor and selfHostedSiteId fields to SiteConfig
- Use original siteModel.selfHostedSiteId instead of calculated value
- Use original siteModel.webEditor instead of empty string

This ensures the authorization data matches the original behavior exactly.

* fix: Use processed username/password in buildAuthorizationData

Corrects the final logical difference to match original implementation:
- Add apiRestUsernameProcessed and apiRestPasswordProcessed fields to SiteConfig
- Use siteModel.getUserNameProcessed() and getPasswordProcessed() in factory
- Update buildAuthorizationData to use processed versions

This now exactly matches the original createGutenbergWebViewAuthorizationData method.

* fix: Update test helper methods for new data class parameters

Add missing required parameters to SiteConfig and AppConfig test helper methods
to fix compilation errors after consolidating configuration logic.

Changes:
- Add selfHostedSiteId, webEditor, and processed credentials to SiteConfig
- Add accountUserId, accountUserName, userAgent, and isJetpackSsoEnabled to AppConfig
- Update test cases to use the new parameter structure

* fix: Handle null context in UserAgent constructor

Make UserAgent constructor safe when called with null context by using
safe navigation operators and providing fallback values.

Changes:
- Use safe navigation for WebSettings.getDefaultUserAgent() call
- Provide empty string fallback for defaultUserAgent when context is null
- Use safe navigation for PackageUtils.getVersionName() call
- Provide "0" fallback for versionName when context is null
- Update test to use proper constructor parameters with import cleanup

Author: oguzkocer

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

@@ -65,7 +65,6 @@ import org.wordpress.android.editor.EditorImageSettingsListener
 import org.wordpress.android.editor.ExceptionLogger
 import org.wordpress.android.editor.gutenberg.DialogVisibility
 import org.wordpress.android.ui.posts.editor.GutenbergKitEditorFragment
-import org.wordpress.android.editor.gutenberg.GutenbergWebViewAuthorizationData
 import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase
 import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase.Companion.getDatabase
 import org.wordpress.android.fluxc.Dispatcher
@@ -105,8 +104,6 @@ import org.wordpress.android.fluxc.store.SiteStore.OnPrivateAtomicCookieFetched
 import org.wordpress.android.fluxc.store.UploadStore
 import org.wordpress.android.fluxc.store.bloggingprompts.BloggingPromptsStore
 import org.wordpress.android.fluxc.tools.FluxCImageLoader
-import org.wordpress.android.fluxc.utils.extensions.getPasswordProcessed
-import org.wordpress.android.fluxc.utils.extensions.getUserNameProcessed
 import org.wordpress.android.imageeditor.preview.PreviewImageFragment
 import org.wordpress.android.imageeditor.preview.PreviewImageFragment.Companion.EditImageData.InputData
 import org.wordpress.android.support.ZendeskHelper
@@ -2212,54 +2209,10 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
                 onXpostsSettingsCapability(isXpostsCapable)
             }
 
-            val isWpCom = site.isWPCom || siteModel.isWPComAtomic
-            val gutenbergWebViewAuthorizationData = createGutenbergWebViewAuthorizationData(isWpCom)
-            val settings = createGutenbergKitSettings()
+            val siteConfig = GutenbergKitSettingsBuilder.SiteConfig.fromSiteModel(siteModel)
 
-            return GutenbergKitEditorFragment.newInstance(
-                getContext(),
-                isNewPost,
-                gutenbergWebViewAuthorizationData,
-                jetpackFeatureRemovalPhaseHelper.shouldShowJetpackPoweredEditorFeatures(),
-                settings
-            )
-        }
-
-        private fun createGutenbergWebViewAuthorizationData(isWpCom: Boolean): GutenbergWebViewAuthorizationData {
-            return GutenbergWebViewAuthorizationData(
-                siteModel.url,
-                isWpCom,
-                accountStore.account.userId,
-                accountStore.account.userName,
-                accountStore.accessToken,
-                siteModel.selfHostedSiteId,
-                siteModel.getUserNameProcessed(),
-                siteModel.getPasswordProcessed(),
-                siteModel.isUsingWpComRestApi,
-                siteModel.webEditor,
-                userAgent.toString(),
-                isJetpackSsoEnabled
-            )
-        }
-
-        private fun createGutenbergKitSettings(): MutableMap<String, Any?> {
-            val siteConfig = GutenbergKitSettingsBuilder.SiteConfig(
-                url = siteModel.url,
-                siteId = site.siteId,
-                isWPCom = site.isWPCom,
-                isWPComAtomic = siteModel.isWPComAtomic,
-                isJetpackConnected = site.isJetpackConnected,
-                isUsingWpComRestApi = siteModel.isUsingWpComRestApi,
-                wpApiRestUrl = siteModel.wpApiRestUrl,
-                apiRestUsernamePlain = site.apiRestUsernamePlain,
-                apiRestPasswordPlain = siteModel.apiRestPasswordPlain
-            )
-
-            val postConfig = GutenbergKitSettingsBuilder.PostConfig(
-                remotePostId = editPostRepository.getPost()?.remotePostId,
-                isPage = editPostRepository.isPage,
-                title = editPostRepository.getPost()?.title,
-                content = editPostRepository.getPost()?.content
+            val postConfig = GutenbergKitSettingsBuilder.PostConfig.fromPostModel(
+                editPostRepository.getPost()
             )
 
             val featureConfig = GutenbergKitSettingsBuilder.FeatureConfig(
@@ -2272,15 +2225,26 @@ class GutenbergKitActivity : BaseAppCompatActivity(), EditorImageSettingsListene
             val appConfig = GutenbergKitSettingsBuilder.AppConfig(
                 accessToken = accountStore.accessToken,
                 locale = perAppLocaleManager.getCurrentLocaleLanguageCode(),
-                cookies = editPostAuthViewModel.getCookiesForPrivateSites(site, privateAtomicCookie)
+                cookies = editPostAuthViewModel.getCookiesForPrivateSites(site, privateAtomicCookie),
+                accountUserId = accountStore.account.userId,
+                accountUserName = accountStore.account.userName,
+                userAgent = userAgent,
+                isJetpackSsoEnabled = isJetpackSsoEnabled
             )
 
-            return GutenbergKitSettingsBuilder.buildSettings(
+            val config = GutenbergKitSettingsBuilder.GutenbergKitConfig(
                 siteConfig = siteConfig,
                 postConfig = postConfig,
                 appConfig = appConfig,
                 featureConfig = featureConfig
             )
+
+            return GutenbergKitEditorFragment.newInstanceWithBuilder(
+                getContext(),
+                isNewPost,
+                jetpackFeatureRemovalPhaseHelper.shouldShowJetpackPoweredEditorFeatures(),
+                config
+            )
         }
 
         override fun instantiateItem(container: ViewGroup, position: Int): Any {

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

@@ -1,6 +1,12 @@
 package org.wordpress.android.ui.posts
 
 import android.util.Base64
+import org.wordpress.android.editor.gutenberg.GutenbergWebViewAuthorizationData
+import org.wordpress.android.fluxc.model.PostImmutableModel
+import org.wordpress.android.fluxc.model.SiteModel
+import org.wordpress.android.fluxc.network.UserAgent
+import org.wordpress.android.fluxc.utils.extensions.getPasswordProcessed
+import org.wordpress.android.fluxc.utils.extensions.getUserNameProcessed
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.UrlUtils
 
@@ -17,15 +23,50 @@ object GutenbergKitSettingsBuilder {
         val isUsingWpComRestApi: Boolean,
         val wpApiRestUrl: String?,
         val apiRestUsernamePlain: String?,
-        val apiRestPasswordPlain: String?
-    )
+        val apiRestPasswordPlain: String?,
+        val selfHostedSiteId: Long,
+        val webEditor: String,
+        val apiRestUsernameProcessed: String?,
+        val apiRestPasswordProcessed: String?
+    ) {
+        companion object {
+            fun fromSiteModel(site: SiteModel): SiteConfig {
+                return SiteConfig(
+                    url = site.url,
+                    siteId = site.siteId,
+                    isWPCom = site.isWPCom,
+                    isWPComAtomic = site.isWPComAtomic,
+                    isJetpackConnected = site.isJetpackConnected,
+                    isUsingWpComRestApi = site.isUsingWpComRestApi,
+                    wpApiRestUrl = site.wpApiRestUrl,
+                    apiRestUsernamePlain = site.apiRestUsernamePlain,
+                    apiRestPasswordPlain = site.apiRestPasswordPlain,
+                    selfHostedSiteId = site.selfHostedSiteId,
+                    webEditor = site.webEditor,
+                    apiRestUsernameProcessed = site.getUserNameProcessed(),
+                    apiRestPasswordProcessed = site.getPasswordProcessed()
+                )
+            }
+        }
+    }
 
     data class PostConfig(
         val remotePostId: Long?,
         val isPage: Boolean,
         val title: String?,
         val content: String?
-    )
+    ) {
+        companion object {
+            fun fromPostModel(postModel: PostImmutableModel?): PostConfig {
+                return PostConfig(
+                    remotePostId = postModel?.remotePostId,
+                    isPage = postModel?.isPage ?: false,
+                    title = postModel?.title,
+                    content = postModel?.content
+                )
+            }
+        }
+    }
 
     data class FeatureConfig(
         val isPluginsFeatureEnabled: Boolean,
@@ -35,7 +76,18 @@ object GutenbergKitSettingsBuilder {
     data class AppConfig(
         val accessToken: String?,
         val locale: String,
-        val cookies: Any?
+        val cookies: Any?,
+        val accountUserId: Long,
+        val accountUserName: String?,
+        val userAgent: UserAgent,
+        val isJetpackSsoEnabled: Boolean
+    )
+
+    data class GutenbergKitConfig(
+        val siteConfig: SiteConfig,
+        val postConfig: PostConfig,
+        val appConfig: AppConfig,
+        val featureConfig: FeatureConfig
     )
 
     /**
@@ -147,4 +199,27 @@ object GutenbergKitSettingsBuilder {
         return isFeatureEnabled &&
                 (isWPComSite || (isJetpackConnected && !applicationPassword.isNullOrEmpty()))
     }
+
+    /**
+     * Builds Gutenberg WebView authorization data for the fragment.
+     */
+    fun buildAuthorizationData(
+        siteConfig: SiteConfig,
+        appConfig: AppConfig
+    ): GutenbergWebViewAuthorizationData {
+        return GutenbergWebViewAuthorizationData(
+            siteConfig.url,
+            siteConfig.isWPCom || siteConfig.isWPComAtomic,
+            appConfig.accountUserId,
+            appConfig.accountUserName,
+            appConfig.accessToken,
+            siteConfig.selfHostedSiteId,
+            siteConfig.apiRestUsernameProcessed,
+            siteConfig.apiRestPasswordProcessed,
+            siteConfig.isUsingWpComRestApi,
+            siteConfig.webEditor,
+            appConfig.userAgent.toString(),
+            appConfig.isJetpackSsoEnabled
+        )
+    }
 }

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

@@ -25,6 +25,7 @@ import org.wordpress.android.editor.EditorImagePreviewListener
 import org.wordpress.android.editor.LiveTextWatcher
 import org.wordpress.android.editor.gutenberg.GutenbergWebViewAuthorizationData
 import org.wordpress.android.editor.savedinstance.SavedInstanceDatabase.Companion.getDatabase
+import org.wordpress.android.ui.posts.GutenbergKitSettingsBuilder
 import org.wordpress.android.util.AppLog
 import org.wordpress.android.util.PermissionUtils
 import org.wordpress.android.util.ProfilingUtils
@@ -538,5 +539,36 @@ class GutenbergKitEditorFragment : GutenbergKitEditorFragmentBase() {
             db?.addParcel(ARG_GUTENBERG_WEB_VIEW_AUTH_DATA, webViewAuthorizationData)
             return fragment
         }
+
+        /**
+         * Simplified factory method that uses GutenbergKitSettingsBuilder for configuration.
+         * This reduces the activity's responsibility for detailed fragment setup.
+         */
+        fun newInstanceWithBuilder(
+            context: Context,
+            isNewPost: Boolean,
+            jetpackFeaturesEnabled: Boolean,
+            config: GutenbergKitSettingsBuilder.GutenbergKitConfig
+        ): GutenbergKitEditorFragment {
+            val authorizationData = GutenbergKitSettingsBuilder.buildAuthorizationData(
+                siteConfig = config.siteConfig,
+                appConfig = config.appConfig
+            )
+
+            val settings = GutenbergKitSettingsBuilder.buildSettings(
+                siteConfig = config.siteConfig,
+                postConfig = config.postConfig,
+                appConfig = config.appConfig,
+                featureConfig = config.featureConfig
+            )
+
+            return newInstance(
+                context,
+                isNewPost,
+                authorizationData,
+                jetpackFeaturesEnabled,
+                settings
+            )
+        }
     }
 }

WordPress/src/test/java/org/wordpress/android/ui/posts/GutenbergKitSettingsBuilderTest.kt

@@ -4,6 +4,7 @@ import org.assertj.core.api.Assertions.assertThat
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.junit.MockitoJUnitRunner
+import org.wordpress.android.fluxc.network.UserAgent
 
 @RunWith(MockitoJUnitRunner::class)
 @Suppress("LargeClass")
@@ -393,7 +394,11 @@ class GutenbergKitSettingsBuilderTest {
             isUsingWpComRestApi = true,
             wpApiRestUrl = null,
             apiRestUsernamePlain = null,
-            apiRestPasswordPlain = null
+            apiRestPasswordPlain = null,
+            selfHostedSiteId = 0,
+            webEditor = "gutenberg",
+            apiRestUsernameProcessed = null,
+            apiRestPasswordProcessed = null
         )
 
         val postConfig = GutenbergKitSettingsBuilder.PostConfig(
@@ -441,7 +446,11 @@ class GutenbergKitSettingsBuilderTest {
             isUsingWpComRestApi = false,
             wpApiRestUrl = "https://jetpack-site.com/wp-json/",
             apiRestUsernamePlain = "admin",
-            apiRestPasswordPlain = "securepass"
+            apiRestPasswordPlain = "securepass",
+            selfHostedSiteId = 999,
+            webEditor = "gutenberg",
+            apiRestUsernameProcessed = "admin",
+            apiRestPasswordProcessed = "securepass"
         )
 
         val postConfig = GutenbergKitSettingsBuilder.PostConfig(
@@ -601,7 +610,11 @@ class GutenbergKitSettingsBuilderTest {
     ) = GutenbergKitSettingsBuilder.AppConfig(
         accessToken = accessToken,
         locale = locale,
-        cookies = cookies
+        cookies = cookies,
+        accountUserId = 123L,
+        accountUserName = "testuser",
+        userAgent = UserAgent(appContext = null, appName = "foo"),
+        isJetpackSsoEnabled = false
     )
 
     private fun createSiteConfig(
@@ -623,7 +636,11 @@ class GutenbergKitSettingsBuilderTest {
         isUsingWpComRestApi = isUsingWpComRestApi,
         wpApiRestUrl = wpApiRestUrl,
         apiRestUsernamePlain = apiRestUsernamePlain,
-        apiRestPasswordPlain = apiRestPasswordPlain
+        apiRestPasswordPlain = apiRestPasswordPlain,
+        selfHostedSiteId = siteId,
+        webEditor = "gutenberg",
+        apiRestUsernameProcessed = apiRestUsernamePlain,
+        apiRestPasswordProcessed = apiRestPasswordPlain
     )
 
     private fun createPostConfig(

libs/fluxc/src/main/java/org/wordpress/android/fluxc/network/UserAgent.kt

@@ -16,20 +16,25 @@ class UserAgent(appContext: Context?, appName: String) {
         // E.g.:
         //   "Mozilla/5.0 (Linux; Android 6.0; Android SDK built for x86_64 Build/MASTER; wv)
         //   AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36"
-        val defaultUserAgent = try {
-            WebSettings.getDefaultUserAgent(appContext)
-        } catch (e: RuntimeException) {
-            // `getDefaultUserAgent()` can throw an Exception
-            // see: https://github.com/wordpress-mobile/WordPress-Android/issues/20147#issuecomment-1961238187
-            ""
-        }
+        val defaultUserAgent = appContext?.let {
+            try {
+                WebSettings.getDefaultUserAgent(appContext)
+            } catch (_: RuntimeException) {
+                // `getDefaultUserAgent()` can throw an Exception
+                // see: https://github.com/wordpress-mobile/WordPress-Android/issues/20147#issuecomment-1961238187
+                ""
+            }
+        } ?: ""
         // User-Agent string when making HTTP connections, for both API traffic and WebViews.
         // Appends "wp-android/version" to WebView's default User-Agent string for the webservers
         // to get the full feature list of the browser and serve content accordingly, e.g.:
         //    "Mozilla/5.0 (Linux; Android 6.0; Android SDK built for x86_64 Build/MASTER; wv)
         //    AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/44.0.2403.119 Mobile Safari/537.36
         //    wp-android/4.7"
-        val appWithVersion = "$appName/${PackageUtils.getVersionName(appContext)}"
+        val versionName = appContext?.let {
+            PackageUtils.getVersionName(appContext)
+        } ?: "0" // PackageUtils.getVersionName will also return "0" if it can't find packageInfo
+        val appWithVersion = "$appName/$versionName"
         userAgent = if (defaultUserAgent.isNotEmpty()) "$defaultUserAgent $appWithVersion" else appWithVersion
     }