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

PebbleIoThread: Fix connection

Browse Source
This commit is contained in:
José Rebelo
2025-06-27 15:49:22 +02:00
committed by José Rebelo
parent 533ecb9ee3
commit ae32b7b1e4
1 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/pebble/PebbleIoThread.java
+44 -24
View File
@@ -199,7 +199,7 @@ class PebbleIoThread extends GBDeviceIoThread {
return false; return false;
} }
for (ParcelUuid uuid : uuids) { for (ParcelUuid uuid : uuids) {
LOG.info("found service UUID " + uuid); LOG.info("found service UUID {}", uuid);
} }
final UUID UuidSDP = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb"); final UUID UuidSDP = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
@@ -222,12 +222,11 @@ class PebbleIoThread extends GBDeviceIoThread {
LOG.debug("Not enabling background Webview, is disabled in preferences."); LOG.debug("Not enabling background Webview, is disabled in preferences.");
} }
} catch (IOException e) { } catch (IOException e) {
LOG.warn("error while connecting: " + e.getMessage(), e); LOG.error("error while connecting", e);
gbDevice.setUpdateState(originalState, getContext()); gbDevice.setUpdateState(originalState, getContext());
mInStream = null; cleanup();
mOutStream = null;
mBtSocket = null;
return false; return false;
} }
@@ -245,6 +244,7 @@ class PebbleIoThread extends GBDeviceIoThread {
mIsConnected = connect(); mIsConnected = connect();
if (!mIsConnected) { if (!mIsConnected) {
if (GBApplication.getPrefs().getAutoReconnect(getDevice()) && !mQuit) { if (GBApplication.getPrefs().getAutoReconnect(getDevice()) && !mQuit) {
LOG.debug("Failed to connect IO thread, will wait for reconnect");
gbDevice.setUpdateState(GBDevice.State.WAITING_FOR_RECONNECT, getContext()); gbDevice.setUpdateState(GBDevice.State.WAITING_FOR_RECONNECT, getContext());
} }
return; return;
@@ -351,7 +351,7 @@ class PebbleIoThread extends GBDeviceIoThread {
short length = buf.getShort(); short length = buf.getShort();
short endpoint = buf.getShort(); short endpoint = buf.getShort();
if (length < 0 || length > 8192) { if (length < 0 || length > 8192) {
LOG.info("invalid length " + length); LOG.warn("invalid length {}", length);
while (mInStream.available() > 0) { while (mInStream.available() > 0) {
readWithException(mInStream, buffer, 0, buffer.length); // read all readWithException(mInStream, buffer, 0, buffer.length); // read all
} }
@@ -369,7 +369,7 @@ class PebbleIoThread extends GBDeviceIoThread {
GBDeviceEvent[] deviceEvents = mPebbleProtocol.decodeResponse(buffer); GBDeviceEvent[] deviceEvents = mPebbleProtocol.decodeResponse(buffer);
if (deviceEvents == null) { if (deviceEvents == null) {
LOG.info("unhandled message to endpoint " + endpoint + " (" + length + " bytes)"); LOG.info("unhandled message to endpoint {} ({} bytes)", endpoint, length);
} else { } else {
for (GBDeviceEvent deviceEvent : deviceEvents) { for (GBDeviceEvent deviceEvent : deviceEvents) {
if (deviceEvent == null) { if (deviceEvent == null) {
@@ -389,27 +389,22 @@ class PebbleIoThread extends GBDeviceIoThread {
if (e.getMessage() != null && (e.getMessage().equals("broken pipe") || e.getMessage().contains("socket closed"))) { //FIXME: this does not feel right if (e.getMessage() != null && (e.getMessage().equals("broken pipe") || e.getMessage().contains("socket closed"))) { //FIXME: this does not feel right
LOG.info(e.getMessage()); LOG.info(e.getMessage());
mIsConnected = false; mIsConnected = false;
mBtSocket = null;
LOG.info("Bluetooth socket closed, will quit IO Thread"); LOG.info("Bluetooth socket closed, will quit IO Thread");
break; break;
} }
} }
} }
mIsConnected = false; mIsConnected = false;
if (mBtSocket != null) {
try { cleanup();
mBtSocket.close();
} catch (IOException e) {
LOG.warn("exception 2 in run", e);
}
mBtSocket = null;
}
enablePebbleKitSupport(false); enablePebbleKitSupport(false);
if (mQuit || !GBApplication.getPrefs().getAutoReconnect(getDevice())) { if (mQuit || !GBApplication.getPrefs().getAutoReconnect(getDevice())) {
LOG.debug("Exited read thread loop, disconnecting");
gbDevice.setState(GBDevice.State.NOT_CONNECTED); gbDevice.setState(GBDevice.State.NOT_CONNECTED);
} else { } else {
LOG.debug("Exited read thread loop, will wait for reconnect");
gbDevice.setState(GBDevice.State.WAITING_FOR_RECONNECT); gbDevice.setState(GBDevice.State.WAITING_FOR_RECONNECT);
} }
@@ -528,11 +523,11 @@ class PebbleIoThread extends GBDeviceIoThread {
setToken(appMgmt.token); setToken(appMgmt.token);
break; break;
case REQUEST: case REQUEST:
LOG.info("APPFETCH request: " + appMgmt.uuid + " / " + appMgmt.token); LOG.info("APPFETCH request: {} / {}", appMgmt.uuid, appMgmt.token);
try { try {
installApp(Uri.fromFile(new File(PebbleUtils.getPbwCacheDir(),appMgmt.uuid.toString() + ".pbw")), appMgmt.token); installApp(Uri.fromFile(new File(PebbleUtils.getPbwCacheDir(),appMgmt.uuid.toString() + ".pbw")), appMgmt.token);
} catch (IOException e) { } catch (IOException e) {
LOG.error("Error installing app: " + e.getMessage(), e); LOG.error("Error installing app", e);
} }
break; break;
default: default:
@@ -540,7 +535,7 @@ class PebbleIoThread extends GBDeviceIoThread {
} }
break; break;
case START: case START:
LOG.info("got GBDeviceEventAppManagement START event for uuid: " + appMgmt.uuid); LOG.info("got GBDeviceEventAppManagement START event for uuid: {}", appMgmt.uuid);
if (((PebbleCoordinator) gbDevice.getDeviceCoordinator()).isBackgroundJsEnabled(gbDevice)) { if (((PebbleCoordinator) gbDevice.getDeviceCoordinator()).isBackgroundJsEnabled(gbDevice)) {
if (mPebbleProtocol.hasAppMessageHandler(appMgmt.uuid)) { if (mPebbleProtocol.hasAppMessageHandler(appMgmt.uuid)) {
WebViewSingleton.getInstance().stopJavascriptInterface(); WebViewSingleton.getInstance().stopJavascriptInterface();
@@ -599,7 +594,7 @@ class PebbleIoThread extends GBDeviceIoThread {
if (!mIsInstalling) { if (!mIsInstalling) {
return; return;
} }
LOG.info("got " + bytes.length + "bytes for writeInstallApp()"); LOG.info("got {}bytes for writeInstallApp()", bytes.length);
write_real(bytes); write_real(bytes);
} }
@@ -613,10 +608,10 @@ class PebbleIoThread extends GBDeviceIoThread {
try { try {
mPBWReader = new PBWReader(uri, getContext(), platformName); mPBWReader = new PBWReader(uri, getContext(), platformName);
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
LOG.warn("file not found: " + e.getMessage(), e); LOG.warn("app file not found", e);
return; return;
} catch (IOException e) { } catch (IOException e) {
LOG.warn("unable to read file: " + e.getMessage(), e); LOG.warn("unable to read file", e);
return; return;
} }
@@ -729,13 +724,34 @@ class PebbleIoThread extends GBDeviceIoThread {
@Override @Override
public void quit() { public void quit() {
mQuit = true; mQuit = true;
cleanup();
}
private void cleanup() {
if (mOutStream != null) {
try {
mOutStream.close();
} catch (final Exception ignored) {
}
mOutStream = null;
}
if (mInStream != null) {
try {
mInStream.close();
} catch (final Exception ignored) {
}
mInStream = null;
}
if (mBtSocket != null) { if (mBtSocket != null) {
try { try {
mBtSocket.close(); mBtSocket.close();
} catch (IOException ignored) { } catch (final IOException ignored) {
} }
mBtSocket = null; mBtSocket = null;
} }
if (mTCPSocket != null) { if (mTCPSocket != null) {
try { try {
mTCPSocket.close(); mTCPSocket.close();
@@ -743,8 +759,12 @@ class PebbleIoThread extends GBDeviceIoThread {
} }
mTCPSocket = null; mTCPSocket = null;
} }
if (mPebbleLESupport != null) { if (mPebbleLESupport != null) {
mPebbleLESupport.close(); try {
mPebbleLESupport.close();
} catch (Exception ignored) {
}
mPebbleLESupport = null; mPebbleLESupport = null;
} }
} }