Merge pull request #20845 from wordpress-mobile/issue/20840-NPE

Fix NPE in Site Settings
wordpress-mobile · May 22, 2024 · 0f7f65b · 0f7f65b
2 parents c3decbc + 421e2df
commit 0f7f65b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -7,6 +7,7 @@
 * [*] Fix a crash that occurs when remove a user [https://github.com/wordpress-mobile/WordPress-Android/pull/20837]
 * [*] Fixed a rare crash on the featured image confirmation dialog [https://github.com/wordpress-mobile/WordPress-Android/pull/20836]
 * [*] Fixed an ANR issue on the Post List screen [https://github.com/wordpress-mobile/WordPress-Android/pull/20833]
+* [*] Fixed a crash that occurs with Blogging Reminders [https://github.com/wordpress-mobile/WordPress-Android/pull/20845]
 * [*] [internal] Block Editor: Upgrade target sdk version to Android API 34 [https://github.com/wordpress-mobile/WordPress-Android/pull/20841]
 * [*] [internal] In-app updates feature [https://github.com/wordpress-mobile/WordPress-Android/pull/20822]
 

diff --git a/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java b/WordPress/src/main/java/org/wordpress/android/ui/prefs/SiteSettingsFragment.java
@@ -1301,7 +1301,7 @@ private void initBloggingReminders() {
     }
 
     private void setupBloggingRemindersBottomSheet() {
-        if (mBloggingRemindersPref == null || !isAdded()) {
+        if (mBloggingRemindersPref == null || !isAdded() || mSite == null || mBloggingRemindersViewModel == null) {
             return;
         }
         mBloggingRemindersViewModel.onBlogSettingsItemClicked(mSite.getId());