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

Liveview: refactor the BT stream reading functionality 

Read the expected number of bytes at each step instead of a single byte.
This commit is contained in:
Daniele Gobbetti 2016-12-05 17:45:03 +01:00
parent e53b8b6b32
commit 4eb56eb9ca
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java
View File

@ -166,38 +166,33 @@ public class LiveviewIoThread extends GBDeviceIoThread {
private byte[] parseIncoming() throws IOException {
ByteArrayOutputStream msgStream = new ByteArrayOutputStream();
int needRead = 1;
boolean finished = false;
ReaderState state = ReaderState.ID;
do {
byte[] incoming = new byte[1];
byte read = -1;
read = (byte) mInStream.read();
while (!finished) {
mInStream.read(incoming);
msgStream.write(incoming);
if (read == -1) {
LOG.error("Invalid message received (length=" + msgStream.size() + ")");
switch (state) {
case ID:
state = ReaderState.HEADER_LEN;
incoming = new byte[1];
break;
case HEADER_LEN:
state = ReaderState.HEADER;
incoming = new byte[incoming[0]];
break;
case HEADER:
int payloadSize = getLastInt(msgStream);
state = ReaderState.PAYLOAD;
incoming = new byte[payloadSize];
break;
case PAYLOAD: //read is blocking, if we are here we have all the data
finished = true;
break;
}
needRead--;
msgStream.write(read);
if (needRead == 0) {
switch (state) {
case ID:
state = ReaderState.HEADER_LEN;
needRead = 1;
break;
case HEADER_LEN:
state = ReaderState.HEADER;
needRead = read;
break;
case HEADER:
int payloadSize = getLastInt(msgStream);
state = ReaderState.PAYLOAD;
needRead = payloadSize;
break;
default:
break;
}
}
} while (needRead > 0);
}
byte[] msgArray = msgStream.toByteArray();
LOG.debug("received: " + GB.hexdump(msgArray, 0, msgArray.length));
return msgArray;