From 97fda2434dac64767137b4696e3fddbd8f494090 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Tue, 14 Nov 2017 22:10:40 +0100 Subject: [PATCH] Pebble: prevent potential NPE, and add more loggins in PebbleKit code --- .../service/devices/pebble/PebbleKitSupport.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java index 0184e9524..3119a6a55 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java @@ -45,9 +45,9 @@ class PebbleKitSupport { private static final String PEBBLEKIT_ACTION_APP_STOP = "com.getpebble.action.app.STOP"; private static final String PEBBLEKIT_ACTION_DL_RECEIVE_DATA_NEW = "com.getpebble.action.dl.RECEIVE_DATA_NEW"; - private static final String PEBBLEKIT_ACTION_DL_RECEIVE_DATA = "com.getpebble.action.dl.RECEIVE_DATA"; + //private static final String PEBBLEKIT_ACTION_DL_RECEIVE_DATA = "com.getpebble.action.dl.RECEIVE_DATA"; private static final String PEBBLEKIT_ACTION_DL_ACK_DATA = "com.getpebble.action.dl.ACK_DATA"; - private static final String PEBBLEKIT_ACTION_DL_REQUEST_DATA = "com.getpebble.action.dl.REQUEST_DATA"; + //private static final String PEBBLEKIT_ACTION_DL_REQUEST_DATA = "com.getpebble.action.dl.REQUEST_DATA"; private static final String PEBBLEKIT_ACTION_DL_FINISH_SESSION = "com.getpebble.action.dl.FINISH_SESSION_NEW"; private static final Logger LOG = LoggerFactory.getLogger(PebbleKitSupport.class); @@ -62,6 +62,10 @@ class PebbleKitSupport { @Override public void onReceive(Context context, Intent intent) { String action = intent.getAction(); + if (action == null) { + LOG.warn("got empty action from PebbleKit Intent - ignoring"); + return; + } LOG.info("Got action: " + action); UUID uuid; switch (action) { @@ -101,7 +105,9 @@ class PebbleKitSupport { case PEBBLEKIT_ACTION_DL_ACK_DATA: LOG.info("GOT DL DATA ACK"); break; - + default: + LOG.warn("Unhandled PebbleKit action: " + action); + break; } } };