Updated SimpleBluetoothListener to an abstract class, added ability t…

…o pair device through the library. Need to add a way to create insecure connections with unpaired devices.

BluetoothUtilityDemo.iml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.id="BluetoothUtilityDemo" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="com.github.developerpaul123.simplebluetoothlibrary" external.system.module.version="1.4.1" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="java-gradle" name="Java-Gradle">
+      <configuration>
+        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

app/app.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.developerpaul123.simplebluetoothlibrary" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.developerpaul123.simplebluetoothlibrary" external.system.module.version="1.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
@@ -71,11 +71,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.afollestad.material-dialogs/core/0.8.1.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.github.DeveloperPaul123/SimpleBluetoothLibrary/ca1f0785cd/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -93,11 +88,7 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="SimpleBluetoothLibrary-ca1f0785cd" level="project" />
-    <orderEntry type="library" exported="" name="core-0.8.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
+    <orderEntry type="module" module-name="btutillib" exported="" />
   </component>
 </module>

app/build.gradle

@@ -26,6 +26,6 @@ repositories {
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
-//    compile project(':btutillib')
-    compile 'com.github.DeveloperPaul123:SimpleBluetoothLibrary:ca1f0785cd'
+    compile project(':btutillib')
+//    compile 'com.github.DeveloperPaul123:SimpleBluetoothLibrary:ca1f0785cd'
 }

app/src/main/java/com/devpaul/bluetoothutilitydemo/MainActivity.java

