diff --git a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java index 77b6112a5..b0466cb52 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java +++ b/mastodon/src/main/java/org/joinmastodon/android/PushNotificationReceiver.java @@ -86,7 +86,7 @@ public class PushNotificationReceiver extends BroadcastReceiver{ } String accountID=account.getID(); PushNotification pn=AccountSessionManager.getInstance().getAccount(accountID).getPushSubscriptionManager().decryptNotification(k, p, s); - E.post(new NotificationReceivedEvent(pn.notificationId+"")); + E.post(new NotificationReceivedEvent(accountID, pn.notificationId+"")); new GetNotificationByID(pn.notificationId+"") .setCallback(new Callback<>(){ @Override diff --git a/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java b/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java index 0ea284f07..7641a4bdb 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java +++ b/mastodon/src/main/java/org/joinmastodon/android/events/NotificationReceivedEvent.java @@ -1,8 +1,9 @@ package org.joinmastodon.android.events; public class NotificationReceivedEvent { - public String id; - public NotificationReceivedEvent(String id) { + public String account, id; + public NotificationReceivedEvent(String account, String id) { + this.account = account; this.id = id; } } diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java index 02b6883c6..967a89ee6 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/HomeFragment.java @@ -323,7 +323,7 @@ public class HomeFragment extends AppKitFragment implements OnBackPressedListene @Subscribe public void onNotificationReceived(NotificationReceivedEvent notificationReceivedEvent) { - setNotificationBadge(true); + if (notificationReceivedEvent.account.equals(accountID)) setNotificationBadge(true); } @Subscribe