From 97fda0beffcb26385bcfb7193137bc5cf85efa90 Mon Sep 17 00:00:00 2001 From: Aditi Bhatia Date: Fri, 17 May 2024 16:59:33 -0700 Subject: [PATCH 1/3] Add null check --- .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 4469e5763261..1433ed0265dc 100644 --- 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) { return; } mBloggingRemindersViewModel.onBlogSettingsItemClicked(mSite.getId()); From d9d362951ea6a84b70b919b25f7a536408d497bc Mon Sep 17 00:00:00 2001 From: Aditi Bhatia Date: Mon, 20 May 2024 14:41:03 -0700 Subject: [PATCH 2/3] Add null check to mBloggingRemindersViewModel --- .../org/wordpress/android/ui/prefs/SiteSettingsFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 1433ed0265dc..7c072d98a450 100644 --- 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() || mSite == null) { + if (mBloggingRemindersPref == null || !isAdded() || mSite == null || mBloggingRemindersViewModel == null) { return; } mBloggingRemindersViewModel.onBlogSettingsItemClicked(mSite.getId()); From 421e2dfce5ab87003a6f35918610ae3706bedaf2 Mon Sep 17 00:00:00 2001 From: Aditi Bhatia Date: Tue, 21 May 2024 16:04:19 -0700 Subject: [PATCH 3/3] Update RELEASE-NOTES.txt --- RELEASE-NOTES.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 888b25ae704e..a3128872399b 100644 --- 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]