nixo
/
GadgetBridge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into feature-weather

This commit is contained in:
Andreas Shimokawa 2016-12-09 23:29:54 +01:00
parent efb1cd389b 0e1287e382
commit a0e21d7c6d
1 changed files with 8 additions and 8 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/PebbleProtocol.java
View File

@ -2233,17 +2233,17 @@ public class PebbleProtocol extends GBDeviceProtocol {
switch (pebbleCmd) { switch (pebbleCmd) {
case APPLICATIONMESSAGE_PUSH: case APPLICATIONMESSAGE_PUSH:
if (endpoint == ENDPOINT_LAUNCHER) { LOG.info((endpoint == ENDPOINT_LAUNCHER ? "got LAUNCHER PUSH from UUID : " : "got APPLICATIONMESSAGE PUSH from UUID : ") + uuid);
LOG.info("got LAUNCHER PUSH from UUID " + uuid);
break;
}
LOG.info("got APPLICATIONMESSAGE PUSH from UUID " + uuid);
AppMessageHandler handler = mAppMessageHandlers.get(uuid); AppMessageHandler handler = mAppMessageHandlers.get(uuid);
if (handler != null) { if (handler != null) {
if (handler.isEnabled()) { if (handler.isEnabled()) {
if (endpoint == ENDPOINT_APPLICATIONMESSAGE) {
ArrayList<Pair<Integer, Object>> dict = decodeDict(buf); ArrayList<Pair<Integer, Object>> dict = decodeDict(buf);
devEvts = handler.handleMessage(dict); devEvts = handler.handleMessage(dict);
}
else {
devEvts = handler.pushMessage();
}
} else { } else {
devEvts = new GBDeviceEvent[]{null}; devEvts = new GBDeviceEvent[]{null};
} }