X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTelemetryService.java;h=88ba805cd44fbb1fb2f5ca65c285e847eb014a36;hb=fa8668931cbbc1506560222f2db7e427b514a351;hp=9c2fde97b778dc434a8e060f1d2f9a048a634710;hpb=31bffa435cec2098c7ab5c42c829ba6e1578b5d2;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
index 9c2fde97..88ba805c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TelemetryService.java
@@ -27,17 +27,15 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.bluetooth.BluetoothDevice;
 import android.content.Intent;
+//import android.os.Bundle;
 import android.os.IBinder;
 import android.os.Handler;
 import android.os.Message;
 import android.os.Messenger;
+import android.os.RemoteException;
 import android.util.Log;
 import android.widget.Toast;
 
-// Need the following import to get access to the app resources, since this
-// class is in a sub-package.
-//import org.altusmetrum.AltosDroid.R;
-
 import org.altusmetrum.AltosLib.*;
 
 public class TelemetryService extends Service {
@@ -49,6 +47,8 @@ public class TelemetryService extends Service {
 	static final int MSG_UNREGISTER_CLIENT = 2;
 	static final int MSG_CONNECT           = 3;
 	static final int MSG_CONNECTED         = 4;
+	static final int MSG_CONNECT_FAILED    = 5;
+	static final int MSG_DISCONNECTED      = 6;
 
 	public static final int STATE_NONE       = 0;
 	public static final int STATE_READY      = 1;
@@ -65,7 +65,7 @@ public class TelemetryService extends Service {
 	final Messenger mMessenger = new Messenger(mHandler); // Target we publish for clients to send messages to IncomingHandler.
 
 	// Name of the connected device
-	private String mConnectedDeviceName = null;
+	private BluetoothDevice device = null;
 	private AltosBluetooth mAltosBluetooth = null;
 	private int state = STATE_NONE;
 	LinkedBlockingQueue<AltosLine> telem;
@@ -81,6 +81,12 @@ public class TelemetryService extends Service {
 			switch (msg.what) {
 			case MSG_REGISTER_CLIENT:
 				s.mClients.add(msg.replyTo);
+				try {
+					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
+					msg.replyTo.send(Message.obtain(null, AltosDroid.MSG_STATE_CHANGE, s.state, -1));
+				} catch (RemoteException e) {
+					s.mClients.remove(msg.replyTo);
+				}
 				if (D) Log.d(TAG, "Client bound to service");
 				break;
 			case MSG_UNREGISTER_CLIENT:
@@ -89,13 +95,23 @@ public class TelemetryService extends Service {
 				break;
 			case MSG_CONNECT:
 				if (D) Log.d(TAG, "Connect command received");
-				s.startAltosBluetooth((BluetoothDevice) msg.obj);
+				s.device = (BluetoothDevice) msg.obj;
+				s.startAltosBluetooth();
 				break;
 			case MSG_CONNECTED:
 				if (D) Log.d(TAG, "Connected to device");
+				s.sendMessageToClients(Message.obtain(null, AltosDroid.MSG_DEVNAME, s.device.getName()));
 				s.setState(STATE_CONNECTED);
 				s.mAltosBluetooth.add_monitor(s.telem);
 				break;
+			case MSG_CONNECT_FAILED:
+				if (D) Log.d(TAG, "Connection failed... retrying");
+				s.startAltosBluetooth();
+				break;
+			case MSG_DISCONNECTED:
+				if (D) Log.d(TAG, "Disconnected from " + s.device.getName());
+				s.stopAltosBluetooth();
+				break;
 			default:
 				super.handleMessage(msg);
 			}
@@ -113,17 +129,26 @@ public class TelemetryService extends Service {
 	}
 
 	private void stopAltosBluetooth() {
+		if (D) Log.i(TAG, "Stopping BT");
 		setState(STATE_READY);
 		if (mAltosBluetooth != null) {
+			if (D) Log.i(TAG, "Closing AltosBluetooth");
 			mAltosBluetooth.close();
 			mAltosBluetooth = null;
 		}
+		device = null;
 		telem.clear();
 	}
 
-	private void startAltosBluetooth(BluetoothDevice d) {
-			mAltosBluetooth = new AltosBluetooth(d, mHandler);
+	private void startAltosBluetooth() {
+		if (mAltosBluetooth == null) {
+			if (D) Log.i(TAG, "Connecting to " + device.getName());
+			mAltosBluetooth = new AltosBluetooth(device, mHandler);
 			setState(STATE_CONNECTING);
+		} else {
+			stopAltosBluetooth();
+			mHandler.sendMessageDelayed(Message.obtain(null, MSG_CONNECT, device), 1000);
+		}
 	}
 
 	private synchronized void setState(int s) {