Reworking GATTCharacteristicListener (C++ and Java)

- Aligned all related C++ and Java API doc entries and made sure it matches implementation.

- Renaming SpecificGATTCharacteristicListener to AssociatedGATTCharacteristicListener,
  as we refer to the associate GATTCharacteristic of a GATTCharacteristicListener

  AssociatedGATTCharacteristicListener is a specialization knowing its
  associated GATTCharacteristic to be used for match().

- Renamed 'configIndicationNotification(..)' to 'configNotificationIndication(..)',
  matching order of arguments and the returned enabledState array.

- Exposed 'configNotificationIndication(..)' incl enabledState array to Java

- Clarified the 'add listener' and 'configNotificationIndication(..)' semantic in API doc
  and implementation. Added new API entries to distinguish them.

- DBTGattCharacteristic.java skips adding its 'TinyB API compatibility' GATTCharacteristicListener
  in case neither notify nor indicate property exist.
  Also skip the native configNotificationIndication(..) in such case.
  This reduces the overall listener load to GattHandler by factor 5!

- General: Add new method 'removeAllAssociatedCharacteristicListener(GATTCharacteristic)',
  allowing removal of all GATTCharacteristic associated listener.
  This is usefull to complete the GATTCharacteristic C++ dtor or Java close() operation.

- DBTDevice: Add GATTCharacteristicListener methods to align with Java API
  and allow user not to deal with GATTHandler directly.
  Convenience and validates the C++/Java API alignement.

- C++ JNICriticalArray: Added 2nd template typename for the java-array-type,
  enabling it for other than jbyteArray. Here used for a jbooleanArray.

- The GATTCharacteristicListener Java to C++ native holding specialization JNICharacteristicListener
  keeps a new global reference to the Java GATTCharacteristicListener
  and the optional associated GATTCharacteristic.
  This ensures the instances won't get garbage collected and hence ensures proper
  object lifecycle even when passing 'throw away' listener object created just
  for the add*Listener call.

- Removal and hence destruction of the listeners is always guaranteed at:
-- Device / GATTHandler disconnect
-- GattCharacteristic dtor or close

1 files changed, 5 insertions, 7 deletions

diff --git a/examples/direct_bt_scanner10/dbt_scanner10.cpp b/examples/direct_bt_scanner10/dbt_scanner10.cpp
index bde839d8..4a4e7bd8 100644
--- a/examples/direct_bt_scanner10/dbt_scanner10.cpp
+++ b/examples/direct_bt_scanner10/dbt_scanner10.cpp
@@ -193,11 +193,11 @@ class MyAdapterStatusListener : public AdapterStatusListener {
 
 static const uuid16_t _TEMPERATURE_MEASUREMENT(GattCharacteristicType::TEMPERATURE_MEASUREMENT);
 
-class MyGATTEventListener : public SpecificGATTCharacteristicListener {
+class MyGATTEventListener : public AssociatedGATTCharacteristicListener {
   public:
 
     MyGATTEventListener(const GATTCharacteristic * characteristicMatch)
-    : SpecificGATTCharacteristicListener(characteristicMatch) {}
+    : AssociatedGATTCharacteristicListener(characteristicMatch) {}
 
     void notificationReceived(GATTCharacteristicRef charDecl, std::shared_ptr<TROOctets> charValue, const uint64_t timestamp) override {
         const std::shared_ptr<DBTDevice> dev = charDecl->getDevice();
@@ -306,12 +306,10 @@ static void processConnectedDevice(std::shared_ptr<DBTDevice> device) {
                     }
                 }
                 bool cccdEnableResult[2];
-                bool cccdRet = serviceChar.configIndicationNotification(true /* enableNotification */, true /* enableIndication */, cccdEnableResult);
-                fprintf(stderr, "  [%2.2d.%2.2d] Config Notification(%d), Indication(%d): Result %d\n",
+                bool cccdRet = serviceChar.addCharacteristicListener( std::shared_ptr<GATTCharacteristicListener>( new MyGATTEventListener(&serviceChar) ),
+                                                                      cccdEnableResult );
+                fprintf(stderr, "  [%2.2d.%2.2d] addCharacteristicListener Notification(%d), Indication(%d): Result %d\n",
                         (int)i, (int)j, cccdEnableResult[0], cccdEnableResult[1], cccdRet);
-                if( cccdRet ) {
-                    serviceChar.addCharacteristicListener( std::shared_ptr<GATTCharacteristicListener>( new MyGATTEventListener(&serviceChar) ) );
-                }
             }
         }
         // FIXME sleep 1s for potential callbacks ..