diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java deleted file mode 100644 index 63b634f09..000000000 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/sony/headphones/coordinators/SonyLinkBudsSCoordinator.java +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright (C) 2022 José Rebelo - - This file is part of Gadgetbridge. - - Gadgetbridge is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published - by the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Gadgetbridge is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . */ -package nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators; - -import androidx.annotation.NonNull; - -import java.util.Arrays; -import java.util.List; - -import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCapabilities; -import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.SonyHeadphonesCoordinator; -import nodomain.freeyourgadget.gadgetbridge.impl.GBDeviceCandidate; -import nodomain.freeyourgadget.gadgetbridge.model.DeviceType; - -public class SonyLinkBudsSCoordinator extends SonyHeadphonesCoordinator { - @NonNull - @Override - public DeviceType getSupportedType(final GBDeviceCandidate candidate) { - if (candidate.getName().contains("LinkBuds S")) { - return DeviceType.SONY_LINKBUDS_S; - } - - return DeviceType.UNKNOWN; - } - - @Override - public DeviceType getDeviceType() { - return DeviceType.SONY_LINKBUDS_S; - } - - @Override - public List getCapabilities() { - return Arrays.asList( - SonyHeadphonesCapabilities.BatteryDual, - SonyHeadphonesCapabilities.BatteryCase, - SonyHeadphonesCapabilities.AmbientSoundControl, - SonyHeadphonesCapabilities.EqualizerSimple, - SonyHeadphonesCapabilities.AudioUpsampling, - SonyHeadphonesCapabilities.ButtonModesLeftRight, - SonyHeadphonesCapabilities.PauseWhenTakenOff, - SonyHeadphonesCapabilities.AutomaticPowerOffWhenTakenOff - ); - } -} diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java index ecdc7b34a..c85919392 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/DeviceType.java @@ -120,7 +120,6 @@ public enum DeviceType { SONY_WF_1000XM3(433, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_wf_1000xm3), SONY_WH_1000XM2(434, R.drawable.ic_device_sony_overhead, R.drawable.ic_device_sony_overhead_disabled, R.string.devicetype_sony_wh_1000xm2), SONY_WF_1000XM4(435, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_wf_1000xm4), - SONY_LINKBUDS_S(436, R.drawable.ic_device_galaxy_buds, R.drawable.ic_device_galaxy_buds_disabled, R.string.devicetype_sony_linkbuds_s), BOSE_QC35(440, R.drawable.ic_device_headphones, R.drawable.ic_device_headphones_disabled, R.string.devicetype_bose_qc35), VESC_NRF(500, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc), VESC_HM10(501, R.drawable.ic_device_vesc, R.drawable.ic_device_vesc_disabled, R.string.devicetype_vesc), diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java index dd8bfc397..e73a8c9ea 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceSupportFactory.java @@ -342,8 +342,6 @@ public class DeviceSupportFactory { return new ServiceDeviceSupport(new SonyHeadphonesSupport()); case SONY_WF_1000XM4: return new ServiceDeviceSupport(new SonyHeadphonesSupport()); - case SONY_LINKBUDS_S: - return new ServiceDeviceSupport(new SonyHeadphonesSupport()); case VESC_NRF: case VESC_HM10: return new ServiceDeviceSupport(new VescDeviceSupport(device.getType())); diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java index 71e47d32e..144c56759 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -45,7 +45,6 @@ import nodomain.freeyourgadget.gadgetbridge.database.DBHelper; import nodomain.freeyourgadget.gadgetbridge.devices.DeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4.AmazfitGTS4Coordinator; import nodomain.freeyourgadget.gadgetbridge.devices.huami.amazfitgts4mini.AmazfitGTS4MiniCoordinator; -import nodomain.freeyourgadget.gadgetbridge.devices.sony.headphones.coordinators.SonyLinkBudsSCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.supercars.SuperCarsCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.fitpro.FitProDeviceCoordinator; import nodomain.freeyourgadget.gadgetbridge.devices.UnknownDeviceCoordinator; @@ -346,7 +345,6 @@ public class DeviceHelper { result.add(new GalaxyBudsProDeviceCoordinator()); result.add(new GalaxyBuds2DeviceCoordinator()); result.add(new VescCoordinator()); - result.add(new SonyLinkBudsSCoordinator()); result.add(new SonyWH1000XM3Coordinator()); result.add(new SonyWH1000XM4Coordinator()); result.add(new SonyWFSP800NCoordinator()); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e151baf12..0bf612cfb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1229,7 +1229,6 @@ Sony WF-SP800N Sony WF-1000XM3 Sony WF-1000XM4 - Sony LinkBuds S Binary sensor Choose export location General