MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-09-08 15:35:24 +02:00
Code Releases Wiki Activity

improve JSON-format output

Browse Source
This commit is contained in:
Gordon Williams 2022-05-18 15:21:57 +01:00
parent fab1d100a0
commit f9a49e0039
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/banglejs/BangleJSDeviceSupport.java
View File

@ -188,6 +188,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
LOG.info("UART TX: " + str); LOG.info("UART TX: " + str);
byte[] bytes; byte[] bytes;
bytes = str.getBytes(StandardCharsets.ISO_8859_1); bytes = str.getBytes(StandardCharsets.ISO_8859_1);
// FIXME: somehow this is still giving us UTF8 data when we put images in strings. Maybe JSON.stringify is converting to UTF-8?
for (int i=0;i<bytes.length;i+=mtuSize) { for (int i=0;i<bytes.length;i+=mtuSize) {
int l = bytes.length-i; int l = bytes.length-i;
if (l>mtuSize) l=mtuSize; if (l>mtuSize) l=mtuSize;
@ -202,7 +203,7 @@ public class BangleJSDeviceSupport extends AbstractBTLEDeviceSupport {
// toString creates '\u0000' instead of '\0' // toString creates '\u0000' instead of '\0'
// FIXME: there have got to be nicer ways of handling this - maybe we just make our own JSON.toString (see below) // FIXME: there have got to be nicer ways of handling this - maybe we just make our own JSON.toString (see below)
json = json.replaceAll("\\\\u000([01234567])", "\\\\$1"); json = json.replaceAll("\\\\u000([01234567])", "\\\\$1");
json = json.replaceAll("\\\\u00(\\d\\d)", "\\\\x$1"); json = json.replaceAll("\\\\u00([0123456789abcdef][0123456789abcdef])", "\\\\x$1");
return json; return json;
/*String json = "{"; /*String json = "{";
Iterator<String> iter = jsonObj.keys(); Iterator<String> iter = jsonObj.keys();