X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FAltosBluetooth.java;h=32b7a65bc3e45578d2459aa41b391a38cabd515e;hp=390dccdb563e77ebc4da635c0e20bb4ae241c2a6;hb=7bfa8841b65707d629b425b306ec4cc3acfc156c;hpb=0f3597389977f86a8c1bdff1b7f46107c43ef306 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java index 390dccdb..32b7a65b 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosBluetooth.java @@ -21,172 +21,192 @@ package org.altusmetrum.AltosDroid; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.lang.reflect.Method; +import java.util.UUID; + import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothSocket; -import android.content.Context; -import android.os.Bundle; +//import android.os.Bundle; import android.os.Handler; -import android.os.Message; +//import android.os.Message; import android.util.Log; -import org.altusmetrum.AltosLib.*; +import org.altusmetrum.altoslib_6.*; -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 BluetoothAdapter adapter; + private BluetoothSocket socket; + private InputStream input; + private OutputStream output; - private class ConnectThread extends Thread { - private final BluetoothDevice mmDevice; - private String mSocketType; - BluetoothSocket tmp_socket; + // Constructor + public AltosBluetooth(BluetoothDevice device, Handler handler) { + super(handler); +// set_debug(D); + adapter = BluetoothAdapter.getDefaultAdapter(); + this.handler = handler; - public ConnectThread(BluetoothDevice device, boolean secure) { - mmDevice = device; - mSocketType = secure ? "Secure" : "Insecure"; + create_socket(device); + connect_thread = new ConnectThread(); + connect_thread.start(); + } - // Get a BluetoothSocket for a connection with the - // given BluetoothDevice - try { - if (secure) { - Method m = device.getClass().getMethod("createRfcommSocket", new Class[] {int.class}); - tmp_socket = (BluetoothSocket) m.invoke(device, 2); - // tmp = device.createRfcommSocket(2); - } else { - Method m = device.getClass().getMethod("createInsecureRfcommSocket", new Class[] {int.class}); - tmp_socket = (BluetoothSocket) m.invoke(device, 2); - // tmp = device.createInsecureRfcommSocket(2); + void connected() { + if (closed()) { + if (D) Log.d(TAG, "connected after closed"); + return; + } + + try { + synchronized(this) { + if (socket != null) { + input = socket.getInputStream(); + output = socket.getOutputStream(); + super.connected(); } - } catch (Exception e) { - Log.e(TAG, "Socket Type: " + mSocketType + "create() failed", e); - e.printStackTrace(); } + } catch (InterruptedException ie) { + connect_failed(); + } catch (IOException io) { + connect_failed(); } + } - public void run() { - Log.i(TAG, "BEGIN connect_thread SocketType:" + mSocketType); - setName("ConnectThread" + mSocketType); + private void connect_failed() { + if (closed()) { + if (D) Log.d(TAG, "connect_failed after closed"); + return; + } - // Always cancel discovery because it will slow down a connection - adapter.cancelDiscovery(); + close_device(); + input = null; + output = null; + handler.obtainMessage(TelemetryService.MSG_CONNECT_FAILED, this).sendToTarget(); + if (D) Log.e(TAG, "ConnectThread: Failed to establish connection"); + } - // Make a connection to the BluetoothSocket - try { - // This is a blocking call and will only return on a - // successful connection or an exception - tmp_socket.connect(); - } catch (IOException e) { - // Close the socket - try { - tmp_socket.close(); - } catch (IOException e2) { - Log.e(TAG, "unable to close() " + mSocketType + - " socket during connection failure", e2); - } - connection_failed(); - return; - } + void close_device() { + BluetoothSocket tmp_socket; - try { - synchronized (AltosBluetooth.this) { - input = tmp_socket.getInputStream(); - output = tmp_socket.getOutputStream(); - socket = tmp_socket; - // Reset the ConnectThread because we're done - AltosBluetooth.this.notify(); - connect_thread = null; - } - } catch (Exception e) { - Log.e(TAG, "Failed to finish connection", e); - e.printStackTrace(); - } + synchronized(this) { + tmp_socket = socket; + socket = null; } - public void cancel() { + if (tmp_socket != null) { try { - if (tmp_socket != null) - tmp_socket.close(); + tmp_socket.close(); } catch (IOException e) { - Log.e(TAG, "close() of connect " + mSocketType + " socket failed", e); + if (D) Log.e(TAG, "close_socket failed"); } } } - private synchronized void wait_connected() throws InterruptedException { - if (input == null) { - wait(); - } + public void close() { + super.close(); + input = null; + output = null; } - private void connection_failed() { - } - - public void print(String data) { - byte[] bytes = data.getBytes(); - try { - wait_connected(); - output.write(bytes); - } catch (IOException e) { - connection_failed(); - } catch (InterruptedException e) { - connection_failed(); - } - } + private final UUID SPP_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB"); + + private void create_socket(BluetoothDevice device) { + + BluetoothSocket tmp_socket = null; - public int getchar() { try { - wait_connected(); - return input.read(); + tmp_socket = device.createInsecureRfcommSocketToServiceRecord(SPP_UUID); } catch (IOException e) { - connection_failed(); - } catch (java.lang.InterruptedException e) { - connection_failed(); + 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; } - return AltosLink.ERROR; } - - public void close() { - synchronized(this) { - if (connect_thread != null) { - connect_thread.cancel(); - connect_thread = null; + + private class ConnectThread extends Thread { + + public void run() { + if (D) Log.d(TAG, "ConnectThread: BEGIN"); + setName("ConnectThread"); + + // Always cancel discovery because it will slow down a connection + try { + adapter.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; + } + + 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; + } } + + if (local_socket != null) { + connected(); + } else { + connect_failed(); + } + + if (D) Log.d(TAG, "ConnectThread: completed"); } } - public void flush_output() { - super.flush_output(); - /* any local work needed to flush bluetooth? */ + 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(); } - public boolean can_cancel_reply() { - return false; - } - public boolean show_reply_timeout() { - return true; - } - - public void hide_reply_timeout() { + int write(byte[] buffer, int len) { + try { + output.write(buffer, 0, len); + } catch (IOException ie) { + return -1; + } + return len; } - public AltosBluetooth(BluetoothDevice device) { - adapter = BluetoothAdapter.getDefaultAdapter(); - connect_thread = new ConnectThread(device, true); - connect_thread.start(); + int read(byte[] buffer, int len) { + try { + return input.read(buffer, 0, len); + } catch (IOException ie) { + return -1; + } } -} \ No newline at end of file + + // 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() { } + +}