From 742615c6f4cf6e69f2cd83cb7b21193b2e506075 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Sun, 2 Apr 2017 00:03:41 +0200 Subject: [PATCH] prevent rare NPE in onNotificationRemoved() --- .../gadgetbridge/externalevents/NotificationListener.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java index 4aec1b56..62b06d0c 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java @@ -417,6 +417,10 @@ public class NotificationListener extends NotificationListenerService { @Override public void onNotificationRemoved(StatusBarNotification sbn) { //FIXME: deduplicate code + if (!isServiceRunning() || sbn == null) { + return; + } + String source = sbn.getPackageName(); Notification notification = sbn.getNotification(); if ((notification.flags & Notification.FLAG_ONGOING_EVENT) == Notification.FLAG_ONGOING_EVENT) {