Skip to content

Fix/16689 notifications not dismissing when logged out #16694

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AjeshRPai merged 4 commits into from
Jun 13, 2022
Merged

Fix/16689 notifications not dismissing when logged out #16694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92cefb5
fix: #16689 notifications now are cancelled when a user logs out
Jun 2, 2022
7215838
Merge branch 'wordpress-mobile:trunk' into fix/16689-notifications-no…
carl-duncan Jun 2, 2022
feb8d76
Merge branch 'wordpress-mobile:trunk' into fix/16689-notifications-no…
carl-duncan Jun 10, 2022
24f984d
refactor: added cancelAllNotifications to NotificationsUtils
Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion WordPress/src/main/java/org/wordpress/android/ui/main/MeFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand All @@ -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(),
Expand Down
4 changes: 4 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/ui/notifications/utils/NotificationsUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down