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

Xiaomi: Handle find phone messages without system properly

Browse Source 
After find phone is stopped, watch sends a `Command` message back
without `system` set, and because of missing hasSystem() check, we'd
wrongly go to condition that sets findPhoneEvent.event to START.
This commit is contained in:
LuK1337 2023-12-19 00:15:53 +01:00 committed by José Rebelo
parent cb66cd742a
commit 0ca35ad935
1 changed files with 8 additions and 6 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/xiaomi/services/XiaomiSystemService.java
View File

@ -159,6 +159,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
return; return;
case CMD_FIND_PHONE: case CMD_FIND_PHONE:
LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice()); LOG.debug("Got find phone: {}", cmd.getSystem().getFindDevice());
if (cmd.hasSystem()) {
final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone(); final GBDeviceEventFindPhone findPhoneEvent = new GBDeviceEventFindPhone();
if (cmd.getSystem().getFindDevice() == 0) { if (cmd.getSystem().getFindDevice() == 0) {
findPhoneEvent.event = GBDeviceEventFindPhone.Event.START; findPhoneEvent.event = GBDeviceEventFindPhone.Event.START;
@ -166,6 +167,7 @@ public class XiaomiSystemService extends AbstractXiaomiService implements Xiaomi
findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP; findPhoneEvent.event = GBDeviceEventFindPhone.Event.STOP;
} }
getSupport().evaluateGBDeviceEvent(findPhoneEvent); getSupport().evaluateGBDeviceEvent(findPhoneEvent);
}
return; return;
case CMD_DISPLAY_ITEMS_GET: case CMD_DISPLAY_ITEMS_GET:
handleDisplayItems(cmd.getSystem().getDisplayItems()); handleDisplayItems(cmd.getSystem().getDisplayItems());