diff options
author | Juha Vuolle <juha.vuolle@insta.fi> | 2022-06-30 15:26:41 +0300 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-04 08:48:11 +0000 |
commit | fb9104d5fa7eecb86d28104a1700b45069c18689 (patch) | |
tree | e5420111de8b8d1aac4c10b14e75afb3e084abfd /src/bluetooth/android/lowenergynotificationhub.cpp | |
parent | 74c51f743120d25a22d81927802dff3df79f1555 (diff) |
Unstringify Android QtBluetooth: native JNI callbacks
This commit removes the plain class/type strings from the JNI
callback method registration.
Fixes: QTBUG-104183
Change-Id: I5599eb18af2f5934961a66fdcee7b0cba8045269
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
(cherry picked from commit 373378e74512de7b566725d4f81a28c1cef8280f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/bluetooth/android/lowenergynotificationhub.cpp')
-rw-r--r-- | src/bluetooth/android/lowenergynotificationhub.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/bluetooth/android/lowenergynotificationhub.cpp b/src/bluetooth/android/lowenergynotificationhub.cpp index b1040d5c..0e5945a3 100644 --- a/src/bluetooth/android/lowenergynotificationhub.cpp +++ b/src/bluetooth/android/lowenergynotificationhub.cpp @@ -90,7 +90,7 @@ void LowEnergyNotificationHub::lowEnergy_mtuChanged( } void LowEnergyNotificationHub::lowEnergy_servicesDiscovered( - JNIEnv *, jobject, jlong qtObject, jint errorCode, jobject uuidList) + JNIEnv *, jobject, jlong qtObject, jint errorCode, jstring uuidList) { lock.lockForRead(); LowEnergyNotificationHub *hub = hubMap()->value(qtObject); @@ -106,7 +106,7 @@ void LowEnergyNotificationHub::lowEnergy_servicesDiscovered( } void LowEnergyNotificationHub::lowEnergy_serviceDetailsDiscovered( - JNIEnv *, jobject, jlong qtObject, jobject uuid, jint startHandle, + JNIEnv *, jobject, jlong qtObject, jstring uuid, jint startHandle, jint endHandle) { lock.lockForRead(); @@ -124,8 +124,8 @@ void LowEnergyNotificationHub::lowEnergy_serviceDetailsDiscovered( } void LowEnergyNotificationHub::lowEnergy_characteristicRead( - JNIEnv *env, jobject, jlong qtObject, jobject sUuid, jint handle, - jobject cUuid, jint properties, jbyteArray data) + JNIEnv *env, jobject, jlong qtObject, jstring sUuid, jint handle, + jstring cUuid, jint properties, jbyteArray data) { lock.lockForRead(); LowEnergyNotificationHub *hub = hubMap()->value(qtObject); @@ -159,8 +159,8 @@ void LowEnergyNotificationHub::lowEnergy_characteristicRead( } void LowEnergyNotificationHub::lowEnergy_descriptorRead( - JNIEnv *env, jobject, jlong qtObject, jobject sUuid, jobject cUuid, - jint handle, jobject dUuid, jbyteArray data) + JNIEnv *env, jobject, jlong qtObject, jstring sUuid, jstring cUuid, + jint handle, jstring dUuid, jbyteArray data) { lock.lockForRead(); LowEnergyNotificationHub *hub = hubMap()->value(qtObject); @@ -244,7 +244,8 @@ void LowEnergyNotificationHub::lowEnergy_descriptorWritten( } void LowEnergyNotificationHub::lowEnergy_serverDescriptorWritten( - JNIEnv *env, jobject, jlong qtObject, jobject descriptor, jbyteArray newValue) + JNIEnv *env, jobject, jlong qtObject, QtJniTypes::BluetoothGattDescriptor descriptor, + jbyteArray newValue) { lock.lockForRead(); LowEnergyNotificationHub *hub = hubMap()->value(qtObject); @@ -287,7 +288,8 @@ void LowEnergyNotificationHub::lowEnergy_characteristicChanged( } void LowEnergyNotificationHub::lowEnergy_serverCharacteristicChanged( - JNIEnv *env, jobject, jlong qtObject, jobject characteristic, jbyteArray newValue) + JNIEnv *env, jobject, jlong qtObject, + QtJniTypes::BluetoothGattCharacteristic characteristic, jbyteArray newValue) { lock.lockForRead(); LowEnergyNotificationHub *hub = hubMap()->value(qtObject); |