MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2025-01-13 19:27:33 +01:00
Code Releases Wiki Activity

Pebble: fix nasty crash when appmessage id is > 127

Browse Source 
This is a regression since Gadgetbridge 0.22.0

Potentially fixes the following:

- #868
- #876
- #884

NOTE:

Java has no unisgned, java has no unsigned, java has no unsigned.
Java has no unisgned, java has no unsigned, java has no unsigned.
Java has no unisgned, java has no unsigned, java has no unsigned.
This commit is contained in:
Andreas Shimokawa 2017-11-14 22:28:54 +01:00
parent 97fda2434d
commit 7ffcc44378
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleProtocol.java
View File

@ -1986,7 +1986,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
} }
} }
idLookup[last_id] = ext_id; idLookup[last_id & 0xff] = ext_id;
return buf.array(); return buf.array();
} }
@ -2633,14 +2633,14 @@ public class PebbleProtocol extends GBDeviceProtocol {
LOG.info("got APPLICATIONMESSAGE/LAUNCHER (EP " + endpoint + ") NACK"); LOG.info("got APPLICATIONMESSAGE/LAUNCHER (EP " + endpoint + ") NACK");
} }
GBDeviceEventAppMessage evtAppMessage = null; GBDeviceEventAppMessage evtAppMessage = null;
if (endpoint == ENDPOINT_APPLICATIONMESSAGE && idLookup[last_id] != null) { if (endpoint == ENDPOINT_APPLICATIONMESSAGE && idLookup[last_id & 0xff] != null) {
evtAppMessage = new GBDeviceEventAppMessage(); evtAppMessage = new GBDeviceEventAppMessage();
if (pebbleCmd == APPLICATIONMESSAGE_ACK) { if (pebbleCmd == APPLICATIONMESSAGE_ACK) {
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_ACK; evtAppMessage.type = GBDeviceEventAppMessage.TYPE_ACK;
} else { } else {
evtAppMessage.type = GBDeviceEventAppMessage.TYPE_NACK; evtAppMessage.type = GBDeviceEventAppMessage.TYPE_NACK;
} }
evtAppMessage.id = idLookup[last_id]; evtAppMessage.id = idLookup[last_id & 0xff];
evtAppMessage.appUUID = currentRunningApp; evtAppMessage.appUUID = currentRunningApp;
} }
devEvts = new GBDeviceEvent[]{evtAppMessage}; devEvts = new GBDeviceEvent[]{evtAppMessage};