From 2d36bda5595f334cfa219e4c953f59b34a2634ef Mon Sep 17 00:00:00 2001 From: Thomas Kuehne Date: Sun, 31 Aug 2025 19:01:05 +0800 Subject: [PATCH] igpsport: Update for current master rebase --- .../devices/igpsport/IGPSportiGS800Coordinator.java | 2 +- .../service/devices/igpsport/IGPSportDeviceSupport.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/igpsport/IGPSportiGS800Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/igpsport/IGPSportiGS800Coordinator.java index 0391d87e67..5b5179498e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/igpsport/IGPSportiGS800Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/igpsport/IGPSportiGS800Coordinator.java @@ -42,7 +42,7 @@ public class IGPSportiGS800Coordinator extends IGPSportAbstractCoordinator { } @Override - public boolean supportsMusicInfo() { + public boolean supportsMusicInfo(final GBDevice device) { return true; } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java index 3d15f3d531..f4d14656a9 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/igpsport/IGPSportDeviceSupport.java @@ -63,6 +63,7 @@ import nodomain.freeyourgadget.gadgetbridge.model.MusicStateSpec; import nodomain.freeyourgadget.gadgetbridge.model.NotificationSpec; import nodomain.freeyourgadget.gadgetbridge.model.NotificationType; import nodomain.freeyourgadget.gadgetbridge.model.WeatherSpec; +import nodomain.freeyourgadget.gadgetbridge.model.weather.Weather; import nodomain.freeyourgadget.gadgetbridge.proto.igpsport.Back; import nodomain.freeyourgadget.gadgetbridge.proto.igpsport.Ble; import nodomain.freeyourgadget.gadgetbridge.proto.igpsport.Config; @@ -702,9 +703,9 @@ public class IGPSportDeviceSupport extends AbstractBTLESingleDeviceSupport { } @Override - public void onSendWeather(ArrayList weatherSpecs) { - if (!weatherSpecs.isEmpty()) { - WeatherSpec weatherSpec = weatherSpecs.get(0); + public void onSendWeather() { + WeatherSpec weatherSpec = Weather.getWeatherSpec(); + if (weatherSpec != null) { weatherManager.handleWeather(weatherSpec); } } @@ -831,7 +832,7 @@ public class IGPSportDeviceSupport extends AbstractBTLESingleDeviceSupport { public File getWritableExportDirectory() throws IOException { - return getDevice().getDeviceCoordinator().getWritableExportDirectory(getDevice()); + return getDevice().getDeviceCoordinator().getWritableExportDirectory(getDevice(), true); } }