@@ -165,6 +165,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
             if(resultCode == RESULT_OK) {
 
                 curMacAddress = data.getStringExtra(DeviceDialog.DEVICE_DIALOG_DEVICE_ADDRESS_EXTRA);
+                boolean paired = simpleBluetooth.getBluetoothUtility()
+                        .checkIfPaired(simpleBluetooth.getBluetoothUtility()
+                                .findDeviceByMacAddress(curMacAddress));
+                String message = paired ? "is paired" : "is not paired";
+                Log.i("ActivityResult", "Device " + message);
                 if(requestCode == SCAN_REQUEST) {
                     simpleBluetooth.connectToBluetoothDevice(curMacAddress);
                 } else {

app/src/main/java/com/devpaul/bluetoothutilitydemo/TestActivity.java

@@ -5,12 +5,53 @@
 import android.widget.Toast;
 
 import com.devpaul.bluetoothutillib.abstracts.BaseBluetoothActivity;
+import com.devpaul.bluetoothutillib.utils.SimpleBluetoothListener;
 
 /**
  * Created by Pauly D on 3/18/2015.
  */
 public class TestActivity extends BaseBluetoothActivity {
 
+    @Override
+    public SimpleBluetoothListener getListener() {
+        return new SimpleBluetoothListener() {
+            @Override
+            public void onBluetoothDataReceived(byte[] bytes, String data) {
+                super.onBluetoothDataReceived(bytes, data);
+            }
+
+            @Override
+            public void onDeviceConnected(BluetoothDevice device) {
+                super.onDeviceConnected(device);
+            }
+
+            @Override
+            public void onDeviceDisconnected(BluetoothDevice device) {
+                super.onDeviceDisconnected(device);
+            }
+
+            @Override
+            public void onDiscoveryStarted() {
+                super.onDiscoveryStarted();
+            }
+
+            @Override
+            public void onDiscoveryFinished() {
+                super.onDiscoveryFinished();
+            }
+
+            @Override
+            public void onDevicePaired(BluetoothDevice device) {
+                super.onDevicePaired(device);
+            }
+
+            @Override
+            public void onDeviceUnpaired(BluetoothDevice device) {
+                super.onDeviceUnpaired(device);
+            }
+        };
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -28,28 +69,4 @@ public void onDeviceSelected(String macAddress) {
         Toast.makeText(this, "Device " + macAddress, Toast.LENGTH_SHORT).show();
     }
 
-    @Override
-    public void onBluetoothDataReceived(byte[] bytes, String data) {
-
-    }
-
-    @Override
-    public void onDeviceConnected(BluetoothDevice device) {
-
-    }
-
-    @Override
-    public void onDeviceDisconnected(BluetoothDevice device) {
-
-    }
-
-    @Override
-    public void onDiscoveryStarted() {
-
-    }
-
-    @Override
-    public void onDiscoveryFinished() {
-
-    }
 }

btutillib/btutillib.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":btutillib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.DeveloperPaul123" external.system.module.version="1.4" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":btutillib" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.github.DeveloperPaul123" external.system.module.version="1.4.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>

btutillib/src/main/java/com/devpaul/bluetoothutillib/SimpleBluetooth.java

@@ -10,6 +10,7 @@
 import android.widget.Toast;
 
 import com.devpaul.bluetoothutillib.broadcasts.BluetoothBroadcastReceiver;
+import com.devpaul.bluetoothutillib.broadcasts.BluetoothPairingReceiver;
 import com.devpaul.bluetoothutillib.broadcasts.BluetoothStateReceiver;
 import com.devpaul.bluetoothutillib.broadcasts.FoundDeviceReceiver;
 import com.devpaul.bluetoothutillib.dialogs.DeviceDialog;
@@ -74,6 +75,22 @@ public void onDiscoveryStarted() {
         }
     };
 
+    private final BluetoothPairingReceiver.Callback bluetoothPairingReciever = new BluetoothPairingReceiver.Callback() {
+        @Override
+        public void onDevicePaired(BluetoothDevice device) {
+            if(mListener != null) {
+                mListener.onDevicePaired(device);
+            }
+        }
+
+        @Override
+        public void onDeviceUnpaired(BluetoothDevice device) {
+            if(mListener != null) {
+                mListener.onDeviceUnpaired(device);
+            }
+        }
+    };
+
     /**
      * {@link com.devpaul.bluetoothutillib.utils.SimpleBluetoothListener} for SimpleBluetooth
      */
@@ -104,6 +121,11 @@ public void onDiscoveryStarted() {
      */
     private BluetoothStateReceiver bluetoothStateReceiver;
 
+    /**
+     * {@code BluetoothPairingReceiver} that receives pair/unpair intents.
+     */
+    private BluetoothPairingReceiver bluetoothPairingReceiver;
+
     /**
      * State boolean
      */
@@ -148,13 +170,17 @@ public SimpleBluetooth(Context context, Activity refActivity) {
         this.bluetoothUtility = new BluetoothUtility(mContext, mActivity, mHandler);
         //register the state change receiver.
         this.curType = InputStreamType.NORMAL;
+
         /*
         Trying onActivityResult instead of this for now.
          */
 //        this.bluetoothBroadcastReceiver = BluetoothBroadcastReceiver
 //                .register(mContext, bluetoothBroadcastRecieverCallback);
         this.bluetoothStateReceiver = BluetoothStateReceiver
                 .register(mContext, stateRecieverCallback);
+
+        this.bluetoothPairingReceiver = BluetoothPairingReceiver
+                .register(mContext, bluetoothPairingReciever);
         //state boolean
         this.isInitialized = false;
     }
@@ -186,6 +212,8 @@ public SimpleBluetooth(Context context, Activity refActivity, BluetoothHandler h
 
         this.bluetoothStateReceiver = BluetoothStateReceiver
                 .register(mContext, stateRecieverCallback);
+        this.bluetoothPairingReceiver = BluetoothPairingReceiver
+                .register(mContext, bluetoothPairingReciever);
         //state boolean
         this.isInitialized = false;
     }
@@ -359,6 +387,7 @@ public void connectToBluetoothServer(String macAddress) {
 
     }
 
+
     /**
      * Connects to an A2DP device.
      * @param deviceName the name of the device to connect to.
@@ -387,8 +416,9 @@ public void makeDiscoverable(int duration) {
      * Ends all connections and unregister the receiver.
      */
     public void endSimpleBluetooth() {
-        BluetoothBroadcastReceiver.safeUnregister(mContext, bluetoothBroadcastReceiver);
+//        BluetoothBroadcastReceiver.safeUnregister(mContext, bluetoothBroadcastReceiver);
         BluetoothStateReceiver.safeUnregister(mContext, bluetoothStateReceiver);
+        BluetoothPairingReceiver.safeUnregister(mContext, bluetoothPairingReceiver);
         bluetoothUtility.closeConnections();
     }