notifications: group conversation title prefixes

Use the text before a title's sender separator as a fallback conversation key
when the Android companion does not provide sender metadata.

Co-authored-by: GPT-5.6 Sol <noreply@openai.com>
Signed-off-by: Aliaksandr Karnilovich <thefallen058@gmail.com>

Author: 2 people

src/fw/apps/system/notifications_history.c

@@ -66,6 +66,25 @@ static StringRange prv_trimmed_string_range(const char *string) {
   };
 }
 
+static StringRange prv_conversation_range_from_title(const char *title) {
+  StringRange range = prv_trimmed_string_range(title);
+  if (!range.start) {
+    return range;
+  }
+
+  const char *separator = strstr(range.start, ": ");
+  const char *end = range.start + range.length;
+  if (!separator || separator == range.start || separator + 2 >= end) {
+    return range;
+  }
+
+  range.length = (size_t)(separator - range.start);
+  while (range.length > 0 && isspace((unsigned char)range.start[range.length - 1])) {
+    range.length--;
+  }
+  return range;
+}
+
 static bool prv_group_sender_for_item(const TimelineItem *item, StringRange *sender_out) {
   static const Uuid s_android_notifications_source = UUID_NOTIFICATIONS_DATA_SOURCE;
 
@@ -75,11 +94,13 @@ static bool prv_group_sender_for_item(const TimelineItem *item, StringRange *sen
   }
 
   const char *sender = attribute_get_string(&item->attr_list, AttributeIdSender, NULL);
-  if (!sender) {
-    sender = attribute_get_string(&item->attr_list, AttributeIdTitle, NULL);
+  if (sender) {
+    *sender_out = prv_trimmed_string_range(sender);
+  } else {
+    const char *title = attribute_get_string(&item->attr_list, AttributeIdTitle, NULL);
+    *sender_out = prv_conversation_range_from_title(title);
   }
 
-  *sender_out = prv_trimmed_string_range(sender);
   return sender_out->length > 0;
 }
 

tests/fw/apps/system_apps/notifications/test_notifications_history.c

@@ -134,6 +134,24 @@ void test_notifications_history__title_is_used_when_sender_is_missing(void) {
   cl_assert_equal_i(prv_row(0)->group.count, 2);
 }
 
+void test_notifications_history__title_conversation_prefix_groups_messages(void) {
+  prv_add_attribute(1, 100, AttributeIdTitle, "PG | Elite: Aloha");
+  prv_add_attribute(2, 200, AttributeIdTitle, "PG | Elite: Yeuhen");
+
+  cl_assert_equal_i(notifications_history_get_row_count(&s_history), 1);
+  cl_assert_equal_s(prv_row(0)->group.sender, "PG | Elite");
+  cl_assert_equal_i(prv_row(0)->group.count, 2);
+}
+
+void test_notifications_history__sender_attribute_is_not_split(void) {
+  prv_add(1, 100, "PG | Elite: Aloha");
+  prv_add(2, 200, "PG | Elite: Yeuhen");
+
+  cl_assert_equal_i(notifications_history_get_row_count(&s_history), 2);
+  cl_assert_equal_s(prv_row(0)->group.sender, "PG | Elite: Yeuhen");
+  cl_assert_equal_s(prv_row(1)->group.sender, "PG | Elite: Aloha");
+}
+
 void test_notifications_history__body_is_not_used_as_group_key(void) {
   prv_add_attribute(1, 100, AttributeIdBody, "Same body");
   prv_add_attribute(2, 200, AttributeIdBody, "Same body");