java: Bump java library versions for next release
[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java
index 79e31e8901ce6ddcc4de1ff998a21c157d42e0dd..a599698faaeb3f37604e23591957e9ab559f675f 100644 (file)
@@ -26,9 +26,12 @@ 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.*;
+import org.altusmetrum.altoslib_5.*;
 
 public class AltosBluetooth extends AltosLink {
 
@@ -37,6 +40,9 @@ public class AltosBluetooth extends AltosLink {
        private static final boolean D = true;
 
        private ConnectThread    connect_thread = null;
+       private Thread           input_thread   = null;
+
+       private Handler          handler;
 
        private BluetoothAdapter adapter;
        private BluetoothDevice  device;
@@ -44,6 +50,17 @@ public class AltosBluetooth extends AltosLink {
        private InputStream      input;
        private OutputStream     output;
 
+       // Constructor
+       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();
+
+       }
+
        private class ConnectThread extends Thread {
                private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
@@ -59,41 +76,53 @@ public class AltosBluetooth extends AltosLink {
                }
 
                public void run() {
-                       if (D) Log.i(TAG, "BEGIN ConnectThread");
+                       if (D) Log.d(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();
-
-                                       // Reset the ConnectThread because we're done
-                                       AltosBluetooth.this.notify();
-                                       connect_thread = null;
-                                       if (D) Log.i(TAG, "Completed connect");
+                               } 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();
+                                       handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED).sendToTarget();
+                                       if (D) Log.e(TAG, "ConnectThread: Failed to establish connection");
+                                       return;
                                }
-                       } catch (Exception e) {
-                               if (D) Log.e(TAG, "Failed to finish connection", e);
-                               e.printStackTrace();
+
+                               input_thread = new Thread(AltosBluetooth.this);
+                               input_thread.start();
+
+                               // Configure the newly connected device for telemetry
+                               print("~\nE 0\n");
+                               set_monitor(false);
+
+                               // 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");
                        }
                }
 
@@ -102,63 +131,108 @@ 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 (input == null) {
                        wait();
+                       if (input == null) throw new IOException();
                }
        }
 
-       private void connection_failed() {
+       private void connection_lost() {
+               if (D) Log.e(TAG, "Connection lost during I/O");
+               handler.obtainMessage(TelemetryService.MSG_DISCONNECTED).sendToTarget();
        }
-       
+
        public void print(String data) {
                byte[] bytes = data.getBytes();
+               if (D) Log.d(TAG, "print(): begin");
                try {
                        wait_connected();
                        output.write(bytes);
+                       if (D) Log.d(TAG, "print(): Wrote bytes: '" + data.replace('\n', '\\') + "'");
                } catch (IOException e) {
-                       connection_failed();
+                       connection_lost();
                } catch (InterruptedException e) {
-                       connection_failed();
+                       connection_lost();
                }
        }
 
+       public void putchar(byte c) {
+               byte[] bytes = { c };
+               if (D) Log.d(TAG, "print(): begin");
+               try {
+                       wait_connected();
+                       output.write(bytes);
+                       if (D) Log.d(TAG, "print(): Wrote byte: '" + c + "'");
+               } catch (IOException e) {
+                       connection_lost();
+               } catch (InterruptedException e) {
+                       connection_lost();
+               }
+       }               
+
        public int getchar() {
                try {
                        wait_connected();
                        return input.read();
                } catch (IOException e) {
-                       connection_failed();
+                       connection_lost();
                } catch (java.lang.InterruptedException e) {
-                       connection_failed();
+                       connection_lost();
                }
                return AltosLink.ERROR;
        }
-                       
+
        public void close() {
+               if (D) Log.d(TAG, "close(): begin");
                synchronized(this) {
+                       if (D) Log.d(TAG, "close(): synched");
+
                        if (connect_thread != null) {
+                               if (D) Log.d(TAG, "close(): stopping connect_thread");
                                connect_thread.cancel();
                                connect_thread = null;
                        }
+                       if (D) Log.d(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.d(TAG, "close(): stopping input_thread");
+                               try {
+                                       if (D) Log.d(TAG, "close(): input_thread.interrupt().....");
+                                       input_thread.interrupt();
+                                       if (D) Log.d(TAG, "close(): input_thread.join().....");
+                                       input_thread.join();
+                               } catch (Exception e) {}
+                               input_thread = null;
+                       }
+                       input = null;
+                       output = null;
+                       notifyAll();
                }
        }
 
 
+       // We override this method so that we can add some debugging. Not 100% elegant, but more useful
+       // than debugging one char at a time above in getchar()!
+       public void add_reply(AltosLine line) throws InterruptedException {
+               if (D) Log.d(TAG, String.format("Got REPLY: %s", line.line));
+               super.add_reply(line);
+       }
+
        //public void flush_output() { super.flush_output(); }
 
+       // Stubs of required methods when extending AltosLink
        public boolean can_cancel_reply()   { return false; }
        public boolean show_reply_timeout() { return true; }
        public void hide_reply_timeout()    { }
 
-       public AltosBluetooth(BluetoothDevice device) {
-               adapter = BluetoothAdapter.getDefaultAdapter();
-               connect_thread = new ConnectThread(device, true);
-               connect_thread.start();
-       }
-}
\ No newline at end of file
+}