MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-28 21:06:50 +01:00
Code Releases Wiki Activity

Liveview: ignore the SocketTimeoutException, disconnect in any other case

Browse Source
This commit is contained in:
Daniele Gobbetti 2016-12-04 21:04:30 +01:00
parent e773b71194
commit e53b8b6b32
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/liveview/LiveviewIoThread.java
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,10 +98,9 @@ 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) {
if (e.getMessage() != null && 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; mBtSocket = null;
@ -110,7 +110,6 @@ public class LiveviewIoThread extends GBDeviceIoThread {
break; break;
} }
} }
}
mIsConnected = false; mIsConnected = false;
if (mBtSocket != null) { if (mBtSocket != null) {