From f1d07c83f629d4ca4c9444061b8ef296ab4c6265 Mon Sep 17 00:00:00 2001
From: cpfeiffer <cpfeiffer@users.noreply.github.com>
Date: Sat, 18 Mar 2017 11:41:47 +0100
Subject: [PATCH] Fix NPE #603

---
 .../freeyourgadget/gadgetbridge/util/NotificationUtils.java     | 2 +-
 .../nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
index 7e7b8df0..7939f4eb 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/NotificationUtils.java
@@ -42,7 +42,7 @@ public class NotificationUtils {
             case CONVERSATIONS:
             case FACEBOOK:
             case FACEBOOK_MESSENGER:
-                return notificationSpec.body;
+                return StringUtils.ensureNotNull(notificationSpec.body);
         }
         return "";
     }
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
index 0a9eaae2..d7b6757d 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/StringUtils.java
@@ -20,6 +20,7 @@ import android.support.annotation.NonNull;
 
 public class StringUtils {
 
+    @NonNull
     public static String truncate(String s, int maxLength){
         if (s == null) {
             return "";