Skip to content

Updated wordpress-rs and request country #22037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 22, 2025
Merged

Conversation

nbradbury
Copy link
Contributor

This PR updates the wordpress-rs hash to include this change which supports adding the country when requesting subscribers. Note that the UI already supported showing the country when available, so nothing had to change there.

To test

  • My Site > Subscribers
  • Tap a subscriber in the list
  • Verify the country shows at the bottom of the detail
country

@nbradbury nbradbury added the Subscribers View and manage newsletter subscribers label Jul 21, 2025
@dangermattic
Copy link
Collaborator

dangermattic commented Jul 21, 2025

1 Warning
⚠️ PR is not assigned to a milestone.

Generated by 🚫 Danger

@wpmobilebot
Copy link
Contributor

Project dependencies changes

list
! Upgraded Dependencies
rs.wordpress.api:android:trunk-8abd2196b7679acae6097b9beacbf5f1c0545c1e, (changed from trunk-d6ea38c25176ffa2fa3ce8539ae6b078d58cfdad)
rs.wordpress.api:kotlin:trunk-8abd2196b7679acae6097b9beacbf5f1c0545c1e, (changed from trunk-d6ea38c25176ffa2fa3ce8539ae6b078d58cfdad)
tree
 +--- project :libs:fluxc
-|    \--- rs.wordpress.api:android:trunk-d6ea38c25176ffa2fa3ce8539ae6b078d58cfdad
-|         +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-|         +--- com.squareup.okhttp3:okhttp-tls:4.12.0
-|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-|         |    +--- com.squareup.okio:okio:3.6.0 -> 3.9.0 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
-|         +--- net.java.dev.jna:jna:5.17.0
-|         +--- rs.wordpress.api:kotlin:trunk-d6ea38c25176ffa2fa3ce8539ae6b078d58cfdad
-|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
-|         |    +--- com.squareup.okhttp3:okhttp-tls:4.12.0 (*)
-|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
-|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 (*)
-|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 (*)
+|    \--- rs.wordpress.api:android:trunk-8abd2196b7679acae6097b9beacbf5f1c0545c1e
+|         +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
+|         +--- com.squareup.okhttp3:okhttp-tls:4.12.0
+|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
+|         |    +--- com.squareup.okio:okio:3.6.0 -> 3.9.0 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.21 -> 1.9.10 (*)
+|         +--- net.java.dev.jna:jna:5.17.0
+|         +--- rs.wordpress.api:kotlin:trunk-8abd2196b7679acae6097b9beacbf5f1c0545c1e
+|         |    +--- com.squareup.okhttp3:okhttp:4.12.0 (*)
+|         |    +--- com.squareup.okhttp3:okhttp-tls:4.12.0 (*)
+|         |    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2 (*)
+|         |    \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 (*)
+|         \--- org.jetbrains.kotlin:kotlin-stdlib:2.1.21 (*)
-\--- rs.wordpress.api:android:trunk-d6ea38c25176ffa2fa3ce8539ae6b078d58cfdad (*)
+\--- rs.wordpress.api:android:trunk-8abd2196b7679acae6097b9beacbf5f1c0545c1e (*)

@nbradbury nbradbury requested a review from Copilot July 21, 2025 14:48
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates the wordpress-rs dependency to include support for requesting subscriber country information and modifies the subscribers API call to include country data. The UI already supports displaying country information when available, so no frontend changes were required.

  • Updates wordpress-rs dependency hash to include country support functionality
  • Adds country field to subscriber API requests to populate country data in subscriber details

Reviewed Changes

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

File Description
gradle/libs.versions.toml Updates wordpress-rs dependency hash to newer version with country support
WordPress/src/main/java/org/wordpress/android/ui/subscribers/SubscribersViewModel.kt Adds country field inclusion to subscriber API requests

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jul 21, 2025

WordPress📲 You can test the changes from this Pull Request in WordPress by scanning the QR code below to install the corresponding build.
App NameWordPress WordPress
FlavorJalapeno
Build TypeDebug
Versionpr22037-5a8735a
Commit5a8735a
Direct Downloadwordpress-prototype-build-pr22037-5a8735a.apk
Note: Google Login is not supported on these builds.

@wpmobilebot
Copy link
Contributor

wpmobilebot commented Jul 21, 2025

Jetpack📲 You can test the changes from this Pull Request in Jetpack by scanning the QR code below to install the corresponding build.
App NameJetpack Jetpack
FlavorJalapeno
Build TypeDebug
Versionpr22037-5a8735a
Commit5a8735a
Direct Downloadjetpack-prototype-build-pr22037-5a8735a.apk
Note: Google Login is not supported on these builds.

Copy link

codecov bot commented Jul 21, 2025

Codecov Report

Attention: Patch coverage is 0% with 1 line in your changes missing coverage. Please review.

Project coverage is 39.02%. Comparing base (32417bb) to head (5a8735a).
Report is 4 commits behind head on trunk.

Files with missing lines Patch % Lines
...ess/android/ui/subscribers/SubscribersViewModel.kt 0.00% 1 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff           @@
##            trunk   #22037   +/-   ##
=======================================
  Coverage   39.02%   39.02%           
=======================================
  Files        2153     2153           
  Lines      101494   101494           
  Branches    15585    15585           
=======================================
  Hits        39613    39613           
  Misses      58384    58384           
  Partials     3497     3497           

☔ 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.

@nbradbury nbradbury marked this pull request as ready for review July 21, 2025 14:54
@nbradbury nbradbury requested a review from a team as a code owner July 21, 2025 14:54
@nbradbury nbradbury requested review from adalpari and removed request for a team July 21, 2025 14:54
Copy link
Contributor

@adalpari adalpari left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Screenshot 2025-07-22 at 11 46 10

@adalpari
Copy link
Contributor

FYI: there was a conflict with this other change, and I've resolved it when merging trunk

Copy link

@nbradbury nbradbury enabled auto-merge (squash) July 22, 2025 10:01
@nbradbury nbradbury merged commit ca0996d into trunk Jul 22, 2025
26 checks passed
@nbradbury nbradbury deleted the issue/subscribers-country branch July 22, 2025 10:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Subscribers View and manage newsletter subscribers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants