altosdroid: Send device name and connected state back to TelemetryService
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java
index c16e3cf5bc8365d57d1a63de86ad6dff6eb71dc3..278c6a5336b1298f807a536587382bb923a5380d 100644 (file)
@@ -26,6 +26,9 @@ import java.util.UUID;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
 import android.util.Log;
 
 import org.altusmetrum.AltosLib.*;
@@ -39,6 +42,8 @@ public class AltosBluetooth extends AltosLink {
        private ConnectThread    connect_thread = null;
        private Thread           input_thread   = null;
 
+       private Handler          handler;
+
        private BluetoothAdapter adapter;
        private BluetoothDevice  device;
        private BluetoothSocket  socket;
@@ -46,9 +51,10 @@ public class AltosBluetooth extends AltosLink {
        private OutputStream     output;
 
        // Constructor
-       public AltosBluetooth(BluetoothDevice in_device) {
+       public AltosBluetooth(BluetoothDevice in_device, Handler in_handler) {
                adapter = BluetoothAdapter.getDefaultAdapter();
                device = in_device;
+               handler = in_handler;
 
                connect_thread = new ConnectThread(device);
                connect_thread.start();
@@ -72,45 +78,54 @@ public class AltosBluetooth extends AltosLink {
                }
 
                public void run() {
-                       if (D) Log.i(TAG, "BEGIN ConnectThread");
+                       if (D) Log.i(TAG, "ConnectThread: BEGIN");
                        setName("ConnectThread");
 
                        // Always cancel discovery because it will slow down a connection
                        adapter.cancelDiscovery();
 
-                       // Make a connection to the BluetoothSocket
-                       try {
-                               // This is a blocking call and will only return on a
-                               // successful connection or an exception
-                               socket.connect();
-                       } catch (IOException e) {
-                               // Close the socket
+                       synchronized (AltosBluetooth.this) {
+                               // Make a connection to the BluetoothSocket
                                try {
-                                       socket.close();
-                               } catch (IOException e2) {
-                                       if (D) Log.e(TAG, "unable to close() socket during connection failure", e2);
-                               }
-                               connection_failed();
-                               return;
-                       }
+                                       // This is a blocking call and will only return on a
+                                       // successful connection or an exception
+                                       socket.connect();
 
-                       try {
-                               synchronized (AltosBluetooth.this) {
                                        input = socket.getInputStream();
                                        output = socket.getOutputStream();
+                               } catch (IOException e) {
+                                       // Close the socket
+                                       try {
+                                               socket.close();
+                                       } catch (IOException e2) {
+                                               if (D) Log.e(TAG, "ConnectThread: Failed to close() socket after failed connection");
+                                       }
+                                       input = null;
+                                       output = null;
+                                       AltosBluetooth.this.notifyAll();
+                                       if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
+                                       return;
+                               }
 
-                                       // Configure the newly connected device for telemetry
-                                       print("~\nE 0\n");
-                                       set_monitor(false);
+                               // Configure the newly connected device for telemetry
+                               print("~\nE 0\n");
+                               set_monitor(false);
 
-                                       // Reset the ConnectThread because we're done
-                                       AltosBluetooth.this.notify();
-                                       connect_thread = null;
-                                       if (D) Log.i(TAG, "Completed connect");
-                               }
-                       } catch (Exception e) {
-                               if (D) Log.e(TAG, "Failed to finish connection", e);
-                               e.printStackTrace();
+                               // Reset the ConnectThread because we're done
+                               connect_thread = null;
+
+                               // Send the device name back to the Telemetry Service
+                               name = device.getName();
+                               Message msg = handler.obtainMessage(TelemetryService.MSG_CONNECTED);
+                               Bundle b  = new Bundle();
+                               b.putString(TelemetryService.KEY_DEVNAME, name);
+                               msg.setData(b);
+                               handler.sendMessage(msg);
+
+                               // Notify other waiting threads, now that we're connected
+                               AltosBluetooth.this.notifyAll();
+
+                               if (D) Log.i(TAG, "ConnectThread: Connect completed");
                        }
                }
 
@@ -119,28 +134,32 @@ public class AltosBluetooth extends AltosLink {
                                if (socket != null)
                                        socket.close();
                        } catch (IOException e) {
-                               if (D) Log.e(TAG, "close() of connect socket failed", e);
+                               if (D) Log.e(TAG, "ConnectThread: close() of connect socket failed", e);
                        }
                }
        }
 
-       private synchronized void wait_connected() throws InterruptedException {
+       private synchronized void wait_connected() throws InterruptedException, IOException {
+               if (D) Log.i(TAG, "wait_connected(): begin");
                if (input == null) {
+                       if (D) Log.i(TAG, "wait_connected(): waiting");
                        wait();
+                       if (D) Log.i(TAG, "wait_connected(): wait ended..");
+                       if (input == null) throw new IOException();
                }
        }
 
        private void connection_failed() {
-               if (D) Log.i(TAG, "Bluetooth Connection failed!");
+               if (D) Log.e(TAG, "Bluetooth Socket IO failed!");
        }
        
        public void print(String data) {
                byte[] bytes = data.getBytes();
+               if (D) Log.i(TAG, "print(): begin");
                try {
-                       if (D) Log.i(TAG, "Entering print();");
                        wait_connected();
                        output.write(bytes);
-                       if (D) Log.i(TAG, "Writing bytes: '" + data + "'");
+                       if (D) Log.i(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
                } catch (IOException e) {
                        connection_failed();
                } catch (InterruptedException e) {
@@ -149,8 +168,10 @@ public class AltosBluetooth extends AltosLink {
        }
 
        public int getchar() {
+               if (D) Log.i(TAG, "getchar(): begin");
                try {
                        wait_connected();
+                       if (D) Log.i(TAG, "getchar(): proceeding");
                        return input.read();
                } catch (IOException e) {
                        connection_failed();
@@ -161,18 +182,34 @@ public class AltosBluetooth extends AltosLink {
        }
                        
        public void close() {
+               if (D) Log.i(TAG, "close(): begin");
                synchronized(this) {
+                       if (D) Log.i(TAG, "close(): synched");
+
                        if (connect_thread != null) {
+                               if (D) Log.i(TAG, "close(): stopping connect_thread");
                                connect_thread.cancel();
                                connect_thread = null;
                        }
+                       if (D) Log.i(TAG, "close(): Closing socket");
+                       try {
+                               socket.close();
+                       } catch (IOException e) {
+                               if (D) Log.e(TAG, "close(): unable to close() socket");
+                       }
                        if (input_thread != null) {
+                               if (D) Log.i(TAG, "close(): stopping input_thread");
                                try {
+                                       if (D) Log.i(TAG, "close(): input_thread.interrupt().....");
                                        input_thread.interrupt();
+                                       if (D) Log.i(TAG, "close(): input_thread.join().....");
                                        input_thread.join();
                                } catch (Exception e) {}
                                input_thread = null;
                        }
+                       input = null;
+                       output = null;
+                       notifyAll();
                }
        }