aboutsummaryrefslogtreecommitdiffstats
path: root/java/jni
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2021-08-25 12:32:05 +0200
committerSven Gothel <[email protected]>2021-08-25 12:32:05 +0200
commit9feb4c030988912dc1702ef997ad65e2ed4ec425 (patch)
tree32d4596c67c09df399ed307cf8e70ff07fa770db /java/jni
parent904b250d1383140b1583a9d213208591fb1a50a9 (diff)
DBTAdapter.cxx: Fix JNIAdapterStatusListener::deviceConnected(..): NewObject(.., deviceClazzCtor, ..) used wrong argument order.v2.2.12
Aligned Java BTDevice ctor using private method for JNIAdapterStatusListener::deviceFound(..) and JNIAdapterStatusListener::deviceConnected(..).
Diffstat (limited to 'java/jni')
-rw-r--r--java/jni/direct_bt/DBTAdapter.cxx67
1 files changed, 29 insertions, 38 deletions
diff --git a/java/jni/direct_bt/DBTAdapter.cxx b/java/jni/direct_bt/DBTAdapter.cxx
index 7a399d51..0b19145e 100644
--- a/java/jni/direct_bt/DBTAdapter.cxx
+++ b/java/jni/direct_bt/DBTAdapter.cxx
@@ -351,6 +351,33 @@ class JNIAdapterStatusListener : public AdapterStatusListener {
jau::java_exception_check_and_throw(env, E_FILE_LINE);
}
+ private:
+
+ jobject newJavaBTDevice(JNIEnv *env, std::shared_ptr<BTDevice> device, const uint64_t timestamp) {
+ // DBTDevice(final long nativeInstance, final DBTAdapter adptr, final byte byteAddress[/*6*/], final byte byteAddressType,
+ // final long ts_creation, final String name)
+ const EUI48 addr = device->getAddressAndType().address;
+ jbyteArray jaddr = env->NewByteArray(sizeof(addr));
+ env->SetByteArrayRegion(jaddr, 0, sizeof(addr), (const jbyte*)(addr.b));
+ jau::java_exception_check_and_throw(env, E_FILE_LINE);
+ const jstring name = jau::from_string_to_jstring(env, device->getName());
+ jau::java_exception_check_and_throw(env, E_FILE_LINE);
+ jobject tmp_jdevice = env->NewObject(deviceClazzRef.getClass(), deviceClazzCtor,
+ (jlong)device.get(), jau::JavaGlobalObj::GetObject(adapterObjRef),
+ jaddr, device->getAddressAndType().type, (jlong)timestamp, name);
+ jau::java_exception_check_and_throw(env, E_FILE_LINE);
+ JNIGlobalRef::check(tmp_jdevice, E_FILE_LINE);
+ std::shared_ptr<jau::JavaAnon> jDeviceRef1 = device->getJavaObject();
+ jau::JavaGlobalObj::check(jDeviceRef1, E_FILE_LINE);
+ jobject jdevice = jau::JavaGlobalObj::GetObject(jDeviceRef1);
+ env->DeleteLocalRef(jaddr);
+ env->DeleteLocalRef(name);
+ env->DeleteLocalRef(tmp_jdevice);
+ return jdevice;
+ }
+
+ public:
+
bool deviceFound(std::shared_ptr<BTDevice> device, const uint64_t timestamp) override {
JNIEnv *env = *jni_env;
jobject jdevice;
@@ -359,25 +386,7 @@ class JNIAdapterStatusListener : public AdapterStatusListener {
// Reuse Java instance
jdevice = jau::JavaGlobalObj::GetObject(jDeviceRef0);
} else {
- // New Java instance
- // Device(final long nativeInstance, final Adapter adptr, final String address, final int intAddressType, final String name)
- const EUI48 addr = device->getAddressAndType().address;
- jbyteArray jaddr = env->NewByteArray(sizeof(addr));
- env->SetByteArrayRegion(jaddr, 0, sizeof(addr), (const jbyte*)(addr.b));
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- const jstring name = jau::from_string_to_jstring(env, device->getName());
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- jobject tmp_jdevice = env->NewObject(deviceClazzRef.getClass(), deviceClazzCtor,
- (jlong)device.get(), jau::JavaGlobalObj::GetObject(adapterObjRef),
- jaddr, device->getAddressAndType().type, (jlong)timestamp, name);
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- JNIGlobalRef::check(tmp_jdevice, E_FILE_LINE);
- std::shared_ptr<jau::JavaAnon> jDeviceRef1 = device->getJavaObject();
- jau::JavaGlobalObj::check(jDeviceRef1, E_FILE_LINE);
- jdevice = jau::JavaGlobalObj::GetObject(jDeviceRef1);
- env->DeleteLocalRef(jaddr);
- env->DeleteLocalRef(name);
- env->DeleteLocalRef(tmp_jdevice);
+ jdevice = newJavaBTDevice(env, device, timestamp);
}
env->SetLongField(jdevice, deviceClazzTSLastDiscoveryField, (jlong)device->getLastDiscoveryTimestamp());
jau::java_exception_check_and_throw(env, E_FILE_LINE);
@@ -413,25 +422,7 @@ class JNIAdapterStatusListener : public AdapterStatusListener {
// Reuse Java instance
jdevice = jau::JavaGlobalObj::GetObject(jDeviceRef0);
} else {
- // New Java instance
- // Device(final long nativeInstance, final Adapter adptr, final String address, final int intAddressType, final String name)
- const EUI48 addr = device->getAddressAndType().address;
- jbyteArray jaddr = env->NewByteArray(sizeof(addr));
- env->SetByteArrayRegion(jaddr, 0, sizeof(addr), (const jbyte*)(addr.b));
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- const jstring name = jau::from_string_to_jstring(env, device->getName());
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- jobject tmp_jdevice = env->NewObject(deviceClazzRef.getClass(), deviceClazzCtor,
- (jlong)device.get(), jau::JavaGlobalObj::GetObject(adapterObjRef),
- jaddr, device->getAddressAndType().type, name, (jlong)timestamp);
- jau::java_exception_check_and_throw(env, E_FILE_LINE);
- JNIGlobalRef::check(tmp_jdevice, E_FILE_LINE);
- std::shared_ptr<jau::JavaAnon> jDeviceRef1 = device->getJavaObject();
- jau::JavaGlobalObj::check(jDeviceRef1, E_FILE_LINE);
- jdevice = jau::JavaGlobalObj::GetObject(jDeviceRef1);
- env->DeleteLocalRef(jaddr);
- env->DeleteLocalRef(name);
- env->DeleteLocalRef(tmp_jdevice);
+ jdevice = newJavaBTDevice(env, device, timestamp);
}
env->SetShortField(jdevice, deviceClazzConnectionHandleField, (jshort)handle);
jau::java_exception_check_and_throw(env, E_FILE_LINE);