Fixed typo in BluetoothDevice.cxx Java_tinyb_BluetoothDevice_getTxPower

instead of getTXPower

Fixed class name in helper.cxx get_bluetooth_type, "Ltinyb/BluetoothType"
instead of "l" 

Added a method removeDevices() in BluetoothAdapter class to remove all
the known devices (getDevices() will return an empty list after this call).

Added startNearbyDiscovery() and stopNearbyDiscovery() in BlutoothManager
main class. The start method will clear the internal device list and
send a notification to a listener when a new device is found.
The implementation is a simple thread which will poll each x miliseconds
the list of known devices and compare it to an internal list of known
devices, if the device is new, an event is fired to the passed listener.

Signed-off-by: sbodmer <[email protected]>

Author: sbodmer

api/tinyb/BluetoothAdapter.hpp

@@ -48,14 +48,6 @@ friend class tinyb::BluetoothNotificationHandler;
 private:
     Adapter1 *object;
 
-    /** Removes a device from the list of devices available on this adapter.
-      * @param[in] arg_device The path of the device on DBus
-      * @return TRUE if device was successfully removed
-      */
-    bool remove_device (
-        const std::string &arg_device
-    );
-
 protected:
     BluetoothAdapter(Adapter1 *object);
 
@@ -97,6 +89,14 @@ friend class tinyb::BluetoothNotificationHandler;
 
     /* D-Bus method calls: */
 
+    /** Removes a device from the list of devices available on this adapter.
+      * @param[in] arg_device The path of the device on DBus
+      * @return TRUE if device was successfully removed
+      */
+    bool remove_device (
+        const std::string &arg_device
+    );
+    
     /** Turns on device discovery if it is disabled.
       * @return TRUE if discovery was successfully enabled
       */

java/BluetoothAdapter.java

