MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-26 10:35:50 +01:00
Code Releases Wiki Activity

Pebble: prevent potential NPE, and add more loggins in PebbleKit code

Browse Source
This commit is contained in:
Andreas Shimokawa 2017-11-14 22:10:40 +01:00
parent d25da96804
commit 97fda2434d
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleKitSupport.java
View File

@ -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_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_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_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 String PEBBLEKIT_ACTION_DL_FINISH_SESSION = "com.getpebble.action.dl.FINISH_SESSION_NEW";
private static final Logger LOG = LoggerFactory.getLogger(PebbleKitSupport.class); private static final Logger LOG = LoggerFactory.getLogger(PebbleKitSupport.class);
@ -62,6 +62,10 @@ class PebbleKitSupport {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
String action = intent.getAction(); String action = intent.getAction();
if (action == null) {
LOG.warn("got empty action from PebbleKit Intent - ignoring");
return;
}
LOG.info("Got action: " + action); LOG.info("Got action: " + action);
UUID uuid; UUID uuid;
switch (action) { switch (action) {
@ -101,7 +105,9 @@ class PebbleKitSupport {
case PEBBLEKIT_ACTION_DL_ACK_DATA: case PEBBLEKIT_ACTION_DL_ACK_DATA:
LOG.info("GOT DL DATA ACK"); LOG.info("GOT DL DATA ACK");
break; break;
default:
LOG.warn("Unhandled PebbleKit action: " + action);
break;
} }
} }
}; };