- Added disconnect() method

- Fixed runOnMainThread() bug

Author: Douglas Nassif Roma Junior

BluetoothClassicLibrary/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 7
         targetSdkVersion 7
-        versionCode 2
-        versionName "0.3.0"
+        versionCode 3
+        versionName "0.3.1"
     }
     buildTypes {
         release {

BluetoothClassicLibrary/src/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothClassicService.java

@@ -51,26 +51,6 @@ protected BluetoothClassicService(BluetoothConfiguration config) {
         mStatus = BluetoothStatus.NONE;
     }
 
-    /**
-     * Set the current state of the chat connection
-     *
-     * @param status An integer defining the current connection state
-     */
-    protected synchronized void updateStatus(final BluetoothStatus status) {
-        if (D)
-            Log.d(TAG, "updateStatus() " + mStatus + " -> " + status);
-        mStatus = status;
-
-        // Give the new state to the Handler so the UI Activity can update
-        if (onEventCallback != null)
-            runOnMainThread(new Runnable() {
-                @Override
-                public void run() {
-                    onEventCallback.onStatusChange(status);
-                }
-            });
-
-    }
 
     /**
      * Start the ConnectThread to initiate a connection to a remote device.
@@ -82,38 +62,20 @@ public synchronized void connect(BluetoothDevice device) {
         if (D)
             Log.d(TAG, "connect to: " + device);
 
-        // Cancel any thread attempting to make a connection
-        if (mStatus == BluetoothStatus.CONNECTING) {
-            if (mConnectThread != null) {
-                mConnectThread.cancel();
-                mConnectThread = null;
-            }
-        }
-
-        // Cancel any thread currently running a connection
-        if (mConnectedThread != null) {
-            mConnectedThread.cancel();
-            mConnectedThread = null;
-        }
+        disconnect();
 
         // Start the thread to connect with the given device
         mConnectThread = new ConnectThread(device);
         mConnectThread.start();
         updateState(BluetoothStatus.CONNECTING);
     }
 
-    /**
-     * Start the ConnectedThread to begin managing a Bluetooth connection
-     *
-     * @param socket The BluetoothSocket on which the connection was made
-     * @param device The BluetoothDevice that has been connected
-     */
-    @RequiresPermission(Manifest.permission.BLUETOOTH)
-    public synchronized void connected(BluetoothSocket socket, final BluetoothDevice device) {
+    @Override
+    public void disconnect() {
         if (D)
-            Log.d(TAG, "connected");
+            Log.d(TAG, "disconnect");
 
-        // Cancel the thread that completed the connection
+        // Cancel any thread attempting to make a connection
         if (mConnectThread != null) {
             mConnectThread.cancel();
             mConnectThread = null;
@@ -124,6 +86,18 @@ public synchronized void connected(BluetoothSocket socket, final BluetoothDevice
             mConnectedThread.cancel();
             mConnectedThread = null;
         }
+    }
+
+    /**
+     * Start the ConnectedThread to begin managing a Bluetooth connection
+     *
+     * @param socket The BluetoothSocket on which the connection was made
+     * @param device The BluetoothDevice that has been connected
+     */
+    @RequiresPermission(Manifest.permission.BLUETOOTH)
+    private synchronized void connected(BluetoothSocket socket, final BluetoothDevice device) {
+        if (D)
+            Log.d(TAG, "connected");
 
         // Start the thread to manage the connection and perform transmissions
         mConnectedThread = new ConnectedThread(socket);
@@ -150,16 +124,9 @@ public void run() {
     public synchronized void stopService() {
         if (D)
             Log.d(TAG, "stop");
-        if (mConnectThread != null) {
-            mConnectThread.cancel();
-            mConnectThread = null;
-        }
-        if (mConnectedThread != null) {
-            mConnectedThread.cancel();
-            mConnectedThread = null;
-        }
-        if (getStatus() != BluetoothStatus.NONE)
-            updateState(BluetoothStatus.NONE);
+
+        disconnect();
+
         if (BluetoothService.mDefaultServiceInstance == this)
             BluetoothService.mDefaultServiceInstance = null;
     }

BluetoothClassicLibrary/src/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothService.java

@@ -2,7 +2,6 @@
 
 import android.bluetooth.BluetoothDevice;
 import android.os.Handler;
-import android.os.Looper;
 import android.util.Log;
 
 import java.lang.reflect.Constructor;
@@ -31,11 +30,7 @@ public abstract class BluetoothService {
     protected BluetoothService(BluetoothConfiguration config) {
         this.mConfig = config;
         this.mStatus = BluetoothStatus.NONE;
-        if (config.callListenersInMainThread) {
-            handler = new Handler();
-        } else {
-            handler = null;
-        }
+        this.handler = new Handler();
     }
 
     public void setOnEventCallback(OnBluetoothEventCallback onEventCallback) {
@@ -65,13 +60,20 @@ public void run() {
     }
 
     protected void runOnMainThread(Runnable runnable, long delayMillis) {
-        if ((mConfig.callListenersInMainThread && Looper.myLooper() != Looper.getMainLooper()) || delayMillis > 0) {
-            if (delayMillis > 0)
+        if (mConfig.callListenersInMainThread) {
+            if (delayMillis > 0) {
                 handler.postDelayed(runnable, delayMillis);
-            else
+            } else {
                 handler.post(runnable);
+            }
         } else {
-            runnable.run();
+            try {
+                if (delayMillis > 0)
+                    Thread.sleep(delayMillis);
+                runnable.run();
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
         }
     }
 
@@ -109,6 +111,11 @@ public synchronized BluetoothStatus getStatus() {
      */
     public abstract void connect(BluetoothDevice device);
 
+    /**
+     * Try to disconnect to the device and call the {@link OnBluetoothEventCallback}
+     */
+    public abstract void disconnect();
+
     /**
      * Write a array of bytes to the connected device.
      */

BluetoothClassicLibrary/src/main/java/com/github/douglasjunior/bluetoothclassiclibrary/BluetoothStatus.java

@@ -4,22 +4,7 @@
  * Created by douglas on 25/11/14.
  */
 public enum BluetoothStatus {
-    CONNECTED {
-        @Override
-        public String toString() {
-            return "Conectado";
-        }
-    },
-    CONNECTING {
-        @Override
-        public String toString() {
-            return "Conectando";
-        }
-    },
-    NONE {
-        @Override
-        public String toString() {
-            return "Desconectado";
-        }
-    }
+    CONNECTED,
+    CONNECTING,
+    NONE
 }

BluetoothLowEnergyLibrary/build.gradle

@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 18
-        versionCode 2
-        versionName "0.3.0"
+        versionCode 3
+        versionName "0.3.1"
     }
     buildTypes {
         release {

BluetoothLowEnergyLibrary/src/main/java/com/github/douglasjunior/bluetoothlowenergylibrary/BluetoothLeService.java

@@ -266,6 +266,13 @@ public void connect(BluetoothDevice bluetoothDevice) {
         }
     }
 
+    @Override
+    public void disconnect() {
+        if (bluetoothGatt != null) {
+            bluetoothGatt.disconnect();
+        }
+    }
+
     @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)
     final Runnable mStopScanRunnable = new Runnable() {
         @RequiresPermission(Manifest.permission.BLUETOOTH_ADMIN)

README.md

@@ -30,14 +30,14 @@ Soon
    2.1. Bluetooth Classic
      ```javascript
      dependencies {
-       compile 'com.github.douglasjunior.AndroidBluetoothLibrary:BluetoothClassicLibrary:0.3.0'
+       compile 'com.github.douglasjunior.AndroidBluetoothLibrary:BluetoothClassicLibrary:0.3.1'
      }
      ```
 
    2.2. Bluetooth Low Energy
      ```javascript
      dependencies {
-       compile 'com.github.douglasjunior.AndroidBluetoothLibrary:BluetoothLowEnergyLibrary:0.3.0'
+       compile 'com.github.douglasjunior.AndroidBluetoothLibrary:BluetoothLowEnergyLibrary:0.3.1'
      }
      ```
 

Sample/src/main/java/com/github/douglasjunior/bluetoothsample/MainActivity.java

@@ -30,7 +30,7 @@ public class MainActivity extends AppCompatActivity implements BluetoothService.
     /*
      * Change for the UUID that you want.
      */
-    private static final UUID UUID_DEVICE = UUID.fromString("00001101-0000-1000-8000-00805f9b3411");
+    private static final UUID UUID_DEVICE = UUID.fromString("00001101-0000-1000-8000-00805f9b34fb");
     private static final UUID UUID_SERVICE = UUID.fromString("35111C00001101-0000-1000-8000-00805F9B34FB");
     private static final UUID UUID_CHARACTERISTIC =  UUID.fromString("35111C00001101-0000-1000-8000-00805F9B34FB");