From e62a860ee633a0514e497c6f81ebf2aa979760c3 Mon Sep 17 00:00:00 2001 From: cpfeiffer Date: Tue, 14 Mar 2017 22:03:30 +0100 Subject: [PATCH] Avoid potential NPE when neither name nor number are available --- .../freeyourgadget/gadgetbridge/impl/GBDeviceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java index 36ec75c20..f48e9d94e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/impl/GBDeviceService.java @@ -177,7 +177,7 @@ public class GBDeviceService implements DeviceService { callSpec.name = null; } else if (context.getString(R.string.pref_call_privacy_mode_number).equals(currentPrivacyMode)) { callSpec.name = coalesce(callSpec.name, getContactDisplayNameByNumber(callSpec.number)); - if (!callSpec.name.equals(callSpec.number)) { + if (callSpec.name != null && !callSpec.name.equals(callSpec.number)) { callSpec.number = null; } } else {