aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-01-28 12:51:09 +0100
committerSven Gothel <[email protected]>2021-01-28 12:51:09 +0100
commita76be3c38ca6ec65d76ef2c139db860c9234fea1 (patch)
tree45aa34b6b4a8fcfe200ec35051c70be5f9ace287
parente53ceb5c2277e79de15ddf6dd2c75f2aa0537dea (diff)
Fix missed JNI renaming: Java_jau_direct_1bt_DBTDevice_removeAll[Characteristic -> Char]Listener(..)
Adding call to example, ensuring manual test coverage.
-rw-r--r--examples/direct_bt_scanner10/dbt_scanner10.cpp1
-rw-r--r--examples/java/DBTScanner10.java1
-rw-r--r--java/jni/direct_bt/DBTDevice.cxx2
3 files changed, 3 insertions, 1 deletions
diff --git a/examples/direct_bt_scanner10/dbt_scanner10.cpp b/examples/direct_bt_scanner10/dbt_scanner10.cpp
index 3b71a606..2660b288 100644
--- a/examples/direct_bt_scanner10/dbt_scanner10.cpp
+++ b/examples/direct_bt_scanner10/dbt_scanner10.cpp
@@ -805,6 +805,7 @@ exit:
if( success ) {
addToDevicesProcessed(device->getAddressAndType());
}
+ device->removeAllCharListener();
if( !KEEP_CONNECTED ) {
diff --git a/examples/java/DBTScanner10.java b/examples/java/DBTScanner10.java
index e506ef23..114f4f6f 100644
--- a/examples/java/DBTScanner10.java
+++ b/examples/java/DBTScanner10.java
@@ -832,6 +832,7 @@ public class DBTScanner10 {
if( success ) {
devicesProcessed.add(device.getAddressAndType());
}
+ device.removeAllCharListener();
if( !KEEP_CONNECTED ) {
diff --git a/java/jni/direct_bt/DBTDevice.cxx b/java/jni/direct_bt/DBTDevice.cxx
index a52d5d3c..2c3fe342 100644
--- a/java/jni/direct_bt/DBTDevice.cxx
+++ b/java/jni/direct_bt/DBTDevice.cxx
@@ -280,7 +280,7 @@ jint Java_jau_direct_1bt_DBTDevice_removeAllAssociatedCharacteristicListener(JNI
return 0;
}
-jint Java_jau_direct_1bt_DBTDevice_removeAllCharacteristicListener(JNIEnv *env, jobject obj) {
+jint Java_jau_direct_1bt_DBTDevice_removeAllCharListener(JNIEnv *env, jobject obj) {
try {
BTDevice *device = getJavaUplinkObjectUnchecked<BTDevice>(env, obj);
if( nullptr == device ) {