From: Mike Beattie <mike@ethernal.org>
Date: Tue, 28 Aug 2012 09:58:47 +0000 (+1200)
Subject: altosdroid: rework ConnectThread
X-Git-Tag: 1.1~47^2~11
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=7664ecc0003151d3f05537f17914df2bf48e4275

altosdroid: rework ConnectThread

* Start input_thread after connection, otherwise it's painful to kill
  on connect failure.

Signed-off-by: Mike Beattie <mike@ethernal.org>
---

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 5a8ed096..dffa9ffb 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -59,8 +59,6 @@ public class AltosBluetooth extends AltosLink {
 		connect_thread = new ConnectThread(device);
 		connect_thread.start();
 
-		input_thread = new Thread(this);
-		input_thread.start();
 	}
 
 	private class ConnectThread extends Thread {
@@ -108,20 +106,22 @@ public class AltosBluetooth extends AltosLink {
 					return;
 				}
 
+				input_thread = new Thread(AltosBluetooth.this);
+				input_thread.start();
+
 				// Configure the newly connected device for telemetry
 				print("~\nE 0\n");
 				set_monitor(false);
 
-				// Reset the ConnectThread because we're done
-				connect_thread = null;
-
-				// Send the device name back to the Telemetry Service
-				name = device.getName();
+				// Let TelemetryService know we're connected
 				handler.obtainMessage(TelemetryService.MSG_CONNECTED).sendToTarget();
 
 				// Notify other waiting threads, now that we're connected
 				AltosBluetooth.this.notifyAll();
 
+				// Reset the ConnectThread because we're done
+				connect_thread = null;
+
 				if (D) Log.d(TAG, "ConnectThread: Connect completed");
 			}
 		}