Skip to content
This repository has been archived by the owner on Nov 10, 2017. It is now read-only.

Commit

Permalink
Merge pull request #156 from mvglasow/issue111
Browse files Browse the repository at this point in the history 
De-duplicate Bluetooth connection code, fixes DTC connection issues (#111)
  • Loading branch information
@pires
pires committed Dec 21, 2015
2 parents 4e8ee3d + 6eb6e4b commit 55d26d6
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 39 deletions.
16 changes: 5 additions & 11 deletions src/main/java/com/github/pires/obd/reader/activity/TroubleCodesActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,22 @@
import android.widget.ListView;
import android.widget.Toast;


import com.github.pires.obd.commands.control.TroubleCodesCommand;
import com.github.pires.obd.commands.protocol.EchoOffCommand;
import com.github.pires.obd.commands.protocol.LineFeedOffCommand;
import com.github.pires.obd.commands.protocol.ObdResetCommand;

import com.github.pires.obd.commands.protocol.ResetTroubleCodesCommand;
import com.github.pires.obd.commands.protocol.SelectProtocolCommand;
import com.github.pires.obd.enums.ObdProtocols;
import com.github.pires.obd.exceptions.MisunderstoodCommandException;
import com.github.pires.obd.exceptions.NoDataException;
import com.github.pires.obd.exceptions.UnableToConnectException;
import com.github.pires.obd.reader.R;
import com.github.pires.obd.reader.io.BluetoothManager;
import com.google.inject.Inject;

import java.io.IOException;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
Expand All @@ -46,8 +46,6 @@
public class TroubleCodesActivity extends Activity {

private static final String TAG = TroubleCodesActivity.class.getName();
private static final UUID MY_UUID = UUID
.fromString("00001101-0000-1000-8000-00805F9B34FB");
private static final int NO_BLUETOOTH_DEVICE_SELECTED = 0;
private static final int CANNOT_CONNECT_TO_DEVICE = 1;
private static final int NO_DATA = 3;
Expand Down Expand Up @@ -118,7 +116,7 @@ public boolean handleMessage(Message msg) {
return false;
}
});

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Expand Down Expand Up @@ -154,9 +152,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
case R.id.action_clear_codes:
try {
sock = dev.createRfcommSocketToServiceRecord(MY_UUID);
sock.connect();

sock = BluetoothManager.connect(dev);
} catch (Exception e) {
Log.e(
TAG,
Expand Down Expand Up @@ -294,9 +290,7 @@ protected String doInBackground(String... params) {

// Instantiate a BluetoothSocket for the remote device and connect it.
try {
sock = dev.createRfcommSocketToServiceRecord(MY_UUID);
sock.connect();

sock = BluetoothManager.connect(dev);
} catch (Exception e) {
Log.e(
TAG,
Expand Down
59 changes: 59 additions & 0 deletions src/main/java/com/github/pires/obd/reader/io/BluetoothManager.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
package com.github.pires.obd.reader.io;

import java.io.IOException;
import java.lang.reflect.Method;
import java.util.UUID;

import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothSocket;
import android.util.Log;

public class BluetoothManager {

private static final String TAG = BluetoothManager.class.getName();
/*
* http://developer.android.com/reference/android/bluetooth/BluetoothDevice.html
* #createRfcommSocketToServiceRecord(java.util.UUID)
*
* "Hint: If you are connecting to a Bluetooth serial board then try using the
* well-known SPP UUID 00001101-0000-1000-8000-00805F9B34FB. However if you
* are connecting to an Android peer then please generate your own unique
* UUID."
*/
private static final UUID MY_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");

/**
* @brief Instantiates a BluetoothSocket for the remote device and connects it.
* <p/>
* See http://stackoverflow.com/questions/18657427/ioexception-read-failed-socket-might-closed-bluetooth-on-android-4-3/18786701#18786701
*
* @param dev The remote device to connect to
* @return The BluetoothSocket
* @throws IOException
*/
public static BluetoothSocket connect(BluetoothDevice dev) throws IOException {
BluetoothSocket sock = null;
BluetoothSocket sockFallback = null;

Log.d(TAG, "Starting Bluetooth connection..");
try {
sock = dev.createRfcommSocketToServiceRecord(MY_UUID);
sock.connect();
} catch (Exception e1) {
Log.e(TAG, "There was an error while establishing Bluetooth connection. Falling back..", e1);
Class<?> clazz = sock.getRemoteDevice().getClass();
Class<?>[] paramTypes = new Class<?>[]{Integer.TYPE};
try {
Method m = clazz.getMethod("createRfcommSocket", paramTypes);
Object[] params = new Object[]{Integer.valueOf(1)};
sockFallback = (BluetoothSocket) m.invoke(sock.getRemoteDevice(), params);
sockFallback.connect();
sock = sockFallback;
} catch (Exception e2) {
Log.e(TAG, "Couldn't fallback while establishing Bluetooth connection.", e2);
throw new IOException(e2.getMessage());
}
}
return sock;
}
}
34 changes: 6 additions & 28 deletions src/main/java/com/github/pires/obd/reader/io/ObdGatewayService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import com.github.pires.obd.reader.R;
import com.github.pires.obd.reader.activity.ConfigActivity;
import com.github.pires.obd.reader.activity.MainActivity;
import com.github.pires.obd.reader.io.BluetoothManager;
import com.github.pires.obd.reader.io.ObdCommandJob.ObdCommandJobState;
import com.google.inject.Inject;

Expand All @@ -46,16 +47,6 @@
public class ObdGatewayService extends AbstractGatewayService {

private static final String TAG = ObdGatewayService.class.getName();
/*
* http://developer.android.com/reference/android/bluetooth/BluetoothDevice.html
* #createRfcommSocketToServiceRecord(java.util.UUID)
*
* "Hint: If you are connecting to a Bluetooth serial board then try using the
* well-known SPP UUID 00001101-0000-1000-8000-00805F9B34FB. However if you
* are connecting to an Android peer then please generate your own unique
* UUID."
*/
private static final UUID MY_UUID = UUID.fromString("00001101-0000-1000-8000-00805F9B34FB");
private final IBinder binder = new ObdGatewayServiceBinder();
@Inject
SharedPreferences prefs;
Expand Down Expand Up @@ -139,24 +130,11 @@ private void startObdConnection() throws IOException {
Log.d(TAG, "Starting OBD connection..");
isRunning = true;
try {
// Instantiate a BluetoothSocket for the remote device and connect it.
sock = dev.createRfcommSocketToServiceRecord(MY_UUID);
sock.connect();
} catch (Exception e1) {
Log.e(TAG, "There was an error while establishing Bluetooth connection. Falling back..", e1);
Class<?> clazz = sock.getRemoteDevice().getClass();
Class<?>[] paramTypes = new Class<?>[]{Integer.TYPE};
try {
Method m = clazz.getMethod("createRfcommSocket", paramTypes);
Object[] params = new Object[]{Integer.valueOf(1)};
sockFallback = (BluetoothSocket) m.invoke(sock.getRemoteDevice(), params);
sockFallback.connect();
sock = sockFallback;
} catch (Exception e2) {
Log.e(TAG, "Couldn't fallback while establishing Bluetooth connection. Stopping app..", e2);
stopService();
throw new IOException();
}
sock = BluetoothManager.connect(dev);
} catch (Exception e2) {
Log.e(TAG, "There was an error while establishing Bluetooth connection. Stopping app..", e2);
stopService();
throw new IOException();
}

// Let's configure the connection.
Expand Down

0 comments on commit 55d26d6

Please sign in to comment.