X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=d506ff59cc4702e2d2fa8561330af5289edb2b8e;hp=1f0946799d71549c35e19ffb2a78b24752d385a6;hb=bca342577740a9d04b8419ecadcff582e77f1e61;hpb=bad155538c4630c62ade80afd20830aad37c287e diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index 1f094679..d506ff59 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java @@ -26,151 +26,196 @@ 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_7.*; -public class AltosBluetooth extends AltosLink { +public class AltosBluetooth extends AltosDroidLink { // Debugging private static final String TAG = "AltosBluetooth"; private static final boolean D = true; - /** - * This thread runs while attempting to make an outgoing connection - * with a device. It runs straight through; the connection either - * succeeds or fails. - */ + private ConnectThread connect_thread = null; - private BluetoothAdapter adapter; - private ConnectThread connect_thread; - private BluetoothSocket socket; - private InputStream input; - private OutputStream output; + private BluetoothDevice device; + private BluetoothSocket socket; + private InputStream input; + private OutputStream output; + private boolean pause; - private class ConnectThread extends Thread { - private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB"); + // Constructor + public AltosBluetooth(BluetoothDevice device, Handler handler, boolean pause) { + super(handler); + this.device = device; + this.handler = handler; + this.pause = pause; + + connect_thread = new ConnectThread(); + connect_thread.start(); + } + + void connected() { + if (closed()) { + if (D) Log.d(TAG, "connected after closed"); + return; + } + + AltosDebug.check_ui("connected\n"); + try { + synchronized(this) { + if (socket != null) { + input = socket.getInputStream(); + output = socket.getOutputStream(); + super.connected(); + } + } + } catch (InterruptedException ie) { + connect_failed(); + } catch (IOException io) { + connect_failed(); + } + } + + private void connect_failed() { + if (closed()) { + if (D) Log.d(TAG, "connect_failed after closed"); + return; + } + + close_device(); + input = null; + output = null; + handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget(); + if (D) Log.e(TAG, "ConnectThread: Failed to establish connection"); + } - public ConnectThread(BluetoothDevice device) { - BluetoothSocket tmp_socket = null; + void close_device() { + BluetoothSocket tmp_socket; + synchronized(this) { + tmp_socket = socket; + socket = null; + } + + if (tmp_socket != null) { try { - tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID); + tmp_socket.close(); } catch (IOException e) { - e.printStackTrace(); + if (D) Log.e(TAG, "close_socket failed"); } + } + } + + public void close() { + super.close(); + input = null; + output = null; + } + + private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB"); + + private void create_socket(BluetoothDevice device) { + + BluetoothSocket tmp_socket = null; + + try { + tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID); + } catch (IOException e) { + e.printStackTrace(); + } + if (socket != null) { + if (D) Log.d(TAG, String.format("Socket already allocated %s", socket.toString())); + close_device(); + } + synchronized (this) { socket = tmp_socket; } + } + + private class ConnectThread extends Thread { 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 + if (pause) { try { - socket.close(); - } catch (IOException e2) { - if (D) Log.e(TAG, "unable to close() socket during connection failure", e2); + Thread.sleep(4000); + } catch (InterruptedException e) { } - connection_failed(); - return; } + create_socket(device); + // Always cancel discovery because it will slow down a connection try { - synchronized (AltosBluetooth.this) { - input = socket.getInputStream(); - output = socket.getOutputStream(); + BluetoothAdapter.getDefaultAdapter().cancelDiscovery(); + } catch (Exception e) { + if (D) Log.d(TAG, String.format("cancelDiscovery exception %s", e.toString())); + } + + BluetoothSocket local_socket = null; + + synchronized (AltosBluetooth.this) { + if (!closed()) + local_socket = socket; + } - // Reset the ConnectThread because we're done - AltosBluetooth.this.notify(); - connect_thread = null; - if (D) Log.i(TAG, "Completed connect"); + if (local_socket != null) { + try { + // Make a connection to the BluetoothSocket + // This is a blocking call and will only return on a + // successful connection or an exception + local_socket.connect(); + } catch (IOException e) { + if (D) Log.d(TAG, String.format("Connect exception %s", e.toString())); + local_socket = null; } - } catch (Exception e) { - if (D) Log.e(TAG, "Failed to finish connection", e); - e.printStackTrace(); } - } - public void cancel() { - try { - if (socket != null) - socket.close(); - } catch (IOException e) { - if (D) Log.e(TAG, "close() of connect socket failed", e); + if (local_socket != null) { + connected(); + } else { + connect_failed(); } + + if (D) Log.d(TAG, "ConnectThread: completed"); } } - private synchronized void wait_connected() throws InterruptedException { - if (input == null) { + private synchronized void wait_connected() throws InterruptedException, IOException { + if (input == null && socket != null) { + if (D) Log.d(TAG, "wait_connected..."); wait(); + if (D) Log.d(TAG, "wait_connected done"); } + if (socket == null) + throw new IOException(); } - private void connection_failed() { - } - - public void print(String data) { - byte[] bytes = data.getBytes(); + int write(byte[] buffer, int len) { try { - wait_connected(); - output.write(bytes); - } catch (IOException e) { - connection_failed(); - } catch (InterruptedException e) { - connection_failed(); + output.write(buffer, 0, len); + } catch (IOException ie) { + return -1; } + return len; } - public int getchar() { + int read(byte[] buffer, int len) { try { - wait_connected(); - return input.read(); - } catch (IOException e) { - connection_failed(); - } catch (java.lang.InterruptedException e) { - connection_failed(); + return input.read(buffer, 0, len); + } catch (IOException ie) { + return -1; } - return AltosLink.ERROR; - } - - public void close() { - synchronized(this) { - if (connect_thread != null) { - connect_thread.cancel(); - connect_thread = null; - } - } - } - - public void flush_output() { - super.flush_output(); - /* any local work needed to flush bluetooth? */ } - public boolean can_cancel_reply() { - return false; - } - public boolean show_reply_timeout() { - return true; - } - - public void hide_reply_timeout() { - } + // 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 +}