X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=1fa62d870f7944395c2d3ef4847869222b08cb4a;hb=502b24eb2c9c76e4e2bdcc79be0b71a869488b37;hp=10c2e26fdd26f87d5111cda99c0d2e986468b33b;hpb=c7bef83fd553987f83c0bf7ff37ef941872564fe;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 10c2e26f..1fa62d87 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -161,8 +161,14 @@ public class TelemetryService extends Service {
 			mAltosBluetooth = new AltosBluetooth(device, mHandler);
 			setState(STATE_CONNECTING);
 		} else {
+			// This is a bit of a hack - if it appears we're still connected, we treat this as a restart.
+			// So, to give a suitable delay to teardown/bringup, we just schedule a resend of a message
+			// to ourselves in a few seconds time that will ultimately call this method again.
+			// ... then we tear down the existing connection.
+			// We do it this way around so that we don't lose a reference to the device when this method
+			// is called on reception of MSG_CONNECT_FAILED in the handler above.
+			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 3000);
 			stopAltosBluetooth();
-			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
 		}
 	}