haui/InfiniTime_mirror
1
0
Fork 1
mirror of https://github.com/InfiniTimeOrg/InfiniTime.git synced 2024-10-22 15:11:51 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge d7ca78b24e into 8598142c27

Browse source
This commit is contained in:
FintasticMan 2024-10-19 20:29:10 +02:00 committed by GitHub
parent 8598142c27 d7ca78b24e
commit ba07ebd798
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/components/ble/AlertNotificationClient.cpp
View file

@ -143,24 +143,22 @@ int AlertNotificationClient::OnDescriptorDiscoveryEventCallback(uint16_t connect
void AlertNotificationClient::OnNotification(ble_gap_event* event) { void AlertNotificationClient::OnNotification(ble_gap_event* event) {
if (event->notify_rx.attr_handle == newAlertHandle) { if (event->notify_rx.attr_handle == newAlertHandle) {
constexpr size_t stringTerminatorSize = 1; // end of string '\0' constexpr uint32_t headerSize = 3;
constexpr size_t headerSize = 3; constexpr uint32_t maxMessageSize = NotificationManager::MaximumMessageSize();
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
const auto maxBufferSize {maxMessageSize + headerSize};
// Ignore notifications with empty message // Ignore notifications with empty message
const auto packetLen = OS_MBUF_PKTLEN(event->notify_rx.om); const uint32_t packetLen = OS_MBUF_PKTLEN(event->notify_rx.om);
if (packetLen <= headerSize) if (packetLen <= headerSize) {
return; return;
}
size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize); const uint32_t messageSize = std::min(maxMessageSize, packetLen - headerSize);
auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
NotificationManager::Notification notif; NotificationManager::Notification notif;
os_mbuf_copydata(event->notify_rx.om, headerSize, messageSize - 1, notif.message.data()); os_mbuf_copydata(event->notify_rx.om, headerSize, messageSize, notif.message.data());
notif.message[messageSize - 1] = '\0'; notif.message[messageSize] = '\0';
notif.size = messageSize; notif.size = messageSize;
notif.category = Pinetime::Controllers::NotificationManager::Categories::SimpleAlert; notif.category = NotificationManager::Categories::SimpleAlert;
notificationManager.Push(std::move(notif)); notificationManager.Push(std::move(notif));
systemTask.PushMessage(Pinetime::System::Messages::OnNewNotification); systemTask.PushMessage(Pinetime::System::Messages::OnNewNotification);

22
src/components/ble/AlertNotificationService.cpp
View file

@ -46,27 +46,24 @@ AlertNotificationService::AlertNotificationService(System::SystemTask& systemTas
int AlertNotificationService::OnAlert(struct ble_gatt_access_ctxt* ctxt) { int AlertNotificationService::OnAlert(struct ble_gatt_access_ctxt* ctxt) {
if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) { if (ctxt->op == BLE_GATT_ACCESS_OP_WRITE_CHR) {
constexpr size_t stringTerminatorSize = 1; // end of string '\0' constexpr uint32_t headerSize = 3;
constexpr size_t headerSize = 3; constexpr uint32_t maxMessageSize = NotificationManager::MaximumMessageSize();
const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
const auto maxBufferSize {maxMessageSize + headerSize};
// Ignore notifications with empty message // Ignore notifications with empty message
const auto packetLen = OS_MBUF_PKTLEN(ctxt->om); const uint32_t packetLen = OS_MBUF_PKTLEN(ctxt->om);
if (packetLen <= headerSize) { if (packetLen <= headerSize) {
return 0; return 0;
} }
size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize); const uint32_t messageSize = std::min(maxMessageSize, packetLen - headerSize);
auto messageSize = std::min(maxMessageSize, (bufferSize - headerSize));
Categories category;
NotificationManager::Notification notif; NotificationManager::Notification notif;
os_mbuf_copydata(ctxt->om, headerSize, messageSize - 1, notif.message.data()); os_mbuf_copydata(ctxt->om, headerSize, messageSize, notif.message.data());
os_mbuf_copydata(ctxt->om, 0, 1, &category); notif.message[messageSize] = '\0';
notif.message[messageSize - 1] = '\0';
notif.size = messageSize; notif.size = messageSize;
Categories category;
os_mbuf_copydata(ctxt->om, 0, 1, &category);
// TODO convert all ANS categories to NotificationController categories // TODO convert all ANS categories to NotificationController categories
switch (category) { switch (category) {
case Categories::Call: case Categories::Call:
@ -77,9 +74,8 @@ int AlertNotificationService::OnAlert(struct ble_gatt_access_ctxt* ctxt) {
break; break;
} }
auto event = Pinetime::System::Messages::OnNewNotification;
notificationManager.Push(std::move(notif)); notificationManager.Push(std::move(notif));
systemTask.PushMessage(event); systemTask.PushMessage(Pinetime::System::Messages::OnNewNotification);
} }
return 0; return 0;
} }