Converging Java/JNI and C++ API to match tinyb interface requirements (step-2)

- BasicTypes: Align exception names w/ Java.

- BTTypes / EInfoReport: Add getDeviceIDModalias()

- DBTManager: Add getConnectionInfo(..) and setLocalName(..)

- OctetTypes: Fix put_octets(..), removed sizeof(). Adding put/get string methods

+++

DBTTypes:
- Fix Comments

- DBTDevice: Add appearance, getConnectionInfo(), connectGATT(..) and disconnectGATT().
  Last two GATT's ease association of GATTHandler w/ device for tinyb binding.

- DBTDevice: Fix defaultConnect(): Differenciate le public/random
- DBTDevice: New getConnectionInfo() - also may issue deviceUpdate callback on rssi/tx_power changes

- DBTAdapter: Add missing DBTAdapterStatusListener list declaration of previous commit.
- DBTAdapter: Add misc information access for tinyb binding.

+++

Java

- DBTAdapter: Adding more tinyb implementation code, sorting methods - ~90% complete

- DBTDevice: Adding more tinyb implementation code, sorting methods - ~70% complete

2 files changed, 171 insertions, 115 deletions

diff --git a/java/direct_bt/tinyb/DBTAdapter.java b/java/direct_bt/tinyb/DBTAdapter.java
index 11795f28..71ab8394 100644
--- a/java/direct_bt/tinyb/DBTAdapter.java
+++ b/java/direct_bt/tinyb/DBTAdapter.java
@@ -58,8 +58,11 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
     private final long discoveringNotificationRef = 0;
 
     private BluetoothNotification<Boolean> discoverableNotification = null;
+    private boolean isDiscoverable = false;
     private BluetoothNotification<Boolean> poweredNotification = null;
+    private boolean isPowered = false;
     private BluetoothNotification<Boolean> pairableNotification = null;
+    private boolean isPairable = false;
 
     private boolean isOpen = false;
     private List<BluetoothDevice> discoveredDevices = new ArrayList<BluetoothDevice>();
@@ -100,20 +103,12 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
     @Override
     public String getName() { return name; }
 
-    public String getInterfaceName() {
-        throw new UnsupportedOperationException(); // FIXME
-    }
-
     @Override
     public BluetoothType getBluetoothType() { return class_type(); }
 
     static BluetoothType class_type() { return BluetoothType.ADAPTER; }
 
     @Override
-    public final BluetoothAdapter clone()
-    { throw new UnsupportedOperationException(); } // FIXME
-
-    @Override
     public BluetoothDevice find(final String name, final String address, final long timeoutMS) {
         final BluetoothManager manager = DBTManager.getBluetoothManager();
         return (BluetoothDevice) manager.find(BluetoothType.DEVICE, name, address, this, timeoutMS);
@@ -141,19 +136,40 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
         return out.toString();
     }
 
-    /* property accessors: */
+    /* Unsupported */
 
     @Override
-    public String getAlias() { throw new UnsupportedOperationException(); } // FIXME
+    public long getBluetoothClass() { throw new UnsupportedOperationException(); } // FIXME
 
     @Override
-    public void setAlias(final String value) { throw new UnsupportedOperationException(); } // FIXME
+    public final BluetoothAdapter clone() { throw new UnsupportedOperationException(); } // FIXME
 
     @Override
-    public long getBluetoothClass() { throw new UnsupportedOperationException(); } // FIXME
+    public String getInterfaceName() { throw new UnsupportedOperationException(); } // FIXME
 
     @Override
