altosdroid: Add debugging statements to AltosBluetooth

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / AltosBluetooth.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index 79e31e8901ce6ddcc4de1ff998a21c157d42e0dd..db63b342cbb8803e8adcd3181041f219c0f7fd88 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -37,6 +37,7 @@ public class AltosBluetooth extends AltosLink {
        private static final boolean D = true;
 
        private ConnectThread    connect_thread = null;
+       private Thread           input_thread   = null;
 
        private BluetoothAdapter adapter;
        private BluetoothDevice  device;
@@ -44,6 +45,18 @@ public class AltosBluetooth extends AltosLink {
        private InputStream      input;
        private OutputStream     output;
 
+       // Constructor
+       public AltosBluetooth(BluetoothDevice in_device) {
+               adapter = BluetoothAdapter.getDefaultAdapter();
+
+
+               connect_thread = new ConnectThread(device);
+               connect_thread.start();
+
+               input_thread = new Thread(this);
+               input_thread.start();
+       }
+
        private class ConnectThread extends Thread {
                private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
 
@@ -114,13 +127,16 @@ public class AltosBluetooth extends AltosLink {
        }
 
        private void connection_failed() {
+               if (D) Log.i(TAG, "Bluetooth Connection failed!");
        }
        
        public void print(String data) {
                byte[] bytes = data.getBytes();
                try {
+                       if (D) Log.i(TAG, "Entering print();");
                        wait_connected();
                        output.write(bytes);
+                       if (D) Log.i(TAG, "Writing bytes: '" + data + "'");
                } catch (IOException e) {
                        connection_failed();
                } catch (InterruptedException e) {
@@ -146,6 +162,13 @@ public class AltosBluetooth extends AltosLink {
                                connect_thread.cancel();
                                connect_thread = null;
                        }
+                       if (input_thread != null) {
+                               try {
+                                       input_thread.interrupt();
+                                       input_thread.join();
+                               } catch (Exception e) {}
+                               input_thread = null;
+                       }
                }
        }
 
@@ -156,9 +179,4 @@ public class AltosBluetooth extends AltosLink {
        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
+}