From d73d4b3a13b9880fed39869865d0218d5096ce21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joa=CC=83o=20Paulo=20Barraca?= <jpbarraca@gmail.com>
Date: Fri, 5 May 2017 22:17:52 +0100
Subject: [PATCH] HPlus: Handles missing phone number. Fixes #675

---
 .../service/devices/hplus/HPlusSupport.java   | 59 ++++++++++---------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
index 21d4f81c9..b265ff379 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/hplus/HPlusSupport.java
@@ -667,14 +667,6 @@ public class HPlusSupport extends AbstractBTLEDeviceSupport {
 
     private void showIncomingCall(String name, String rawNumber) {
         try {
-            StringBuilder number = new StringBuilder();
-
-            //Clean up number as the device only accepts digits
-            for (char c : rawNumber.toCharArray()) {
-                if (Character.isDigit(c)) {
-                    number.append(c);
-                }
-            }
 
             TransactionBuilder builder = performInitialized("incomingCall");
 
@@ -684,37 +676,48 @@ public class HPlusSupport extends AbstractBTLEDeviceSupport {
             //Show Call Icon
             builder.write(ctrlCharacteristic, new byte[]{HPlusConstants.CMD_SET_INCOMING_CALL, HPlusConstants.ARG_INCOMING_CALL});
 
-            byte[] msg = new byte[13];
+            if(name != null) {
+                byte[] msg = new byte[13];
 
+                //Show call name
+                for (int i = 0; i < msg.length; i++)
+                    msg[i] = ' ';
 
-            //Show call name
+                byte[] nameBytes = encodeStringToDevice(name);
+                for (int i = 0; i < nameBytes.length && i < (msg.length - 1); i++)
+                    msg[i + 1] = nameBytes[i];
 
-            for (int i = 0; i < msg.length; i++)
-                msg[i] = ' ';
+                msg[0] = HPlusConstants.CMD_ACTION_DISPLAY_TEXT_NAME;
+                builder.write(ctrlCharacteristic, msg);
 
-            byte[] nameBytes = encodeStringToDevice(name);
-            for (int i = 0; i < nameBytes.length && i < (msg.length - 1); i++)
-                msg[i + 1] = nameBytes[i];
+                msg[0] = HPlusConstants.CMD_ACTION_DISPLAY_TEXT_NAME_CN;
+                builder.write(ctrlCharacteristic, msg);
+            }
 
-            msg[0] = HPlusConstants.CMD_ACTION_DISPLAY_TEXT_NAME;
-            builder.write(ctrlCharacteristic, msg);
+            if(rawNumber != null) {
+                StringBuilder number = new StringBuilder();
 
-            msg[0] = HPlusConstants.CMD_ACTION_DISPLAY_TEXT_NAME_CN;
-            builder.write(ctrlCharacteristic, msg);
+                //Clean up number as the device only accepts digits
+                for (char c : rawNumber.toCharArray()) {
+                    if (Character.isDigit(c)) {
+                        number.append(c);
+                    }
+                }
 
-            builder.wait(200);
-            msg = msg.clone();
+                byte[] msg = new byte[13];
 
-            //Show call number
-            for (int i = 0; i < msg.length; i++)
-                msg[i] = ' ';
+                //Show call number
+                for (int i = 0; i < msg.length; i++)
+                    msg[i] = ' ';
 
-            for (int i = 0; i < number.length() && i < (msg.length - 1); i++)
-                msg[i + 1] = (byte) number.charAt(i);
+                for (int i = 0; i < number.length() && i < (msg.length - 1); i++)
+                    msg[i + 1] = (byte) number.charAt(i);
 
-            msg[0] = HPlusConstants.CMD_SET_INCOMING_CALL_NUMBER;
+                msg[0] = HPlusConstants.CMD_SET_INCOMING_CALL_NUMBER;
 
-            builder.write(ctrlCharacteristic, msg);
+                builder.wait(200);
+                builder.write(ctrlCharacteristic, msg);
+            }
 
             performConnected(builder.getTransaction());
         } catch (IOException e) {