demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

dispose DeviceSupports if connect() throws an exception (#5045)

Browse Source
This commit is contained in:
Thomas Kuehne
2025-07-05 18:04:45 +02:00
parent 165a78f99c
commit 42d19dbaed
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/DeviceCommunicationService.java
+20 -11
View File
@@ -719,20 +719,29 @@ public class DeviceCommunicationService extends Service implements SharedPrefere
}
if (deviceSupport != null) {
final boolean connected;
if (firstTime) {
connected = deviceSupport.connectFirstTime();
} else {
deviceSupport.setAutoReconnect(autoReconnect);
deviceSupport.setScanReconnect(reconnectViaScan);
if (BuildConfig.DEBUG) {
connected = stressTestConnect(deviceSupport);
try {
final boolean connected;
if (firstTime) {
connected = deviceSupport.connectFirstTime();
} else {
connected = deviceSupport.connect();
deviceSupport.setAutoReconnect(autoReconnect);
deviceSupport.setScanReconnect(reconnectViaScan);
if (BuildConfig.DEBUG) {
connected = stressTestConnect(deviceSupport);
} else {
connected = deviceSupport.connect();
}
}
LOG.debug("connectToDevice - {} connected:{} firstTime:{}", deviceAddress,
connected, firstTime);
} catch (Exception e) {
try {
deviceSupport.dispose();
} catch (Exception ignored) {
}
registeredStruct.setDeviceSupport(null);
throw e;
}
LOG.debug("connectToDevice - {} connected:{} firstTime:{}", deviceAddress,
connected, firstTime);
} else {
GB.toast(this, getString(R.string.cannot_connect, "Can't create device support"), Toast.LENGTH_SHORT, GB.ERROR);
}