[Nullability Annotations to Java Classes] Use Updated and Null Proof `ThemeModel` Class (`breaking`) #19583

ParaskP7 · 2023-11-09T14:06:11Z

Parent FluxC#2799
Accompanying FluxC#2897

This PR accompanying the above FluxC PR, and uses an updated and null-proof ThemeModel.java class.

FYI: This change is breaking, meaning that any client that depended on the ThemeModel.java model should update to the new APIs. As such, this change is inherently risk, meaning that there are compile-time changes associated with this change and thus needs testing to verify correctness, both on the library's and client's side.

@antonis I added you as the main reviewer, not so randomly (it being a continuation of FluxC#2893 and #19529), since I just wanted someone from the Jetpack/WordPress mobile team to be aware of and sign-off on that change. Feel free to merge this PR directly yourself if you deem so.

FluxC Update List:

Update fluxc version to pr hash (2897)

Nullability Checks List:

To Test (`REST`):

Smoke test any theme 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`):

N/A

1. [JP/WP] Themes Screen [ThemeBrowserActivity.java + ThemeBrowserFragment.kt]

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

Go to Themes screen, verify it is shown and functioning as expected.
For example try scrolling up-and-down and searching for a theme.
Check your current theme and tap on the Customize, Details and Support buttons. Verify that everything works as expected.
From the themes list, find your current theme on top, click on its menu items and again tap on the Customize, Details and Support buttons. Verify that everything works as expected.
From the themes list, find another theme, other than your current one, click on its menu items and again tap on the Details and Support buttons. Verify that everything works as expected.
Then, tap on the View and Try & Customize buttons. Verify that everything works as expected.
Finally, tap on Activate button. Verify that the selected theme is activated and that everything works as expected.

2. [JP] Site Creation Screens [SiteCreationActivity.kt + HomePagePickerFragment.kt + DesignPreviewFragment.kt]

ℹ️ This test applies to the Jetpack app only.

From Choose Site, tap on the + button on top and via the Create WordPress.com site, go to Site Creation screen, verify it is shown and functioning as expected.
For example, while on the What's your website about? screen, select a topic from the list of topics (ie. Food).
Then, while on the Choose a theme screen, select a theme from the list of themes (per category, ie About).
Finally, verify that the Preview screen is shown and functioning as expected.

Merge instructions:

Wait for the accompanying FluxC#2897 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 'Theme' model is updated to its new null proof version. FluxC PR: https://github.com/wordpress-mobile/ WordPress-FluxC-Android/pull/2897 This step is required in order to check that these 'FluxC' related changes work as expected for WPAndroid.

wpmobilebot · 2023-11-09T14:26:17Z

📲 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	pr19583-7a620fa
	Commit	`7a620fa`
	Direct Download	`jetpack-prototype-build-pr19583-7a620fa.apk`

Note: Google Login is not supported on these builds.

wpmobilebot · 2023-11-09T14:26:57Z

📲 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	pr19583-7a620fa
	Commit	`7a620fa`
	Direct Download	`wordpress-prototype-build-pr19583-7a620fa.apk`

Note: Google Login is not supported on these builds.

…odel-class # Conflicts: # build.gradle

antonis

Thank you for striving to improve our codebase @ParaskP7 🙇
I've tested the implementation according to the plan (also the merged fix #19497) and everything worked as expected for me. The code also looks great 🎉

wpmobilebot · 2023-12-04T15:17:22Z

Found 1 violations:

The PR caused the following dependency changes:

-+--- org.wordpress:fluxc:{strictly trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28} -> trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28
-|    +--- 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-cdc8effb2affbb1c6bcf01f6606c847f87071d28
-|    +--- 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-b4e51008f7200eba1dfdd22ca370fce450ce93b0} -> trunk-b4e51008f7200eba1dfdd22ca370fce450ce93b0
+|    +--- 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-b4e51008f7200eba1dfdd22ca370fce450ce93b0
+|    +--- 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:1.10.0
-     \--- org.wordpress:fluxc:2.57.0 -> trunk-cdc8effb2affbb1c6bcf01f6606c847f87071d28 (*)
+     \--- org.wordpress:fluxc:2.57.0 -> trunk-b4e51008f7200eba1dfdd22ca370fce450ce93b0 (*)

Please review and act accordingly

ParaskP7 added 7 commits November 9, 2023 15:52

Analysis: Mark theme theme id as non-null where possible

10d8f9b

Analysis: Mark theme screenshot url as non-null where possible

3d7c164

Analysis: Mark theme view holder as non-null where possible

1e2edeb

Analysis: Mark theme as non-null on open theme and wp com url

744ded3

Analysis: Mark theme demo rul as nullable where possible

6ab1d0e

Analysis: Mark theme demo rul as nullable where possible

24c597d

ParaskP7 added Core Tech Debt [Status] Not Ready for Merge labels Nov 9, 2023

ParaskP7 requested a review from antonis November 9, 2023 14:06

ParaskP7 mentioned this pull request Nov 9, 2023

[Nullability Annotations to Java Classes] Add Missing Nullability Annotations to Theme Model Classes (breaking) wordpress-mobile/WordPress-FluxC-Android#2897

Merged

4 tasks

Merge branch 'trunk' into analysis/use-updated-and-null-proof-theme-m…

c851ebf

…odel-class # Conflicts: # build.gradle

antonis added this to the 23.9 milestone Dec 4, 2023

antonis approved these changes Dec 4, 2023

View reviewed changes

Updates FluxC reference

7a620fa

antonis removed the [Status] Not Ready for Merge label Dec 4, 2023

antonis merged commit e50da1d into trunk Dec 4, 2023
20 checks passed

antonis deleted the analysis/use-updated-and-null-proof-theme-model-class branch December 4, 2023 15:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Nullability Annotations to Java Classes] Use Updated and Null Proof `ThemeModel` Class (`breaking`) #19583

[Nullability Annotations to Java Classes] Use Updated and Null Proof `ThemeModel` Class (`breaking`) #19583

ParaskP7 commented Nov 9, 2023

wpmobilebot commented Nov 9, 2023 •

edited

Loading

wpmobilebot commented Nov 9, 2023 •

edited

Loading

antonis left a comment

wpmobilebot commented Dec 4, 2023

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

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

Conversation

ParaskP7 commented Nov 9, 2023

To Test (REST):

To Test (XMLRPC):

Merge instructions:

Regression Notes

PR submission checklist:

UI Changes testing checklist:

wpmobilebot commented Nov 9, 2023 • edited Loading

wpmobilebot commented Nov 9, 2023 • edited Loading

antonis left a comment

Choose a reason for hiding this comment

wpmobilebot commented Dec 4, 2023

The PR caused the following dependency changes:

[Nullability Annotations to Java Classes] Use Updated and Null Proof `ThemeModel` Class (`breaking`) #19583

[Nullability Annotations to Java Classes] Use Updated and Null Proof `ThemeModel` Class (`breaking`) #19583

To Test (`REST`):

To Test (`XMLRPC`):

wpmobilebot commented Nov 9, 2023 •

edited

Loading

wpmobilebot commented Nov 9, 2023 •

edited

Loading