From 8cf7e259aa3ae1ccd77e15042d238fab0af2176f Mon Sep 17 00:00:00 2001
From: Andreas Shimokawa <shimokawa@fsfe.org>
Date: Wed, 4 Mar 2020 23:13:57 +0100
Subject: [PATCH] Huami: Fix crash when calendar event desctription or title
 was null

Fixes #1813
---
 .../service/devices/huami/HuamiSupport.java       | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
index 4aa1ccf10..6069ae144 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/HuamiSupport.java
@@ -1727,9 +1727,20 @@ public class HuamiSupport extends AbstractBTLEDeviceSupport {
             if (iteration > 8) { // limit ?
                 break;
             }
+
             calendar.setTimeInMillis(calendarEvent.getBegin());
-            byte[] title = calendarEvent.getTitle().getBytes();
-            byte[] body = calendarEvent.getDescription().getBytes();
+            byte[] title;
+            byte[] body;
+            if (calendarEvent.getTitle() != null) {
+                title = calendarEvent.getTitle().getBytes();
+            } else {
+                title = new byte[]{};
+            }
+            if (calendarEvent.getDescription() != null) {
+                body = calendarEvent.getDescription().getBytes();
+            } else {
+                body = new byte[]{};
+            }
 
             int length = 18 + title.length + 1 + body.length + 1;
             ByteBuffer buf = ByteBuffer.allocate(length);