From 961e9f1bf9e0a40d4e1a664ec1aeb4ef5b882b42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Fri, 8 Dec 2023 18:53:11 +0000 Subject: [PATCH] Xiaomi: Fix sleep schedule preference --- .../services/XiaomiScheduleService.java | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java index 6b8266fec..79fe583ba 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiScheduleService.java @@ -105,7 +105,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService { switch (cmd.getSubtype()) { case CMD_ALARMS_GET: handleAlarms(cmd.getSchedule().getAlarms()); - break; + return; case CMD_ALARMS_CREATE: pendingAlarmAcks--; LOG.debug("Got alarms create ack, remaining {}", pendingAlarmAcks); @@ -113,16 +113,19 @@ public class XiaomiScheduleService extends AbstractXiaomiService { LOG.debug("Requesting alarms after all acks"); requestAlarms(); } - break; + return; + case CMD_SLEEP_MODE_SET: + LOG.debug("Got sleep mode set ack, status={}", cmd.getStatus()); + return; case CMD_WORLD_CLOCKS_GET: handleWorldClocks(cmd.getSchedule().getWorldClocks()); - break; + return; case CMD_SLEEP_MODE_GET: handleSleepModeConfig(cmd.getSchedule().getSleepMode()); - break; + return; case CMD_REMINDERS_GET: handleReminders(cmd.getSchedule().getReminders()); - break; + return; case CMD_REMINDERS_CREATE: pendingReminderAcks--; LOG.debug("Got alarms create ack, remaining {}", pendingReminderAcks); @@ -130,7 +133,7 @@ public class XiaomiScheduleService extends AbstractXiaomiService { LOG.debug("Requesting reminders after all acks"); requestReminders(); } - break; + return; } LOG.warn("Unknown schedule command {}", cmd.getSubtype()); @@ -147,9 +150,9 @@ public class XiaomiScheduleService extends AbstractXiaomiService { @Override public boolean onSendConfiguration(final String config, final Prefs prefs) { switch (config) { - case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME: - case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_START: - case DeviceSettingsPreferenceConst.PREF_SLEEP_TIME_END: + case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_ENABLED: + case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_START: + case DeviceSettingsPreferenceConst.PREF_SLEEP_MODE_SCHEDULE_END: setSleepModeConfig(); return true; }