qiurui
/
qtconnectivity
mirror of https://github.com/qt/qtconnectivity.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Suppress notifyCharacteristicChanged deprecation warnings 

The deprecation itself is already handled, and suppressing the warning
is sufficient. For suppression the code using the old API is isolated
into its own function.

Pick-to: 6.9 6.8 6.5
Task-number: QTBUG-132455
Change-Id: I39cae1187d3bf88850fc340f60155d807dd6e4e5
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
This commit is contained in:
Juha Vuolle 2024-12-31 14:59:18 +02:00
parent 8c9ce93271
commit 432a082ed3
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/android/bluetooth/src/org/qtproject/qt/android/bluetooth/QtBluetoothLEServer.java
View File

@ -806,6 +806,15 @@ class QtBluetoothLEServer {
}
}
// API-level < 33
@SuppressWarnings("deprecation")
private void notifyCharacteristicChange(BluetoothDevice device,
BluetoothGattCharacteristic characteristic,
boolean confirm)
{
mGattServer.notifyCharacteristicChanged(device, characteristic, confirm);
}
/*
Check the client characteristics configuration for the given characteristic
and sends notifications or indications as per required.
@ -832,7 +841,7 @@ class QtBluetoothLEServer {
mGattServer.notifyCharacteristicChanged(device, characteristic, false,
((QtBluetoothGattCharacteristic)characteristic).getLocalValue());
} else {
mGattServer.notifyCharacteristicChanged(device, characteristic, false);
notifyCharacteristicChange(device, characteristic, false);
}
} else if (Arrays.equals(clientCharacteristicConfig,
BluetoothGattDescriptor.ENABLE_INDICATION_VALUE)) {
@ -840,7 +849,7 @@ class QtBluetoothLEServer {
mGattServer.notifyCharacteristicChanged(device, characteristic, true,
((QtBluetoothGattCharacteristic)characteristic).getLocalValue());
} else {
mGattServer.notifyCharacteristicChanged(device, characteristic, true);
notifyCharacteristicChange(device, characteristic, true);
}
}
}