MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-29 13:26:50 +01:00
Code Releases Wiki Activity

Use builder.queue() instead of performImmediately()

Browse Source
This commit is contained in:
mkusnierz 2019-10-23 23:32:40 +02:00
parent 45054bbcd9
commit 18d1a7ddc7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/lenovo/watchxplus/WatchXPlusDeviceSupport.java
View File

@ -189,7 +189,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
messagePart)); messagePart));
} }
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to send notification", e); LOG.warn("Unable to send notification", e);
} }
@ -269,7 +269,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
builder.write(getCharacteristic(WatchXPlusConstants.UUID_CHARACTERISTIC_WRITE), builder.write(getCharacteristic(WatchXPlusConstants.UUID_CHARACTERISTIC_WRITE),
buildCommand(WatchXPlusConstants.CMD_TIME_SETTINGS, buildCommand(WatchXPlusConstants.CMD_TIME_SETTINGS,
WatchXPlusConstants.READ_VALUE)); WatchXPlusConstants.READ_VALUE));
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to get device time", e); LOG.warn("Unable to get device time", e);
} }
@ -314,7 +314,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
buildCommand(WatchXPlusConstants.CMD_TIME_SETTINGS, buildCommand(WatchXPlusConstants.CMD_TIME_SETTINGS,
WatchXPlusConstants.WRITE_VALUE, WatchXPlusConstants.WRITE_VALUE,
time)); time));
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to set time", e); LOG.warn("Unable to set time", e);
} }
@ -493,7 +493,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
WatchXPlusConstants.READ_VALUE, WatchXPlusConstants.READ_VALUE,
WatchXPlusConstants.HEART_RATE_DATA_TYPE)); WatchXPlusConstants.HEART_RATE_DATA_TYPE));
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to retrieve recorded data", e); LOG.warn("Unable to retrieve recorded data", e);
} }
@ -593,7 +593,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
buildCommand(command, buildCommand(command,
WatchXPlusConstants.KEEP_ALIVE, WatchXPlusConstants.KEEP_ALIVE,
weatherInfo)); weatherInfo));
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to set weather", e); LOG.warn("Unable to set weather", e);
} }
@ -630,6 +630,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
LOG.info(" Received Heart rate data details"); LOG.info(" Received Heart rate data details");
handleHeartRateDetails(value); handleHeartRateDetails(value);
} else if (value.length == 7 && value[5] == 0) { } else if (value.length == 7 && value[5] == 0) {
LOG.info(" Received ACK");
// Not sure if that's necessary. There is no response for ACK in original app logs // Not sure if that's necessary. There is no response for ACK in original app logs
// handleAck(); // handleAck();
} else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_NOTIFICATION_SETTINGS, 5)) { } else if (ArrayUtils.equals(value, WatchXPlusConstants.RESP_NOTIFICATION_SETTINGS, 5)) {
@ -672,7 +673,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
req)); req));
} }
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to response to ACK", e); LOG.warn("Unable to response to ACK", e);
} }
@ -683,9 +684,8 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
TransactionBuilder builder = performInitialized("handleAck"); TransactionBuilder builder = performInitialized("handleAck");
builder.write(getCharacteristic(WatchXPlusConstants.UUID_CHARACTERISTIC_WRITE), builder.write(getCharacteristic(WatchXPlusConstants.UUID_CHARACTERISTIC_WRITE),
// TODO: Below value is ACK status. Find out which value is correct
buildCommand((byte)0x00)); buildCommand((byte)0x00));
performImmediately(builder); builder.queue(getQueue());
} catch (IOException e) { } catch (IOException e) {
LOG.warn("Unable to response to ACK", e); LOG.warn("Unable to response to ACK", e);
} }
@ -696,7 +696,7 @@ public class WatchXPlusDeviceSupport extends AbstractBTLEDeviceSupport {
byte[] result = new byte[7]; byte[] result = new byte[7];
System.arraycopy(WatchXPlusConstants.CMD_HEADER, 0, result, 0, 5); System.arraycopy(WatchXPlusConstants.CMD_HEADER, 0, result, 0, 5);
result[2] = (byte) (result.length + 1); result[2] = (byte) (result.length - 6);
result[3] = WatchXPlusConstants.REQUEST; result[3] = WatchXPlusConstants.REQUEST;
result[4] = (byte) sequenceNumber++; result[4] = (byte) sequenceNumber++;
result[5] = action; result[5] = action;