From 47cd128e0d83139c670f2c0b91207edca4219c92 Mon Sep 17 00:00:00 2001 From: Andreas Shimokawa Date: Fri, 5 Aug 2022 23:43:39 +0200 Subject: [PATCH] fix build after rebase --- .../devices/AbstractDeviceCoordinator.java | 3 +-- .../gadgetbridge/devices/DeviceCoordinator.java | 4 +--- .../devices/pinetime/PineTimeJFCoordinator.java | 2 +- .../service/AbstractDeviceSupport.java | 1 - .../service/DeviceCommunicationService.java | 16 ++++++++++++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java index ed2cc5634..65c044cf5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java @@ -46,7 +46,6 @@ import nodomain.freeyourgadget.gadgetbridge.capabilities.HeartRateCapability; import nodomain.freeyourgadget.gadgetbridge.capabilities.password.PasswordCapabilityImpl; import nodomain.freeyourgadget.gadgetbridge.database.DBHandler; import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; -import nodomain.freeyourgadget.gadgetbridge.devices.huami.HuamiActivitySummaryParser; import nodomain.freeyourgadget.gadgetbridge.devices.miband.MiBandConst; import nodomain.freeyourgadget.gadgetbridge.entities.AlarmDao; import nodomain.freeyourgadget.gadgetbridge.entities.BatteryLevelDao; @@ -387,7 +386,7 @@ public abstract class AbstractDeviceCoordinator implements DeviceCoordinator { ); } - public boolean supportsNavigation(GBDevice gbDevice) { + public boolean supportsNavigation() { return false; } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java index cecdd693b..39ef9ab3f 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java @@ -18,12 +18,10 @@ along with this program. If not, see . */ package nodomain.freeyourgadget.gadgetbridge.devices; -import android.annotation.TargetApi; import android.app.Activity; import android.bluetooth.le.ScanFilter; import android.content.Context; import android.net.Uri; -import android.os.Build; import java.io.File; import java.io.IOException; @@ -481,5 +479,5 @@ public interface DeviceCoordinator { List getHeartRateMeasurementIntervals(); - boolean supportsNavigation(GBDevice mGBDevice); + boolean supportsNavigation(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java index 9a289d916..afc7913cc 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/pinetime/PineTimeJFCoordinator.java @@ -149,7 +149,7 @@ public class PineTimeJFCoordinator extends AbstractBLEDeviceCoordinator { return 8; } - public boolean supportsNavigation(GBDevice gbDevice) { + public boolean supportsNavigation() { return true; } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java index 805a0cce9..52f15f1cd 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/AbstractDeviceSupport.java @@ -549,7 +549,6 @@ public abstract class AbstractDeviceSupport implements DeviceSupport { return inputString; } -<<<<<<< HEAD // Empty functions following, leaving optional implementation up to child classes diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java index 8a48cdfad..298666deb 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java @@ -245,6 +245,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere private boolean supportsActivityDataFetching = false; private boolean supportsCalendarEvents = false; private boolean supportsMusicInfo = false; + private boolean supportsNavigation = false; public boolean supportsWeather() { return supportsWeather; @@ -278,6 +279,14 @@ public class DeviceCommunicationService extends Service implements SharedPrefere this.supportsMusicInfo = supportsMusicInfo; } + public boolean supportsNavigation() { + return supportsNavigation; + } + + public void setSupportsNavigation(boolean supportsNavigation) { + this.supportsNavigation = supportsNavigation; + } + public void logicalOr(DeviceCoordinator operand){ if(operand.supportsCalendarEvents()){ setSupportsCalendarEvents(true); @@ -291,6 +300,9 @@ public class DeviceCommunicationService extends Service implements SharedPrefere if(operand.supportsMusicInfo()){ setSupportsMusicInfo(true); } + if(operand.supportsNavigation()){ + setSupportsNavigation(true); + } } } @@ -878,7 +890,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere navigationInfoSpec.instruction = intent.getStringExtra(EXTRA_NAVIGATION_INSTRUCTION); navigationInfoSpec.nextAction = intent.getIntExtra(EXTRA_NAVIGATION_NEXT_ACTION,0); navigationInfoSpec.distanceToTurn = intent.getIntExtra(EXTRA_NAVIGATION_DISTANCE_TO_TURN,0); - mDeviceSupport.onSetNavigationInfo(navigationInfoSpec); + deviceSupport.onSetNavigationInfo(navigationInfoSpec); break; case ACTION_REQUEST_APPINFO: deviceSupport.onAppInfoReq(); @@ -1238,7 +1250,7 @@ public class DeviceCommunicationService extends Service implements SharedPrefere registerReceiver(mAlarmClockReceiver, filter); } - if (mOsmandAidlHelper == null && coordinator != null && coordinator.supportsNavigation(mGBDevice)) { + if (mOsmandAidlHelper == null && features.supportsNavigation()) { mOsmandAidlHelper = new OsmandEventReceiver(this.getApplication()); }