demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Fix multi location weather support on some Xiaomi devices. (#4512)

Browse Source 
Resend a request for the list of stored weather locations when the device is already asking for meteorological conditions but didn't react on earlier initialization attempts.

Fixes: #4485

Co-authored-by: Martin Schitter <ms+git@mur.at>
Reviewed-on: https://codeberg.org/Freeyourgadget/Gadgetbridge/pulls/4512
Co-authored-by: mash-graz <mash-graz@noreply.codeberg.org>
Co-committed-by: mash-graz <mash-graz@noreply.codeberg.org>
This commit is contained in:
mash-graz
2025-01-17 21:43:54 +00:00
committed by José Rebelo
co-authored by Martin Schitter
parent fb4f6397c7
commit 87fa5b44d7
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/services/XiaomiWeatherService.java
+11
View File
@@ -66,6 +66,8 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
private final Set<XiaomiProto.WeatherLocation> cachedWeatherLocations = new HashSet<>();
private boolean locationsInitialized = false;
public XiaomiWeatherService(final XiaomiSupport support) {
super(support);
}
@@ -493,6 +495,13 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
}
private void onConditionRequestReceived(final XiaomiProto.Command command) {
if (!locationsInitialized) {
LOG.debug("Received request from device but multi location weather support still isn't initialized");
getSupport().sendCommand("get weather locations", COMMAND_TYPE, CMD_GET_LOCATIONS);
locationsInitialized = true; // remind only once
}
if (command.hasStatus() && command.getStatus() != 0) {
LOG.warn("Received request for conditions with unexpected status code {}", command.getStatus());
return;
@@ -552,6 +561,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
if (cmd.hasStatus() && cmd.getStatus() == 1) {
LOG.warn("Multiple weather locations not supported by this device");
getSupport().setFeatureSupported(XiaomiPreferences.FEAT_MULTIPLE_WEATHER_LOCATIONS, false);
locationsInitialized = true;
// now that the feature flag has been updated, send cached weather
onSendWeather(Weather.getInstance().getWeatherSpecs());
@@ -565,6 +575,7 @@ public class XiaomiWeatherService extends AbstractXiaomiService {
}
getSupport().setFeatureSupported(XiaomiPreferences.FEAT_MULTIPLE_WEATHER_LOCATIONS, true);
locationsInitialized = true;
if (!cmd.hasWeather() || !cmd.getWeather().hasLocations()) {
LOG.warn("Received unexpected payload in response to configured weather locations request");