From 4616dcc965c9a34b75df0b92969330b1d56afeb8 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Mon, 23 Nov 2015 22:09:47 +0100
Subject: [PATCH] Handle case where notification.extras is not available #174

---
 .../gadgetbridge/GBApplication.java           |  4 +++-
 .../externalevents/NotificationListener.java  | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
index 60e08b8f4..e287fe107 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
@@ -156,6 +156,9 @@ public class GBApplication extends Application {
         dbLock.unlock();
     }
 
+    public static boolean isRunningOnKitkatOrLater() {
+        return VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT;
+    }
     public static boolean isRunningLollipopOrLater() {
         return VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     }
@@ -190,5 +193,4 @@ public class GBApplication extends Application {
         blacklist.remove(packageName);
         saveBlackList();
     }
-
 }
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 11a88c191..812fda76d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/externalevents/NotificationListener.java
@@ -1,6 +1,7 @@
 package nodomain.freeyourgadget.gadgetbridge.externalevents;
 
 import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.app.Notification;
 import android.app.PendingIntent;
@@ -11,6 +12,7 @@ import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.PowerManager;
 import android.preference.PreferenceManager;
@@ -216,17 +218,26 @@ public class NotificationListener extends NotificationListenerService {
 
         LOG.info("Processing notification from source " + source);
 
+        if (GBApplication.isRunningOnKitkatOrLater()) {
+            dissectNotificationTo(notification, notificationSpec);
+        }
+        notificationSpec.id = (int) sbn.getPostTime(); //FIMXE: a truly unique id would be better
+        GBApplication.deviceService().onNotification(notificationSpec);
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    private void dissectNotificationTo(Notification notification, NotificationSpec notificationSpec) {
         Bundle extras = notification.extras;
-        notificationSpec.title = extras.getCharSequence(Notification.EXTRA_TITLE).toString();
+        CharSequence title = extras.getCharSequence(Notification.EXTRA_TITLE);
+        if (title != null) {
+            notificationSpec.title = title.toString();
+        }
         if (extras.containsKey(Notification.EXTRA_TEXT)) {
             CharSequence contentCS = extras.getCharSequence(Notification.EXTRA_TEXT);
             if (contentCS != null) {
                 notificationSpec.body = contentCS.toString();
             }
         }
-
-        notificationSpec.id = (int) sbn.getPostTime(); //FIMXE: a truly unique id would be better
-        GBApplication.deviceService().onNotification(notificationSpec);
     }
 
     private boolean isServiceRunning() {