Merge branch 'develop' into motion-sensor

# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/DisplayApp.h
#	src/displayapp/lv_pinetime_theme.c
#	src/displayapp/screens/ApplicationList.cpp
#	src/drivers/TwiMaster.cpp
#	src/systemtask/SystemTask.h

1 files changed, 16 insertions, 0 deletions

diff --git a/src/components/ble/NotificationManager.cpp b/src/components/ble/NotificationManager.cpp
index 36abf026..88e83b92 100644
--- a/src/components/ble/NotificationManager.cpp
+++ b/src/components/ble/NotificationManager.cpp
@@ -87,3 +87,19 @@ size_t NotificationManager::NbNotifications() const {
   return std::count_if(notifications.begin(), notifications.end(), [](const Notification& n){ return n.valid;});
 }
 
+const char* NotificationManager::Notification::Message() const {
+  const char* itField = std::find(message.begin(), message.begin()+size-1, '\0');
+  if(itField != message.begin()+size-1) {
+    const char* ptr = (itField)+1;
+    return ptr;
+  }
+  return const_cast<char*>(message.data());
+}
+
+const char* NotificationManager::Notification::Title() const {
+  const char * itField = std::find(message.begin(), message.begin()+size-1, '\0');
+  if(itField != message.begin()+size-1) {
+    return message.data();
+  }
+  return {};
+}