Merge pull request #16694 from carl-duncan/fix/16689-notifications-not-dismissing-when-logged-out

Fix/16689 notifications not dismissing when logged out

Author: AjeshRPai

WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt

@@ -48,6 +48,7 @@ import org.wordpress.android.ui.accounts.HelpActivity.Origin.ME_SCREEN_HELP
 import org.wordpress.android.ui.main.MeViewModel.RecommendAppUiState
 import org.wordpress.android.ui.main.WPMainActivity.OnScrollToTopListener
 import org.wordpress.android.ui.main.utils.MeGravatarLoader
+import org.wordpress.android.ui.notifications.utils.NotificationsUtils
 import org.wordpress.android.ui.photopicker.MediaPickerConstants
 import org.wordpress.android.ui.photopicker.MediaPickerLauncher
 import org.wordpress.android.ui.photopicker.PhotoPickerActivity.PhotoPickerMediaSource
@@ -393,7 +394,10 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
                 .setMessage(message)
                 .setPositiveButton(
                         R.string.signout
-                ) { _, _ -> signOutWordPressCom() }
+                ) { _, _ ->
+                    clearNotifications()
+                    signOutWordPressCom()
+                }
                 .setNegativeButton(R.string.cancel, null)
                 .setCancelable(true)
                 .create().show()
@@ -403,6 +407,10 @@ class MeFragment : Fragment(R.layout.me_fragment), OnScrollToTopListener {
         viewModel.signOutWordPress(requireActivity().application as WordPress)
     }
 
+    private fun clearNotifications() {
+        NotificationsUtils.cancelAllNotifications(requireActivity())
+    }
+
     private fun showDisconnectDialog() {
         disconnectProgressDialog = ProgressDialog.show(
                 requireContext(),

WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java

@@ -172,6 +172,10 @@ static FormattableContent mapJsonToFormattableContent(FormattableContentMapper m
         return mapper.mapToFormattableContent(blockObject.toString());
     }
 
+    public static void cancelAllNotifications(Context context) {
+        NotificationManagerCompat.from(context).cancelAll();
+    }
+
     static SpannableStringBuilder getSpannableContentForRanges(
             FormattableContentMapper formattableContentMapper,
             JSONObject blockObject, TextView textView,