Skip to content

Issue/4438 pn read signal clear all #4444

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
kwonye merged 4 commits into from
Aug 11, 2016
Merged

Issue/4438 pn read signal clear all #4444

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c048b73
added handling of badge-reset type notification
mzorz Jul 26, 2016
35ce095
renamed handle push method
mzorz Jul 27, 2016
373015b
Merge branch 'develop' into issue/4438-pn-read-signal-clear-all
mzorz Aug 2, 2016
de9c109
Merge branch 'develop' into issue/4438-pn-read-signal-clear-all
mzorz Aug 9, 2016
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
11 changes: 11 additions & 0 deletions WordPress/src/main/java/org/wordpress/android/GCMMessageService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ public class GCMMessageService extends GcmListenerService {
private static final String PUSH_TYPE_FOLLOW = "follow";
private static final String PUSH_TYPE_REBLOG = "reblog";
private static final String PUSH_TYPE_PUSH_AUTH = "push_auth";
private static final String PUSH_TYPE_BADGE_RESET = "badge-reset";

// Add to the analytics properties map a subset of the push notification payload.
private static String[] propertiesToCopyIntoAnalytics = {PUSH_ARG_NOTE_ID, PUSH_ARG_TYPE, "blog_id", "post_id",
Expand Down Expand Up @@ -99,6 +100,10 @@ private void handleDefaultPush(String from, @NonNull Bundle data) {
return;
}

if (noteType.equals(PUSH_TYPE_BADGE_RESET)) {
handleBadgeResetPN();
return;
}

String title = StringEscapeUtils.unescapeHtml(data.getString(PUSH_ARG_TITLE));
if (title == null) {
Expand Down Expand Up @@ -329,6 +334,12 @@ private void showNotificationForBuilder(NotificationCompat.Builder builder, Cont
notificationManager.notify(notificationId, builder.build());
}

// Clear all notifications
private void handleBadgeResetPN() {
removeAllNotifications(this);
EventBus.getDefault().post(new NotificationEvents.NotificationsChanged());
}

// Show a notification for two-step auth users who sign in from a web browser
private void handlePushAuth(String from, Bundle data) {
if (data == null) {
Expand Down