1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-28 21:06:50 +01:00

Liveview: ignore the SocketTimeoutException, disconnect in any other case

This commit is contained in:
Daniele Gobbetti 2016-12-04 21:04:30 +01:00
parent e773b71194
commit e53b8b6b32

View File

@ -13,6 +13,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.net.SocketTimeoutException;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.UUID; import java.util.UUID;
@ -97,18 +98,16 @@ public class LiveviewIoThread extends GBDeviceIoThread {
mLiveviewSupport.evaluateGBDeviceEvent(deviceEvent); mLiveviewSupport.evaluateGBDeviceEvent(deviceEvent);
} }
} }
} catch (SocketTimeoutException ignore) {
LOG.debug("socket timeout, we can't help but ignore this");
} catch (IOException e) { } catch (IOException e) {
LOG.info(e.getMessage());
if (e.getMessage() != null && e.getMessage().contains("socket closed")) { //FIXME: this does not feel right mIsConnected = false;
LOG.info(e.getMessage()); mBtSocket = null;
mIsConnected = false; mInStream = null;
mBtSocket = null; mOutStream = null;
mInStream = null; LOG.info("Bluetooth socket closed, will quit IO Thread");
mOutStream = null; break;
LOG.info("Bluetooth socket closed, will quit IO Thread");
break;
}
} }
} }