Fix siteComponent!! crash on the dashboard
#15138
Open
+132
−55
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The `SiteComponent` is now initialized before updating the state.
irfano
added
type: crash
irfano
commented
Dec 23, 2025
Comment on lines
+90
to
-101
| // Create a new site component tied to the lifecycle of the selected site | ||
| siteComponent = siteComponentProvider.get() | ||
| .setSite(siteModel) | ||
| .setCoroutineScope(createSiteCoroutineScope()) | ||
| .build() | ||
|
|
||
| wasReset = false | ||
| state.value = siteModel | ||
| PreferenceUtils.setInt(getPreferences(), SELECTED_SITE_LOCAL_ID, siteModel.id) | ||
|
|
||
| // Notify listeners | ||
| getEventBus().post(SelectedSiteChangedEvent(siteModel)) | ||
|
|
||
| // Create a new site component tied to the lifecycle of the selected site | ||
| siteComponent = siteComponentProvider.get() | ||
| .setSite(get()) | ||
| .setCoroutineScope(createSiteCoroutineScope()) | ||
| .build() |
Contributor
Author
There was a problem hiding this comment.
I made this change because state.value = siteModel triggers observers, and it was causing them to receive the old siteComponent. Now, I update siteComponent before updating the state so observers get the correct value.
irfano
commented
Dec 23, 2025
| val widgets: Flow<List<DashboardWidgetDataModel>> = dataStore.data | ||
| .catch { exception -> | ||
| val widgets: Flow<List<DashboardWidgetDataModel>> = dataStoreFlow.flatMapLatest { dataStore -> | ||
| val flow = dataStore?.data ?: flow { throw IOException("Site component is null") } |
Contributor
Author
There was a problem hiding this comment.
Now we pass null site component case to the existing catch block.
Collaborator
📲 You can test the changes from this Pull Request in WooCommerce-Wear Android by scanning the QR code below to install the corresponding build.
|
Collaborator
|
📲 You can test the changes from this Pull Request in WooCommerce Android by scanning the QR code below to install the corresponding build.
|
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## trunk #15138 +/- ##
============================================
+ Coverage 38.64% 38.67% +0.03%
- Complexity 10456 10466 +10
============================================
Files 2181 2181
Lines 123905 123892 -13
Branches 17100 17102 +2
============================================
+ Hits 47877 47914 +37
+ Misses 71205 71149 -56
- Partials 4823 4829 +6 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes WOOMOB-1843
Description
This PR resolves a long-standing
NullPointerExceptioncrash inDashboardDataStoreandDashboardRepositoryoccurring during app initialization or site switching.DashboardDataStoreandDashboardRepositorywere attempting to accessselectedSite.siteComponentusing the non-null assertion operator (!!) during their initialization.If the application started in a state where no site was strictly selected (e.g., fresh install, after logout, or race conditions during startup. I'm not sure because I couldn't reproduce it),
siteComponentwould be null, causing an immediate crash.Instead of assuming a site exists at initialization time, I refactored both classes to be Reactive:
Also I updated
SelectedSiteto support this reactive approach.Test Steps
Since I can't reproduce the crash, it's not possible to test this PR on running app. But I wrote unit tests to reproduce crash cases.
NullPointerExceptioncrash atselectedSite.siteComponent!!,line. Then check out the latest commit and confirm the crash was fixed.NullPointerExceptioncrash atselectedSite.siteComponent!!,line. Then checkout the latest commit and confirm the crash was fixed.Images/gif
RELEASE-NOTES.txtif necessary. Use the "[Internal]" label for non-user-facing changes.