feat: Add WordPress.com OAuth support to Android demo app

.gitignore

@@ -184,6 +184,7 @@ local.properties
 /android/.gradle
 /android/.kotlin
 /android/.idea
+/android/app/src/main/assets/wp_com_oauth_credentials.json
 
 ## Production Build Products
 /android/Gutenberg/src/main/assets/assets

android/Gutenberg/src/main/java/org/wordpress/gutenberg/RESTAPIRepository.kt

@@ -24,10 +24,11 @@ class RESTAPIRepository(
     private val json = Json { ignoreUnknownKeys = true }
 
     private val apiRoot = configuration.siteApiRoot.trimEnd('/')
-    private val editorSettingsUrl = "$apiRoot$EDITOR_SETTINGS_PATH"
-    private val activeThemeUrl = "$apiRoot$ACTIVE_THEME_PATH"
-    private val siteSettingsUrl = "$apiRoot$SITE_SETTINGS_PATH"
-    private val postTypesUrl = "$apiRoot$POST_TYPES_PATH"
+    private val namespace = configuration.siteApiNamespace.firstOrNull()
+    private val editorSettingsUrl = buildNamespacedUrl(EDITOR_SETTINGS_PATH)
+    private val activeThemeUrl = buildNamespacedUrl(ACTIVE_THEME_PATH)
+    private val siteSettingsUrl = buildNamespacedUrl(SITE_SETTINGS_PATH)
+    private val postTypesUrl = buildNamespacedUrl(POST_TYPES_PATH)
 
     /**
      * Cleanup any expired cache entries.
@@ -72,7 +73,7 @@ class RESTAPIRepository(
     }
 
     private fun buildPostUrl(id: Int): String {
-        return "$apiRoot/wp/v2/posts/$id?context=edit"
+        return buildNamespacedUrl("/wp/v2/posts/$id?context=edit")
     }
 
     // MARK: Editor Settings
@@ -139,7 +140,7 @@ class RESTAPIRepository(
     }
 
     private fun buildPostTypeUrl(type: String): String {
-        return "$apiRoot/wp/v2/types/$type?context=edit"
+        return buildNamespacedUrl("/wp/v2/types/$type?context=edit")
     }
 
     // MARK: GET Active Theme
@@ -212,6 +213,26 @@ class RESTAPIRepository(
         return urlResponse
     }
 
+    /**
+     * Builds a URL from the API root and path, inserting the site API namespace
+     * after the version segment if one is configured.
+     *
+     * For example, with namespace `sites/123/` and path `/wp/v2/types`:
+     * the result is `$apiRoot/wp/v2/sites/123/types`.
+     */
+    private fun buildNamespacedUrl(path: String): String {
+        if (namespace == null) {
+            return "$apiRoot$path"
+        }
+
+        val parts = path.removePrefix("/").split("/", limit = 3)
+        if (parts.size < 3) {
+            return "$apiRoot$path"
+        }
+
+        return "$apiRoot/${parts[0]}/${parts[1]}/$namespace${parts[2]}"
+    }
+
     companion object {
         private const val EDITOR_SETTINGS_PATH = "/wp-block-editor/v1/settings"
         private const val ACTIVE_THEME_PATH = "/wp/v2/themes?context=edit&status=active"

android/Gutenberg/src/main/java/org/wordpress/gutenberg/stores/EditorAssetsLibrary.kt

@@ -266,7 +266,13 @@ class EditorAssetsLibrary(
 
     private fun editorAssetsUrl(configuration: EditorConfiguration): String {
         val baseUrl = configuration.siteApiRoot.trimEnd('/')
-        return "$baseUrl/wpcom/v2/editor-assets?exclude=core,gutenberg"
+        val namespace = configuration.siteApiNamespace.firstOrNull()
+
+        return if (namespace != null) {
+            "$baseUrl/wpcom/v2/${namespace}editor-assets?exclude=core,gutenberg"
+        } else {
+            "$baseUrl/wpcom/v2/editor-assets?exclude=core,gutenberg"
+        }
     }
 
     /**

android/app/src/main/AndroidManifest.xml

@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
+        android:name=".GutenbergKitApplication"
         android:allowBackup="true"
         android:usesCleartextTraffic="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -32,6 +33,16 @@
                     android:scheme="gutenbergkit" >
                 </data>
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:host="wpcom-authorized"
+                    android:scheme="gutenbergkit" >
+                </data>
+            </intent-filter>
         </activity>
         <activity
             android:name=".EditorActivity"

android/app/src/main/assets/wp_com_oauth_credentials.json.example

@@ -0,0 +1,4 @@
+{
+    "client_id": 0,
+    "client_secret": ""
+}