-    public native boolean getPowered();
+    public long getDiscoverableTimeout() { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public void setDiscoverableTimout(final long value) { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public long getPairableTimeout() { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public void setPairableTimeout(final long value) { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public String getModalias() { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public String[] getUUIDs() { throw new UnsupportedOperationException(); } // FIXME
+
+
+    /* Java callbacks */
+
+    @Override
+    public boolean getPowered() { return isPowered; }
 
     @Override
     public synchronized void enablePoweredNotifications(final BluetoothNotification<Boolean> callback) {
@@ -166,10 +182,7 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
     }
 
     @Override
-    public native void setPowered(boolean value);
-
-    @Override
-    public native boolean getDiscoverable();
+    public boolean getDiscoverable() { return isDiscoverable; }
 
     @Override
     public synchronized void enableDiscoverableNotifications(final BluetoothNotification<Boolean> callback) {
@@ -182,19 +195,7 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
     }
 
     @Override
-    public native void setDiscoverable(boolean value);
-
-    @Override
-    public native long getDiscoverableTimeout();
-
-    @Override
-    public native void setDiscoverableTimout(long value);
-
-    @Override
-    public native BluetoothDevice connectDevice(String address, String addressType);
-
-    @Override
-    public native boolean getPairable();
+    public boolean getPairable() { return isPairable; }
 
     @Override
     public synchronized void enablePairableNotifications(final BluetoothNotification<Boolean> callback) {
@@ -206,20 +207,27 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
         pairableNotification = null;
     }
 
+    /* Native callbacks */
+
+    /* Native functionality / properties */
+
     @Override
-    public native void setPairable(boolean value);
+    public native void setPowered(boolean value);
 
     @Override
-    public native long getPairableTimeout();
+    public native String getAlias();
 
     @Override
-    public native void setPairableTimeout(long value);
+    public native void setAlias(final String value);
 
     @Override
-    public native String[] getUUIDs();
+    public native void setDiscoverable(boolean value);
 
     @Override
-    public native String getModalias();
+    public native BluetoothDevice connectDevice(String address, String addressType);
+
+    @Override
+    public native void setPairable(boolean value);
 
     /* internal */
 
@@ -320,21 +328,30 @@ public class DBTAdapter extends DBTObject implements BluetoothAdapter
                                            final AdapterSettings changedmask, final long timestamp) {
             System.err.println("Adapter.StatusListener.settings: "+oldmask+" -> "+newmask+", changed "+changedmask+" on "+a);
             {
-                final BluetoothNotification<Boolean> _poweredNotification = poweredNotification;
-                if( null != _poweredNotification && changedmask.isSet(AdapterSettings.SettingType.POWERED) ) {
-                    _poweredNotification.run(newmask.isSet(AdapterSettings.SettingType.POWERED));
+                if( changedmask.isSet(AdapterSettings.SettingType.POWERED) ) {
+                    isPowered = newmask.isSet(AdapterSettings.SettingType.POWERED);
+                    final BluetoothNotification<Boolean> _poweredNotification = poweredNotification;
+                    if( null != _poweredNotification ) {
+                        _poweredNotification.run(isPowered);
+                    }
                 }
             }
             {
-                final BluetoothNotification<Boolean> _discoverableNotification = discoverableNotification;
-                if( null != _discoverableNotification && changedmask.isSet(AdapterSettings.SettingType.DISCOVERABLE) ) {
-                    _discoverableNotification.run(newmask.isSet(AdapterSettings.SettingType.DISCOVERABLE));
+                if( changedmask.isSet(AdapterSettings.SettingType.DISCOVERABLE) ) {
+                    isDiscoverable = newmask.isSet(AdapterSettings.SettingType.DISCOVERABLE);
+                    final BluetoothNotification<Boolean> _discoverableNotification = discoverableNotification;
+                    if( null != _discoverableNotification ) {
+                        _discoverableNotification.run( isDiscoverable );
+                    }
                 }
             }
             {
-                final BluetoothNotification<Boolean> _pairableNotification = pairableNotification;
-                if( null != _pairableNotification && changedmask.isSet(AdapterSettings.SettingType.BONDABLE) ) {
-                    _pairableNotification.run(newmask.isSet(AdapterSettings.SettingType.BONDABLE));
+                if( changedmask.isSet(AdapterSettings.SettingType.BONDABLE) ) {
+                    isPairable = newmask.isSet(AdapterSettings.SettingType.BONDABLE);
+                    final BluetoothNotification<Boolean> _pairableNotification = pairableNotification;
+                    if( null != _pairableNotification ) {
+                        _pairableNotification.run( isPairable );
+                    }
                 }
             }
         }
diff --git a/java/direct_bt/tinyb/DBTDevice.java b/java/direct_bt/tinyb/DBTDevice.java
index 7e482137..75f053c4 100644
--- a/java/direct_bt/tinyb/DBTDevice.java
+++ b/java/direct_bt/tinyb/DBTDevice.java
@@ -153,6 +153,11 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
     }
 
     @Override
+    public DBTAdapter getAdapter() {
+        return adapter;
+    }
+
+    @Override
     public String getAddress() { return address; }
 
     @Override
@@ -164,10 +169,6 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
     static BluetoothType class_type() { return BluetoothType.DEVICE; }
 
     @Override
-    public final BluetoothDevice clone()
-    { throw new UnsupportedOperationException(); } // FIXME
-
-    @Override
     public BluetoothGattService find(final String UUID, final long timeoutMS) {
         final BluetoothManager manager = DBTManager.getBluetoothManager();
         return (BluetoothGattService) manager.find(BluetoothType.GATT_SERVICE,
@@ -186,8 +187,8 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
         // std::string msdstr = nullptr != msd ? msd->toString() : "MSD[null]";
         final String msdstr = "MSD[null]";
         out.append("Device[").append(getAddress()).append(", '").append(getName())
-                .append("', age ").append(t0-ts_creation).append(" ms, lup ").append(t0-ts_update).append(" ms, rssi ").append(getRSSI())
-                .append(", tx-power ").append(getTxPower()).append(", ").append(msdstr).append("]");
+                .append("', age ").append(t0-ts_creation).append(" ms, lup ").append(t0-ts_update).append(" ms, connected ").append(connected)
+                .append(", rssi ").append(getRSSI()).append(", tx-power ").append(getTxPower()).append(", ").append(msdstr).append("]");
         /**
         if(services.size() > 0 ) {
             out.append("\n");
@@ -203,6 +204,26 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
         return out.toString();
     }
 
+    /* Unsupported */
+
+    @Override
+    public int getBluetoothClass() { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public final BluetoothDevice clone() { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public boolean pair() throws BluetoothException { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public boolean cancelPairing() throws BluetoothException { throw new UnsupportedOperationException(); } // FIXME
+
+    @Override
+    public String getAlias() { return null; } // FIXME
+
+    @Override
+    public void setAlias(final String value) { throw new UnsupportedOperationException(); } // FIXME
+
     /* internal */
 
     private native void initImpl();
@@ -211,14 +232,19 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
 
     @Override
     public final void enableConnectedNotifications(final BluetoothNotification<Boolean> callback) {
-        connectedNotifications = callback;
+        synchronized(userCallbackLock) {
+            userConnectedNotificationsCB = callback;
+        }
+    }
+    @Override
+    public final void disableConnectedNotifications() {
+        synchronized(userCallbackLock) {
+            userConnectedNotificationsCB = null;
+        }
     }
-    private BluetoothNotification<Boolean> connectedNotifications = null;
-    private boolean connected = false;
 
     @Override
     public final boolean getConnected() { return connected; }
-    // private native boolean getConnectedImpl();
 
     @Override
     public final boolean disconnect() throws BluetoothException {
@@ -226,8 +252,13 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
         if( connected ) {
             res = disconnectImpl();
             if( res ) {
-                connectedNotifications.run(Boolean.FALSE);
+                // FIXME: Split up - may offload to other thread
+                // Currently service resolution performed in connectImpl()!
+                servicesResolved = false;
+                userServicesResolvedNotificationsCB.run(Boolean.FALSE);
+
                 connected = false;
+                userConnectedNotificationsCB.run(Boolean.FALSE);
             }
         }
         return res;
@@ -240,144 +271,152 @@ public class DBTDevice extends DBTObject implements BluetoothDevice
         if( !connected ) {
             res = connectImpl();
             if( res ) {
-                connectedNotifications.run(Boolean.TRUE);
                 connected = true;
+                userConnectedNotificationsCB.run(Boolean.TRUE);
+
+                // FIXME: Split up - may offload to other thread
+                // Currently service resolution performed in connectImpl()!
+                servicesResolved = true;
+                userServicesResolvedNotificationsCB.run(Boolean.TRUE);
             }
         }
         return res;
     }
     private native boolean connectImpl() throws BluetoothException;
 
-    /* DBT method calls: */
-
-    @Override
-    public native boolean connectProfile(String arg_UUID) throws BluetoothException;
+    /* DBT Java callbacks */
 
     @Override
-    public native boolean disconnectProfile(String arg_UUID) throws BluetoothException;
+    public final void enableRSSINotifications(final BluetoothNotification<Short> callback) {
+        synchronized(userCallbackLock) {
+            userRSSINotificationsCB = callback;
+        }
+    }
 
     @Override
-    public boolean pair() throws BluetoothException
-    { throw new UnsupportedOperationException(); } // FIXME
+    public final void disableRSSINotifications() {
+        synchronized(userCallbackLock) {
+            userRSSINotificationsCB = null;
+        }
+    }
 
-     @Override
-    public native boolean remove() throws BluetoothException;
 
     @Override
-    public boolean cancelPairing() throws BluetoothException
-    { throw new UnsupportedOperationException(); } // FIXME
+    public final void enableManufacturerDataNotifications(final BluetoothNotification<Map<Short, byte[]> > callback) {
+        synchronized(userCallbackLock) {
+            userManufDataNotificationsCB = callback;
+        }
+    }
 
     @Override
-    public native List<BluetoothGattService> getServices();
-
-    /* property accessors: */
+    public final void disableManufacturerDataNotifications() {
+        synchronized(userCallbackLock) {
+            userManufDataNotificationsCB = null;
+        }
+    }
 
-    @Override
-    public String getAlias() { return null; } // FIXME
 
     @Override
-    public void setAlias(final String value)
-    { throw new UnsupportedOperationException(); } // FIXME
+    public final void enableServicesResolvedNotifications(final BluetoothNotification<Boolean> callback) {
+        synchronized(userCallbackLock) {
+            userServicesResolvedNotificationsCB = callback;
+        }
+    }
 
     @Override
-    public native int getBluetoothClass();
+    public void disableServicesResolvedNotifications() {
+        synchronized(userCallbackLock) {
+            userServicesResolvedNotificationsCB = null;
+        }
+    }
 
     @Override
-    public native short getAppearance();
+    public boolean getServicesResolved () { return servicesResolved; }
 
     @Override
-    public native String getIcon();
+    public short getAppearance() { return appearance; }
 
-    @Override
-    public native boolean getPaired();
+    /* DBT native callbacks */
 
     @Override
-    public native void enablePairedNotifications(BluetoothNotification<Boolean> callback);
+    public native void enableBlockedNotifications(BluetoothNotification<Boolean> callback);
 
     @Override
-    public native void disablePairedNotifications();
+    public void disableBlockedNotifications() { } // FIXME
 
     @Override
-    public native boolean getTrusted();
+    public native void enableServiceDataNotifications(BluetoothNotification<Map<String, byte[]> > callback);
 
     @Override
-    public native void enableTrustedNotifications(BluetoothNotification<Boolean> callback);
+    public void disableServiceDataNotifications() { } // FIXME
 
     @Override
-    public native void disableTrustedNotifications();
+    public native void enablePairedNotifications(BluetoothNotification<Boolean> callback);
 
     @Override
-    public native void setTrusted(boolean value);
+    public void disablePairedNotifications() { } // FIXME
 
     @Override
-    public native boolean getBlocked();
+    public native void enableTrustedNotifications(BluetoothNotification<Boolean> callback);
 
     @Override
-    public native void enableBlockedNotifications(BluetoothNotification<Boolean> callback);
+    public void disableTrustedNotifications() { } // FIXME
 
-    @Override
-    public native void disableBlockedNotifications();
 
-    @Override
-    public native void setBlocked(boolean value);
+    /* DBT native method calls: */
 
     @Override
-    public native boolean getLegacyPairing();
+    public native boolean connectProfile(String arg_UUID) throws BluetoothException;
 
     @Override
-    public native short getRSSI();
+    public native boolean disconnectProfile(String arg_UUID) throws BluetoothException;
 
-    @Override
-    public native void enableRSSINotifications(BluetoothNotification<Short> callback);
+     @Override
+    public native boolean remove() throws BluetoothException;
 
     @Override
-    public native void disableRSSINotifications();
+    public native List<BluetoothGattService> getServices();
 
-     @Override
-    public native void disableConnectedNotifications();
+    /* property accessors: */
 
     @Override
-    public native String[] getUUIDs();
+    public native String getIcon();
 
     @Override
-    public native String getModalias();
+    public native boolean getPaired();
 
     @Override
-    public native DBTAdapter getAdapter();
+    public native boolean getTrusted();
 
     @Override
-    public native Map<Short, byte[]> getManufacturerData();
+    public native void setTrusted(boolean value);
 
     @Override
-    public native void enableManufacturerDataNotifications(BluetoothNotification<Map<Short, byte[]> > callback);
+    public native boolean getBlocked();
 
     @Override
-    public native void disableManufacturerDataNotifications();
-
+    public native void setBlocked(boolean value);
 
     @Override
-    public native Map<String, byte[]> getServiceData();
+    public native boolean getLegacyPairing();
 
     @Override
-    public native void enableServiceDataNotifications(BluetoothNotification<Map<String, byte[]> > callback);
+    public native short getRSSI();
 
     @Override
-    public native void disableServiceDataNotifications();
+    public native String[] getUUIDs();
 
     @Override
-    public native short getTxPower ();
+    public native String getModalias();
 
     @Override
-    public native boolean getServicesResolved ();
+    public native Map<Short, byte[]> getManufacturerData();
 
     @Override
-    public final void enableServicesResolvedNotifications(final BluetoothNotification<Boolean> callback) {
-        servicesResolvedNotifications = callback;
-    }
-    private BluetoothNotification<Boolean> servicesResolvedNotifications = null;
+    public native Map<String, byte[]> getServiceData();
 
     @Override
-    public native void disableServicesResolvedNotifications();
+    public native short getTxPower ();
 
     @Override
     protected native void deleteImpl();