X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=3071c8f19ac5ef8b3c7cafc7871366637ec3cc4a;hb=d95b84b56c63002788939b93b6ce949d921a4892;hp=c16e3cf5bc8365d57d1a63de86ad6dff6eb71dc3;hpb=fe6680dd3b4c31b3d4edc3f06a142f02bcb879df;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
index c16e3cf5..3071c8f1 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java
@@ -26,6 +26,7 @@ import java.util.UUID;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothDevice;
 import android.bluetooth.BluetoothSocket;
+import android.os.Handler;
 import android.util.Log;
 
 import org.altusmetrum.AltosLib.*;
@@ -39,6 +40,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 +49,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,7 +76,7 @@ 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
@@ -119,28 +123,31 @@ 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 {
+		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..");
 		}
 	}
 
 	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 +156,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,14 +170,21 @@ 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 (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;