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

Pebble: remove null termination from cstrings when converting to json for PebbleKit

This commit is contained in:
Andreas Shimokawa 2017-01-11 22:39:08 +01:00
parent 5e74338efe
commit 50cb3c9db3
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1783,6 +1783,9 @@ public class PebbleProtocol extends GBDeviceProtocol {
byte type = buf.get(); byte type = buf.get();
short length = buf.getShort(); short length = buf.getShort();
jsonObject.put("key", key); jsonObject.put("key", key);
if (type == TYPE_CSTRING) {
length--;
}
jsonObject.put("length", length); jsonObject.put("length", length);
switch (type) { switch (type) {
case TYPE_UINT: case TYPE_UINT:
@ -1815,6 +1818,7 @@ public class PebbleProtocol extends GBDeviceProtocol {
} else { } else {
jsonObject.put("type", "string"); jsonObject.put("type", "string");
jsonObject.put("value", new String(bytes)); jsonObject.put("value", new String(bytes));
buf.get(); // skip null-termination;
} }
break; break;
default: default: