diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java index 0550af4c8..0ac8fb185 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/Huami2021Coordinator.java @@ -450,7 +450,7 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { } public boolean supportsAlexa(final GBDevice device) { - return ZeppOsAlexaService.isSupported(getPrefs(device)); + return experimentalFeatures(device) && ZeppOsAlexaService.isSupported(getPrefs(device)); } private boolean supportsConfig(final GBDevice device, final ZeppOsConfigService.ConfigArg config) { @@ -474,4 +474,8 @@ public abstract class Huami2021Coordinator extends HuamiCoordinator { public static boolean deviceHasConfig(final Prefs devicePrefs, final ZeppOsConfigService.ConfigArg config) { return devicePrefs.getBoolean(Huami2021Coordinator.getPrefKnownConfig(config.name()), false); } + + public static boolean experimentalFeatures(final GBDevice device) { + return getPrefs(device).getBoolean("zepp_os_experimental_features", false); + } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java index 5a2706f94..a1f632f84 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/services/ZeppOsAlexaService.java @@ -148,8 +148,10 @@ public class ZeppOsAlexaService extends AbstractZeppOsService { @Override public void initialize(final TransactionBuilder builder) { - requestCapabilities(builder); - requestLanguages(builder); + if (Huami2021Coordinator.experimentalFeatures(getSupport().getDevice())) { + requestCapabilities(builder); + requestLanguages(builder); + } } public void requestCapabilities(final TransactionBuilder builder) {