Align with FluxC breaking changes #19668

hichamboushaba · 2023-11-24T15:14:18Z

wordpress-mobile/WordPress-FluxC-Android#2907 brings some breaking changes by adding a payload to the Action FETCH_WP_COM_THEMES, this PR is just to align with them.

The PR also brings an additional change: it fixes theme installation on Atomic sites.

To Test:

Open the app and sign in using WordPress.com.
Pick an atomic site.
From the options on the My Site tab, tap "More"
Tap on Themes.
Confirm themes are loaded successfully.
Try to install one of the themes, and confirm it works.

PR Submission Checklist:

I have completed the Regression Notes.
I have considered adding accessibility improvements for my changes.
I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

wpmobilebot · 2023-11-24T16:29:16Z

📲 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	pr19668-9803b6a
	Commit	`9803b6a`
	Direct Download	`wordpress-prototype-build-pr19668-9803b6a.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2023-11-24T16:30:22Z

📲 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	pr19668-9803b6a
	Commit	`9803b6a`
	Direct Download	`jetpack-prototype-build-pr19668-9803b6a.apk`

Note: Google Login is not supported on these builds.

0nko

The themes are loaded, but I do see an error message "Failed to fetch themes":

Stacktrace:

Volley error on https://public-api.wordpress.com/rest/v1.1/sites/107699613/themes/mine/?locale=en_US
com.android.volley.ParseError: com.google.gson.JsonSyntaxException: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was BEGIN_ARRAY at line 1 column 1313 path $.taxonomies
at org.wordpress.android.fluxc.network.rest.GsonRequest.parseNetworkResponse(GsonRequest.java:100)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:144)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:111)
at com.android.volley.NetworkDispatcher.run(NetworkDispatcher.java:90)
Caused by: com.google.gson.JsonSyntaxException: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was BEGIN_ARRAY at line 1 column 1313 path $.taxonomies
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:397)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.readIntoField(ReflectiveTypeAdapterFactory.java:212)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter.readField(ReflectiveTypeAdapterFactory.java:433)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:393)
at com.google.gson.Gson.fromJson(Gson.java:1227)
at com.google.gson.Gson.fromJson(Gson.java:1137)
at com.google.gson.Gson.fromJson(Gson.java:1047)
at com.google.gson.Gson.fromJson(Gson.java:982)
at org.wordpress.android.fluxc.network.rest.GsonRequest.parseNetworkResponse(GsonRequest.java:95)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:144)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:111)
at com.android.volley.NetworkDispatcher.run(NetworkDispatcher.java:90)
Caused by: java.lang.IllegalStateException: Expected BEGIN_OBJECT but was BEGIN_ARRAY at line 1 column 1313 path $.taxonomies
at com.google.gson.stream.JsonReader.beginObject(JsonReader.java:393)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:386)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$1.readIntoField(ReflectiveTypeAdapterFactory.java:212)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$FieldReflectionAdapter.readField(ReflectiveTypeAdapterFactory.java:433)
at com.google.gson.internal.bind.ReflectiveTypeAdapterFactory$Adapter.read(ReflectiveTypeAdapterFactory.java:393)
at com.google.gson.Gson.fromJson(Gson.java:1227)
at com.google.gson.Gson.fromJson(Gson.java:1137)
at com.google.gson.Gson.fromJson(Gson.java:1047)
at com.google.gson.Gson.fromJson(Gson.java:982)
at org.wordpress.android.fluxc.network.rest.GsonRequest.parseNetworkResponse(GsonRequest.java:95)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:144)
at com.android.volley.NetworkDispatcher.processRequest(NetworkDispatcher.java:111)
at com.android.volley.NetworkDispatcher.run(NetworkDispatcher.java:90)

hichamboushaba · 2023-11-27T15:21:16Z

@0nko is this only after the PR changes? I didn't make any changes to the endpoint v1.1/sites/{site_id}/themes/mine that fails here for you 😕

Also, can you make sure you are using an atomic site for the test?

0nko

Oh I see, it's only happening on self-hosted and non-atomic sites. Also, I can reproduce it on previous builds, so I'll approve this and I'll create an issue. Nice job! 👏

wpmobilebot · 2023-11-27T16:09:34Z

	1 Warning
⚠️	This PR is assigned to the milestone 23.8. The due date for this milestone has already passed. Please make sure to get it merged by then or assign it to a milestone with a later deadline.

Generated by 🚫 Danger

wpmobilebot · 2023-11-27T16:10:46Z

Found 1 violations:

The PR caused the following dependency changes:

-+--- org.wordpress:fluxc:{strictly trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0} -> trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0
-|    +--- org.wordpress:wellsql:2.0.0
-|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
-|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0
-|    +--- org.greenrobot:eventbus:3.3.1
-|    |    \--- org.greenrobot:eventbus-java:3.3.1
-|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
-|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
-|    +--- androidx.paging:paging-runtime:2.1.2
-|    |    +--- androidx.paging:paging-common:2.1.2
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
-|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
-|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
-|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- com.goterl:lazysodium-android:5.0.2
-|    +--- net.java.dev.jna:jna:5.5.0
-|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
-|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
-|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
-|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
-|    +--- androidx.security:security-crypto:1.0.0
-|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
-|    |    \--- com.google.crypto.tink:tink-android:1.5.0
-|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
-|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
-|    +--- org.apache.commons:commons-text:1.10.0
-|    |    \--- org.apache.commons:commons-lang3:3.12.0
-|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
-|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
-|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
-|    |    +--- androidx.room:room-common:2.5.0
-|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
-|    |    +--- androidx.sqlite:sqlite:2.3.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
-|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
-|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
-|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
-|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
-|    +--- androidx.room:room-ktx:2.4.2
-|    |    +--- androidx.room:room-common:2.4.2 -> 2.5.0 (*)
-|    |    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0 (*)
-|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
-|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
-|    +--- com.google.dagger:dagger:2.42 -> 2.46.1
-|    |    \--- javax.inject:javax.inject:1
-|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
-|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
++--- org.wordpress:fluxc:{strictly trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb} -> trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb
+|    +--- org.wordpress:wellsql:2.0.0
+|    |    +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |    \--- org.wordpress.wellsql:wellsql-annotations:2.0.0
+|    +--- org.wordpress.fluxc:fluxc-annotations:trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb
+|    +--- org.greenrobot:eventbus:3.3.1
+|    |    \--- org.greenrobot:eventbus-java:3.3.1
+|    +--- com.squareup.okhttp3:okhttp:4.9.0 -> 4.11.0 (*)
+|    +--- com.android.volley:volley:1.1.1 -> 1.2.1
+|    +--- androidx.paging:paging-runtime:2.1.2
+|    |    +--- androidx.paging:paging-common:2.1.2
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- androidx.arch.core:core-common:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.0 -> 2.2.0 (*)
+|    |    +--- androidx.lifecycle:lifecycle-runtime:2.0.0 -> 2.6.2 (*)
+|    |    +--- androidx.lifecycle:lifecycle-livedata:2.0.0 -> 2.6.2 (*)
+|    |    \--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- com.goterl:lazysodium-android:5.0.2
+|    +--- net.java.dev.jna:jna:5.5.0
+|    +--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.20 -> 1.9.10 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.9.10 (*)
+|    +--- androidx.appcompat:appcompat:1.0.2 -> 1.6.1 (*)
+|    +--- androidx.recyclerview:recyclerview:1.0.0 -> 1.3.0 (*)
+|    +--- androidx.exifinterface:exifinterface:1.0.0 -> 1.3.6 (*)
+|    +--- androidx.security:security-crypto:1.0.0
+|    |    +--- androidx.annotation:annotation:1.1.0 -> 1.6.0 (*)
+|    |    \--- com.google.crypto.tink:tink-android:1.5.0
+|    +--- com.squareup.okhttp3:okhttp-urlconnection:4.9.0 -> 4.9.2 (*)
+|    +--- com.google.code.gson:gson:2.8.5 -> 2.10.1
+|    +--- org.apache.commons:commons-text:1.10.0
+|    |    \--- org.apache.commons:commons-lang3:3.12.0
+|    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0
+|    |    +--- androidx.annotation:annotation-experimental:1.1.0 -> 1.3.0 (*)
+|    |    +--- androidx.arch.core:core-runtime:2.0.1 -> 2.2.0 (*)
+|    |    +--- androidx.room:room-common:2.5.0
+|    |    |    +--- androidx.annotation:annotation:1.3.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.20 -> 1.9.10 (*)
+|    |    +--- androidx.sqlite:sqlite:2.3.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+|    |    \--- androidx.sqlite:sqlite-framework:2.3.0
+|    |         +--- androidx.annotation:annotation:1.2.0 -> 1.6.0 (*)
+|    |         +--- androidx.sqlite:sqlite:2.3.0 (*)
+|    |         \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.9.10 (*)
+|    +--- androidx.room:room-ktx:2.4.2
+|    |    +--- androidx.room:room-common:2.4.2 -> 2.5.0 (*)
+|    |    +--- androidx.room:room-runtime:2.4.2 -> 2.5.0 (*)
+|    |    +--- org.jetbrains.kotlin:kotlin-stdlib:1.6.10 -> 1.9.10 (*)
+|    |    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2 -> 1.7.3 (*)
+|    +--- com.google.dagger:dagger:2.42 -> 2.46.1
+|    |    \--- javax.inject:javax.inject:1
+|    +--- org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9 -> 1.7.3 (*)
+|    \--- org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.9 -> 1.7.3 (*)
 \--- org.wordpress:login:trunk-6c5dc3311836d1eb0973f3164bdb2d7f72251951
-     \--- org.wordpress:fluxc:trunk-4b892d8c87bd88dd1b62a0c3f3eb2a81ee6a430a -> trunk-3115d5cbd99f41e97752bd38d6a2af06053bbcb0 (*)
+     \--- org.wordpress:fluxc:trunk-4b892d8c87bd88dd1b62a0c3f3eb2a81ee6a430a -> trunk-8076d17a1b4ede515be0e1d93c8d35a3c6fc2adb (*)

Please review and act accordingly

peril-wordpress-mobile · 2023-11-27T16:19:04Z

	Warnings
⚠️	This PR is assigned to a milestone which is closing in less than 4 days Please, make sure to get it merged by then or assign it to a later expiring milestone

Generated by 🚫 dangerJS

hichamboushaba added the [Type] Task label Nov 24, 2023

hichamboushaba force-pushed the flux-wpcom-theme-changes branch from da3624b to 8d6393f Compare November 24, 2023 16:10

hichamboushaba mentioned this pull request Nov 24, 2023

Improvements to the WPCom themes fetching endpoint wordpress-mobile/WordPress-FluxC-Android#2907

Merged

hichamboushaba marked this pull request as ready for review November 24, 2023 16:33

hichamboushaba requested review from 0nko and JorgeMucientes November 24, 2023 16:34

hichamboushaba added the Do Not Merge In PRs with this label, our automation will fail a require check, preventing accidental merging label Nov 24, 2023

hichamboushaba added this to the 23.8 milestone Nov 24, 2023

hichamboushaba added 2 commits November 24, 2023 18:32

Bump fluxc

3188bdb

Pass payload to the WPCom themes fetch action

c0c05d3

hichamboushaba force-pushed the flux-wpcom-theme-changes branch from 8d6393f to c0c05d3 Compare November 24, 2023 17:32

Add a release notes entry

20c1c4e

0nko self-assigned this Nov 27, 2023

0nko reviewed Nov 27, 2023

View reviewed changes

0nko approved these changes Nov 27, 2023

View reviewed changes

Bump fluxc

9803b6a

hichamboushaba removed the Do Not Merge In PRs with this label, our automation will fail a require check, preventing accidental merging label Nov 27, 2023

0nko enabled auto-merge November 27, 2023 15:36

0nko merged commit 5ae0880 into trunk Nov 27, 2023
20 checks passed

0nko deleted the flux-wpcom-theme-changes branch November 27, 2023 16:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Align with FluxC breaking changes #19668

Align with FluxC breaking changes #19668

hichamboushaba commented Nov 24, 2023 •

edited

Loading

wpmobilebot commented Nov 24, 2023 •

edited

Loading

wpmobilebot commented Nov 24, 2023 •

edited

Loading

0nko left a comment

hichamboushaba commented Nov 27, 2023 •

edited

Loading

0nko left a comment

wpmobilebot commented Nov 27, 2023

wpmobilebot commented Nov 27, 2023

peril-wordpress-mobile bot commented Nov 27, 2023

Align with FluxC breaking changes #19668

Align with FluxC breaking changes #19668

Conversation

hichamboushaba commented Nov 24, 2023 • edited Loading

To Test:

PR Submission Checklist:

wpmobilebot commented Nov 24, 2023 • edited Loading

wpmobilebot commented Nov 24, 2023 • edited Loading

0nko left a comment

Choose a reason for hiding this comment

hichamboushaba commented Nov 27, 2023 • edited Loading

0nko left a comment

Choose a reason for hiding this comment

wpmobilebot commented Nov 27, 2023

wpmobilebot commented Nov 27, 2023

The PR caused the following dependency changes:

peril-wordpress-mobile bot commented Nov 27, 2023

hichamboushaba commented Nov 24, 2023 •

edited

Loading

wpmobilebot commented Nov 24, 2023 •

edited

Loading

wpmobilebot commented Nov 24, 2023 •

edited

Loading

hichamboushaba commented Nov 27, 2023 •

edited

Loading