Jetpack REST connection: install plugin #22119

nbradbury · 2025-08-12T18:41:03Z

This PR updates the Jetpack REST connection flow to install the Jetpack plugin.

@oguzkocer I don't expect a full review from you, but it would be good to have your eyes on JetpackInstaller to verify I'm using wordpress-rs correctly.

To test

Make sure the application passwords and Jetpack REST connection experimental features are enabled
Switch to a self-hosted site that doesn't have Jetpack installed
My Site > Stats
Tap "Install Jetpack"
Tap Start
After the wp.com login step completes (which it will right away if the wp.com access token already exists), verify that the Jetpack plugin installation succeeds
Go to your site in the browser and verify the plugin is installed
Deactivate the plugin in the browser
Relaunch the app
Run the connection flow again and verify the plugin is activated

Note: The connection flow will be stuck on the "Connect your site" step after the plugin is installed. That will be tackled in the next PR.

Screen_recording_20250813_154231.mp4

… UI thread

…ir is an HTTP status code

…-Android into feature/jetpack-connect-install

dangermattic · 2025-08-12T18:42:15Z

	4 Warnings
⚠️	`strings.xml` files should only be updated on release branches, when the translations are downloaded by our automation.
⚠️	This PR is larger than 300 lines of changes. Please consider splitting it into smaller PRs for easier and faster reviews.
⚠️	Class `JetpackInstaller` is missing tests, but `unit-tests-exemption` label was set to ignore this.
⚠️	PR is not assigned to a milestone.

Generated by 🚫 Danger

wpmobilebot · 2025-08-12T19:35:59Z

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

	App Name	Jetpack
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22119-77eaae8
	Commit	`77eaae8`
	Direct Download	`jetpack-prototype-build-pr22119-77eaae8.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2025-08-12T19:36:59Z

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

	App Name	WordPress
	Flavor	Jalapeno
	Build Type	Debug
	Version	pr22119-77eaae8
	Commit	`77eaae8`
	Direct Download	`wordpress-prototype-build-pr22119-77eaae8.apk`

Note: Google Login is not supported on these builds.

Copilot

Pull Request Overview

This PR implements Jetpack plugin installation functionality for the Jetpack REST connection flow. When users connect to a self-hosted site without Jetpack installed, the app now handles plugin installation automatically as part of the connection process.

Adds a new JetpackInstaller class that uses the WordPress REST API to install and activate the Jetpack plugin
Updates the connection view model to integrate plugin installation as a proper step in the flow
Adds error handling for installation failures and inactive plugin states

Reviewed Changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 4 comments.

File	Description
strings.xml	Adds error messages for Jetpack installation failures
JetpackRestConnectionViewModel.kt	Integrates plugin installation step and improves flow control
JetpackRestConnectionScreen.kt	Updates UI to handle new installation error types
JetpackInstaller.kt	New class implementing Jetpack plugin installation via REST API

_{Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.}

WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackInstaller.kt

...c/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackRestConnectionViewModel.kt

adalpari · 2025-08-14T07:16:45Z

WordPress/src/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackInstaller.kt

+    }
+
+    private fun initApiClient(site: SiteModel): WpApiClient {
+        return WpApiClient(


⛏️ What about moving this WpApiClient creation to. WpApiClientProvider, so we are sure every instance creation is done there?

Makes sense. I can look into this for this subsequent PR which moves the WpApiClient initialization to a helper class.

sonarqubecloud · 2025-08-14T07:17:53Z

Quality Gate passed

Issues
2 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

adalpari · 2025-08-14T07:24:23Z

...c/main/java/org/wordpress/android/ui/jetpackrestconnection/JetpackRestConnectionViewModel.kt

@@ -60,6 +63,9 @@ class JetpackRestConnectionViewModel @Inject constructor(
        }
    }

+    /**
+     * Called when all steps have completed successfully
+     */
    private fun onJobCompleted() {
        appLogWrapper.d(AppLog.T.API, "$TAG: Jetpack connection job completed")
        job?.cancel()


❓ Not related to this PR, but out of curiosity. Why do we need to cancel the job when it's completed? A job is automatically finished when all its code is run.

You're right, that's not really necessary. I'll remove that in the next PR.

I suggest auditing the job lifecycle because if the internal called methods can create their own scope, and the current job will finish while internally other threads are running. This happened to me when I tried to cancel uploads using jobs. It happened that OkHttp was handling the network calls on its own, so the external job was useless. So, since you are using worpdress-rs, which uses OkHttp, it would be great to double-check it.

I was using a job so the flow could be cancellable, but you make a very good point. There really isn't a way to cancel any of the steps in this flow once they're underway - it only cancels moving to the next step. Perhaps it would make more sense to simply have an isCancelled flag so we can stop after the current step?

Yeah, makes sense. Maybe just having a flag or a state is simpler and effective at the same time. If the job is not adding extra cancellable value, I would go for the simplest approach then, because of readability and maintainability.

I updated the Linear project to include removing the job.

adalpari

Apart form the minor comments I did, it looks good to me!

oguzkocer · 2025-08-18T19:57:36Z

@oguzkocer I don't expect a full review from you, but it would be good to have your eyes on JetpackInstaller to verify I'm using wordpress-rs correctly.

@nbradbury I looked at the wordpress-rs usage and didn't spot any issues related to it.

nbradbury added 15 commits August 12, 2025 08:03

Skip wp.com login if access token exists

da347ce

First pass at installing Jetpack

c95fa12

Second pass at installing Jetpack

f9dba6f

First pass at handling error response

03f85e7

Return a pair for installJetpack and restored launch wpcom login from…

74f5f45

… UI thread

Added InstallJetpackResult to make it clear the second item in the pa…

a298f39

…ir is an HTTP status code

Added InstallJetpackResult to make it clear the second item in the pa…

d15a2bb

…ir is an HTTP status code

refresh the site before starting jetpack install

8d426ca

Fixed detekt warnings, fetch site directly

ae6eaa3

Added/updated comments

f72cc1f

Merge branch 'trunk' of https://github.com/wordpress-mobile/WordPress…

b2f520b

…-Android into feature/jetpack-connect-install

Handle inactive Jetpack install, refresh site in init

fe56a2e

Tweaked comments

1ee7396

Restored check for access token

1cc674f

Check if we need to install or simply activate the jp plugin

2c1a58a

nbradbury added the Jetpack REST Connection label Aug 12, 2025

nbradbury added 3 commits August 12, 2025 14:42

Simplified JetpackInstaller to always install the plugin

1237bc9

Increased timeout

c171b36

Fixed Detekt warnings

d1b59a1

nbradbury added the unit-tests-exemption label Aug 12, 2025

nbradbury and others added 3 commits August 12, 2025 14:57

Merge branch 'trunk' into feature/jetpack-connect-install

974941a

Simplified JetpackInstaller.kt

b5b7cbc

Simplified JetpackInstaller.kt, p2

a5ac0b4

nbradbury added 4 commits August 12, 2025 15:41

Added log message

5e4aa19

Get plugin status before activating

fe48169

Use correct names for slugs

6af0b6c

Removed iOS commented code

6354253

nbradbury and others added 5 commits August 13, 2025 06:46

Reduced timeout from 60 to 45 seconds

8c4dca1

Simplified installer

e19e769

Code cleanup

ca4efc5

Removed refreshSite

2a163dd

Merge branch 'trunk' into feature/jetpack-connect-install

89ac854

nbradbury requested a review from Copilot August 13, 2025 11:27

This comment was marked as outdated.

Sign in to view

nbradbury requested a review from Copilot August 13, 2025 12:11

Copilot AI reviewed Aug 13, 2025

View reviewed changes

nbradbury added 5 commits August 13, 2025 08:18

Pass WpApiClient as a parameter

d705d4c

Added missing space

f7f49ff

Use a Result<PluginStatus> for installJetpack

7d7d38b

Add a delay to wp.com login if already logged in

4baf46d

Removed unnecessary launch

bbccb48

nbradbury marked this pull request as ready for review August 13, 2025 12:46

nbradbury requested a review from adalpari August 13, 2025 12:46

nbradbury and others added 2 commits August 13, 2025 09:25

Suppress TooGenericExceptionCaught

b601a0c

Merge branch 'trunk' into feature/jetpack-connect-install

b59b354

nbradbury mentioned this pull request Aug 13, 2025

Jetpack REST connection: connect site and user #22126

Merged

Merge branch 'trunk' into feature/jetpack-connect-install

67d9bd6

nbradbury requested a review from oguzkocer August 13, 2025 20:19

Merge branch 'trunk' into feature/jetpack-connect-install

77eaae8

adalpari reviewed Aug 14, 2025

View reviewed changes

adalpari approved these changes Aug 14, 2025

View reviewed changes

nbradbury merged commit f43b029 into trunk Aug 14, 2025
26 checks passed

nbradbury deleted the feature/jetpack-connect-install branch August 14, 2025 10:09

nbradbury mentioned this pull request Aug 20, 2025

Removed job from Jetpack connection flow #22153

Merged

Jetpack REST connection: install plugin #22119

Jetpack REST connection: install plugin #22119

Uh oh!

Conversation

nbradbury commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dangermattic commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wpmobilebot commented Aug 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

adalpari Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Aug 14, 2025

Quality Gate passed

Uh oh!

adalpari Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

nbradbury Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari Aug 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nbradbury Aug 14, 2025

Choose a reason for hiding this comment

Uh oh!

adalpari left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

oguzkocer commented Aug 18, 2025

Uh oh!

Uh oh!

nbradbury commented Aug 12, 2025 •

edited

Loading

dangermattic commented Aug 12, 2025 •

edited

Loading

wpmobilebot commented Aug 12, 2025 •

edited

Loading

wpmobilebot commented Aug 12, 2025 •

edited

Loading

adalpari Aug 14, 2025 •

edited

Loading