From e923d54cb3c0456188af9117c59487048e54ff1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sun, 7 Dec 2025 17:36:00 +0000 Subject: [PATCH] Remove "Bluetooth is disabled" toast when getting available devices A simple getter should not be responsible for checking whether bluetooth is available or not. --- CHANGELOG.md | 1 + .../gadgetbridge/activities/ControlCenterv2.java | 2 +- .../gadgetbridge/devices/DeviceManager.java | 2 +- .../gadgetbridge/util/DeviceHelper.java | 15 +++------------ 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cdd8f7d7df..5ef6964e70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -76,6 +76,7 @@ * Fix pairing of unsupported devices * Fix spam from Microsoft Teams and WhatsApp notifications * Improve gpx parsing and exporting +* Remove toast when bluetooth is off #### 0.87.1 diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java index fa2fa364c3..14a450e75b 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/ControlCenterv2.java @@ -403,7 +403,7 @@ public class ControlCenterv2 extends AppCompatActivity if(ACTION_CONNECT.equals(intent.getAction())) { String btDeviceAddress = intent.getStringExtra("device"); if(btDeviceAddress!=null){ - GBDevice candidate = DeviceHelper.getInstance().findAvailableDevice(btDeviceAddress, this); + GBDevice candidate = DeviceHelper.getInstance().findAvailableDevice(btDeviceAddress); if (candidate != null && !candidate.isConnected()) { GBApplication.deviceService(candidate).connect(); } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java index 0fd58483ca..0a4c4306e7 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceManager.java @@ -153,7 +153,7 @@ public class DeviceManager { } private void refreshPairedDevices() { - Set availableDevices = DeviceHelper.getInstance().getAvailableDevices(context); + Set availableDevices = DeviceHelper.getInstance().getAvailableDevices(); deviceList.retainAll(availableDevices); for (GBDevice availableDevice : availableDevices) { if (!deviceList.contains(availableDevice)) { 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 8d4d952b1e..bc3648e3ae 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/util/DeviceHelper.java @@ -27,7 +27,6 @@ package nodomain.freeyourgadget.gadgetbridge.util; import android.Manifest; -import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.widget.Toast; @@ -81,8 +80,8 @@ public class DeviceHelper { private final HashMap deviceTypeCache = new HashMap<>(); @Nullable - public GBDevice findAvailableDevice(String deviceAddress, Context context) { - Set availableDevices = getAvailableDevices(context); + public GBDevice findAvailableDevice(String deviceAddress) { + Set availableDevices = getAvailableDevices(); for (GBDevice availableDevice : availableDevices) { if (deviceAddress.equals(availableDevice.getAddress())) { return availableDevice; @@ -99,15 +98,7 @@ public class DeviceHelper { * Clients interested in the "live" devices being managed should use the class * DeviceManager. */ - public Set getAvailableDevices(Context context) { - BluetoothAdapter btAdapter = BluetoothAdapter.getDefaultAdapter(); - - if (btAdapter == null) { - GB.toast(context, context.getString(R.string.bluetooth_is_not_supported_), Toast.LENGTH_SHORT, GB.WARN); - } else if (!btAdapter.isEnabled()) { - GB.toast(context, context.getString(R.string.bluetooth_is_disabled_), Toast.LENGTH_SHORT, GB.WARN); - } - + public Set getAvailableDevices() { return new LinkedHashSet<>(getDatabaseDevices()); }