[Nullability Annotations to Java Classes] Use Updated and Null Proof `Media` Payload Classes (`safe`) #19428

ParaskP7 · 2023-10-23T13:46:04Z

Parent FluxC#2798
Accompanying FluxC#2878

This PR accompanying the above FluxC PR, and uses the updated and null-proof Media payload classes.

FYI: This change is safe, meaning that there shouldn't be any (major) compile-time changes associated with this change.

@AjeshRPai I added you as the main reviewer, not so randomly, due to the fact that you're also reviewing FluxC#2878, and I wanted you from the Jetpack/WordPress mobile team again to be aware of and sign-off on that change for JP/WPAndroid. Feel free to merge this PR directly yourself if you deem so.

FluxC Update List:

Test List:

Update post media handler test to updated media payload

To Test (`REST`):

Smoke test any media related functionality on both, the WordPress and Jetpack apps, and see if everything is working as expected. For a couple of examples, you can expand and follow the inner and more explicit test steps within:

To Test (`XMLRPC`):

Create a new self-hosted WordPress site for XMLRPC testing purposes (jurassic.ninja).
Smoke test any media related functionality on both, the WordPress and Jetpack apps, and see if everything is working as expected. For a couple of examples, you can expand and follow the inner and more explicit test steps within:

Media Screens [MediaBrowserActivity.java + MediaGridFragment.kt + MediaSettingsActivity.java + MediaPreviewActivity.java + MediaPreviewFragment.java]

ℹ️ This test applies to both, the Jetpack and WordPress app.

Go to Media screen, verify it is shown and functioning as expected.
For example try changing tabs, searching and adding a new media.
Tap on any media and verify that the Media Settings screen is shown and functioning as expected.
For example try updating the media title or adding a media description.
Tap on the media preview and verify that the Media Preview screen is shown and functioning as expected.
For example try swipe left-right to navigate between media previews.

Merge instructions:

Wait for the accompanying FluxC#2878 PR to be merged.
Update wordPressFluxCVersion to point to the trunk hash that includes the above solution.
Remove the [Status] Not Ready for Merge label.
Merge this PR.

Regression Notes

Potential unintended areas of impact
- N/A
What I did to test those areas of impact (or what existing automated tests I relied on)
- See To test section above.
What automated tests I added (or what prevented me from doing so)
- N/A

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.

UI Changes testing checklist:

Portrait and landscape orientations.
Light and dark modes.
Fonts: Larger, smaller and bold text.
High contrast.
Talkback.
Languages with large words or with letters/accents not frequently used in English.
Right-to-left languages. (Even if translation isn’t complete, formatting should still respect the right-to-left layout)
Large and small screen sizes. (Tablet and smaller phones)
Multi-tasking: Split screen and Pop-up view. (Android 10 or higher)

This 'FluxC' PR hash updates the library to that branch version where the 'Media' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2878 This step is required in order to check that these 'FluxC' related changes work as expected for WPAndroid.

wpmobilebot · 2023-10-23T14:05:49Z