@@ -87,6 +87,14 @@ public BluetoothDevice find(String name, String address) {
       */
     public native List<BluetoothDevice> getDevices();
 
+    /**
+     * Remove all the known devices
+     * 
+     * @return The number of devices removed from internal list
+     * @throws BluetoothException 
+     */
+    public native int removeDevices() throws BluetoothException;
+    
     /* D-Bus property accessors: */
     /** Returns the hardware address of this adapter.
       * @return The hardware address of this adapter.

java/BluetoothManager.java

@@ -32,6 +32,11 @@ public class BluetoothManager
     private long nativeInstance;
     private static BluetoothManager inst;
 
+    /**
+     * The thread to watch for nearby devices
+     */
+    private Thread nearbyThread = null;
+    
     static {
         try {
             System.loadLibrary("tinyb");
@@ -201,6 +206,83 @@ private native List<BluetoothObject> getObjects(int type, String name,
       */
     public native boolean stopDiscovery() throws BluetoothException;
 
+    /**
+     * When called, each new device found will fire an event to the passed
+     * listener<p>
+     *
+     * This method will create a new thread to handle the discovery process
+     * which is a simple polling of the current list (getDevices)
+     * <p>
+     *
+     * The thread is stopped when the nearbyStopDiscovery is called<p>
+     *
+     * @param listener
+     * @param pollingRate The polling rate is miliseconds (1000 = 1s)
+     * @param onlyManufacturerFilled If true, then only if the manufacturer data is filled, the event will be fired
+     */
+    public void startNearbyDiscovery(final BluetoothDeviceDiscoveryListener listener, final int pollingRate, final boolean onlyManufacturerFilled) {
+        //--- If alreay started, does nothing
+        if ((nearbyThread != null) && nearbyThread.isAlive()) return;
+        
+        //--- Remove all devices to have a clean start
+        getAdapters().get(0).removeDevices();
+        
+        //--- Start the bluez discovery
+        startDiscovery();
+
+        //--- Thread to poll the devices list
+        nearbyThread = new Thread() {
+            public void run() {
+                //--- The key is the address
+                HashMap<String, BluetoothDevice> discovered = new HashMap<String, BluetoothDevice>();
+                try {
+                    while (Thread.interrupted() == false) {
+                        List<BluetoothDevice> list = getDevices();
+                        for (BluetoothDevice d:list) {
+                            if (!discovered.containsKey(d.getAddress())) {
+                                if (onlyManufacturerFilled) {
+                                    if (!d.getManufacturerData().isEmpty()) {
+                                        discovered.put(d.getAddress(), d);
+                                        if (listener != null) listener.bluetoothDeviceDiscovered(d);
+                                    }
+                                    
+                                } else {
+                                    discovered.put(d.getAddress(), d);
+                                    if (listener != null) listener.bluetoothDeviceDiscovered(d);
+                                }
+                            }
+                        }
+                        //--- Polling rate of 1 second
+                        sleep(pollingRate);
+                    }
+
+                } catch (InterruptedException ex) {
+                    //--- Stopped by user or jvm
+                }
+                stopDiscovery();
+                
+            }
+        };
+        nearbyThread.start();
+
+    }
+
+    /**
+     * Stop the nearby thread
+     */
+    public void stopNearbyDiscovery() {
+        if ((nearbyThread != null) && nearbyThread.isAlive()) nearbyThread.interrupt();
+
+    }
+
+    /**
+     * Interface to implement to receive the device discovery event
+     */
+    public interface BluetoothDeviceDiscoveryListener {
+
+        public void bluetoothDeviceDiscovered(BluetoothDevice device);
+    }
+    
     private native void init() throws BluetoothException;
     private native void delete();
     private BluetoothManager()

java/jni/BluetoothAdapter.cxx

@@ -134,6 +134,36 @@ jobject Java_tinyb_BluetoothAdapter_getDevices(JNIEnv *env, jobject obj)
     return nullptr;
 }
 
+jint Java_tinyb_BluetoothAdapter_removeDevices(JNIEnv *env, jobject obj)
+{
+    try {
+        BluetoothAdapter *obj_adapter = getInstance<BluetoothAdapter>(env, obj);
+        std::vector<std::unique_ptr<tinyb::BluetoothDevice>> array = obj_adapter->get_devices();
+        
+        for (unsigned int i =0;i<array.size();i++) {
+            std::unique_ptr<tinyb::BluetoothDevice> *obj_device = &array.at(i);
+            std::string path = obj_device->get()->get_object_path();
+            // printf("PATH:%s\n", path.c_str());
+            // fflush(stdout);
+            obj_adapter->remove_device(path.c_str());
+            
+        }
+        return array.size();
+        
+    } catch (std::bad_alloc &e) {
+        raise_java_oom_exception(env, e);
+    } catch (BluetoothException &e) {
+        raise_java_bluetooth_exception(env, e);
+    } catch (std::runtime_error &e) {
+        raise_java_runtime_exception(env, e);
+    } catch (std::invalid_argument &e) {
+        raise_java_invalid_arg_exception(env, e);
+    } catch (std::exception &e) {
+        raise_java_exception(env, e);
+    }
+    return 0;
+}
+
 jstring Java_tinyb_BluetoothAdapter_getAddress(JNIEnv *env, jobject obj)
 {
     try {

java/jni/BluetoothDevice.cxx

@@ -34,7 +34,7 @@
 
 using namespace tinyb;
 
-jobject Java_tinyb_BluetoothAdapter_getBluetoothType(JNIEnv *env, jobject obj)
+jobject Java_tinyb_BluetoothDevice_getBluetoothType(JNIEnv *env, jobject obj)
 {
     try {
         (void)obj;
@@ -1098,7 +1098,7 @@ void Java_tinyb_BluetoothDevice_disableServiceDataNotifications(JNIEnv *env, job
 
 
 
-jshort Java_tinyb_BluetoothDevice_getTXPower(JNIEnv *env, jobject obj)
+jshort Java_tinyb_BluetoothDevice_getTxPower(JNIEnv *env, jobject obj)
 {
     try {
         BluetoothDevice *obj_device = getInstance<BluetoothDevice>(env, obj);

java/jni/helper.cxx

@@ -188,7 +188,7 @@ jobject get_bluetooth_type(JNIEnv *env, const char *field_name)
 {
     jclass b_type_enum = search_class(env, JAVA_PACKAGE "/BluetoothType");
 
-    jfieldID b_type_field = search_field(env, b_type_enum, field_name, "l", true);
+    jfieldID b_type_field = search_field(env, b_type_enum, field_name, "L" JAVA_PACKAGE "/BluetoothType;", true);
 
     jobject result = env->GetStaticObjectField(b_type_enum, b_type_field);
     return result;