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

A few fixes to the init sequence

Browse Source
This commit is contained in:
Andreas Böhler 2020-11-20 22:27:41 +01:00 committed by Gitea
parent 8fd0e1f13f
commit 6f18a1dd73
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/operations/GetConfigurationOperation.java
View File

@ -51,7 +51,7 @@ public class GetConfigurationOperation extends AbstractBTLEOperation<CasioGBX100
operationStatus = OperationStatus.FINISHED; operationStatus = OperationStatus.FINISHED;
if (getDevice() != null) { if (getDevice() != null) {
try { try {
TransactionBuilder builder = performInitialized("finishe operation"); TransactionBuilder builder = performInitialized("finished operation");
builder.wait(0); builder.wait(0);
builder.setGattCallback(null); // unset ourselves from being the queue's gatt callback builder.setGattCallback(null); // unset ourselves from being the queue's gatt callback
builder.queue(getQueue()); builder.queue(getQueue());

14
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/casio/operations/SetConfigurationOperation.java
View File

@ -110,7 +110,16 @@ public class SetConfigurationOperation extends AbstractBTLEOperation<CasioGBX10
data[i] = (byte)~data[i]; data[i] = (byte)~data[i];
} }
if(Arrays.equals(oldData, data)) { // This allows changing month and day of birth on the watch
// without having it overwritten on every sync
boolean match = true;
for(int i=0; i<8; i++) {
if(data[i] != oldData[i]) {
match = false;
break;
}
}
if(match) {
LOG.info("No configuration update required"); LOG.info("No configuration update required");
requestTargetSettings(); requestTargetSettings();
} else { } else {
@ -179,9 +188,8 @@ public class SetConfigurationOperation extends AbstractBTLEOperation<CasioGBX10
operationStatus = OperationStatus.FINISHED; operationStatus = OperationStatus.FINISHED;
if (getDevice() != null) { if (getDevice() != null) {
unsetBusy();
try { try {
TransactionBuilder builder = performInitialized("finishe operation"); TransactionBuilder builder = performInitialized("finished operation");
builder.setGattCallback(null); // unset ourselves from being the queue's gatt callback builder.setGattCallback(null); // unset ourselves from being the queue's gatt callback
builder.wait(0); builder.wait(0);
builder.queue(getQueue()); builder.queue(getQueue());