📲 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	pr19428-2e605ea
	Commit	`2e605ea`
	Direct Download	`wordpress-prototype-build-pr19428-2e605ea.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2023-10-23T14:07:11Z

📲 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	pr19428-2e605ea
	Commit	`2e605ea`
	Direct Download	`jetpack-prototype-build-pr19428-2e605ea.apk`

Note: Google Login is not supported on these builds.

AjeshRPai

Smoke tested the media screen in the App, everything looks good to me

ParaskP7 · 2023-10-26T10:36:00Z

Great, thanks for reviewing and testing this @AjeshRPai , I am glad that everything is working as expected! 🙇 ❤️ 🚀

… into analysis/use-updated-and-null-proff-media-payloadl-classes

This 'FluxC' hash updates the library to that 'trunk' version where the 'Media' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2878

wpmobilebot · 2023-10-27T09:06:56Z

Found 1 violations:

The PR caused the following dependency changes:

-+--- org.wordpress:fluxc:{strictly trunk-5f7448d86213648f402c2e04af738ec5904ebb31} -> trunk-5f7448d86213648f402c2e04af738ec5904ebb31
-|    +--- 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-5f7448d86213648f402c2e04af738ec5904ebb31
-|    +--- 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.8.21 (*)
-|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.8.21 (*)
-|    +--- 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.8.21 (*)
-|    |    +--- androidx.sqlite:sqlite:2.3.0
-|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
-|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.21 (*)
-|    |    \--- 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.8.21 (*)
-|    +--- 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.8.21 (*)
-|    |    \--- 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-b85a542abce556295bb4afc44e553bc2a395c3b4} -> trunk-b85a542abce556295bb4afc44e553bc2a395c3b4
+|    +--- 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-b85a542abce556295bb4afc44e553bc2a395c3b4
+|    +--- 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.8.21 (*)
+|    +--- org.jetbrains.kotlin:kotlin-android-extensions-runtime:1.6.20 -> 1.8.21 (*)
+|    +--- 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.8.21 (*)
+|    |    +--- androidx.sqlite:sqlite:2.3.0
+|    |    |    +--- androidx.annotation:annotation:1.0.0 -> 1.6.0 (*)
+|    |    |    \--- org.jetbrains.kotlin:kotlin-stdlib:1.7.20 -> 1.8.21 (*)
+|    |    \--- 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.8.21 (*)
+|    +--- 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.8.21 (*)
+|    |    \--- 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:1.6.0
-     \--- org.wordpress:fluxc:2.21.0 -> trunk-5f7448d86213648f402c2e04af738ec5904ebb31 (*)
+     \--- org.wordpress:fluxc:2.21.0 -> trunk-b85a542abce556295bb4afc44e553bc2a395c3b4 (*)

Please review and act accordingly

peril-wordpress-mobile · 2023-10-27T09:36:55Z

	Warnings
⚠️	PR is not assigned to a milestone.

Generated by 🚫 dangerJS

ParaskP7 added 2 commits October 23, 2023 16:35

Test: Update post media handler test to updated media payload

966023e

ParaskP7 added Core Tech Debt [Status] Not Ready for Merge labels Oct 23, 2023

ParaskP7 requested a review from AjeshRPai October 23, 2023 13:46

ParaskP7 mentioned this pull request Oct 23, 2023

[Nullability Annotations to Java Classes] Add Missing Nullability Annotations to Media Network Client Classes (safe) wordpress-mobile/WordPress-FluxC-Android#2878

Merged

4 tasks

AjeshRPai approved these changes Oct 26, 2023

View reviewed changes

ParaskP7 added 2 commits October 27, 2023 11:35

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

72ef969

… into analysis/use-updated-and-null-proff-media-payloadl-classes

Build: Update fluxc version to trunk hash (#2878)

2e605ea

This 'FluxC' hash updates the library to that 'trunk' version where the 'Media' payload classes are updated to their new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2878

ParaskP7 removed the [Status] Not Ready for Merge label Oct 27, 2023

ParaskP7 merged commit 88afc76 into trunk Oct 27, 2023
2 checks passed

ParaskP7 deleted the analysis/use-updated-and-null-proff-media-payloadl-classes branch October 27, 2023 09:36

ParaskP7 mentioned this pull request Nov 1, 2023

[Nullability Annotations to Java Classes] Use Updated and Null Proof MediaModel Class (breaking) #19506

Merged

16 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Nullability Annotations to Java Classes] Use Updated and Null Proof `Media` Payload Classes (`safe`) #19428

[Nullability Annotations to Java Classes] Use Updated and Null Proof `Media` Payload Classes (`safe`) #19428

ParaskP7 commented Oct 23, 2023 •

edited

Loading

wpmobilebot commented Oct 23, 2023 •

edited

Loading

wpmobilebot commented Oct 23, 2023 •

edited

Loading

AjeshRPai left a comment

ParaskP7 commented Oct 26, 2023

wpmobilebot commented Oct 27, 2023

peril-wordpress-mobile bot commented Oct 27, 2023

[Nullability Annotations to Java Classes] Use Updated and Null Proof Media Payload Classes (safe) #19428

[Nullability Annotations to Java Classes] Use Updated and Null Proof Media Payload Classes (safe) #19428

Conversation

ParaskP7 commented Oct 23, 2023 • edited Loading

To Test (REST):

To Test (XMLRPC):

Merge instructions:

Regression Notes

PR submission checklist:

UI Changes testing checklist:

wpmobilebot commented Oct 23, 2023 • edited Loading

wpmobilebot commented Oct 23, 2023 • edited Loading

AjeshRPai left a comment

Choose a reason for hiding this comment

ParaskP7 commented Oct 26, 2023

wpmobilebot commented Oct 27, 2023

The PR caused the following dependency changes:

peril-wordpress-mobile bot commented Oct 27, 2023

[Nullability Annotations to Java Classes] Use Updated and Null Proof `Media` Payload Classes (`safe`) #19428

[Nullability Annotations to Java Classes] Use Updated and Null Proof `Media` Payload Classes (`safe`) #19428

ParaskP7 commented Oct 23, 2023 •

edited

Loading

To Test (`REST`):

To Test (`XMLRPC`):

wpmobilebot commented Oct 23, 2023 •

edited

Loading

wpmobilebot commented Oct 23, 2023 •

edited

Loading