NotificationProfile: Add new id field

2025-04-15 01:56:49 +10:00 · 2025-04-15 01:56:49 +10:00 · 29023d042c
commit 29023d042c
parent abdea123d1
26 changed files with 16 additions and 1 deletions
--- a/src/main/kotlin/tests/NotificationProfileTestCase.kt
+++ b/src/main/kotlin/tests/NotificationProfileTestCase.kt
@ -8,6 +8,7 @@ import StandardFrames
 import TestCase
 import asList
 import nullable
+import okio.ByteString.Companion.toByteString
 import org.thoughtcrime.securesms.backup.v2.proto.Frame
 import org.thoughtcrime.securesms.backup.v2.proto.NotificationProfile

@ -59,7 +60,8 @@ object NotificationProfileTestCase : TestCase("notification_profile") {
        scheduleStartTime = some(ScheduleTimeGenerator()),
        scheduleEndTime = some(ScheduleTimeGenerator()),
        scheduleDaysEnabled = some(scheduleDaysGenerator.asList(0, 1, 2, 3, 4, 5, 6, 7)),
-        allowedMembers = some(allowedMembersGenerator)
+        allowedMembers = some(allowedMembersGenerator),
+        id = someBytes(16).toByteString()
      )
    )
  }
--- a/src/main/proto/Backup.proto
+++ b/src/main/proto/Backup.proto
@ -1291,6 +1291,7 @@ message NotificationProfile {
  uint32 scheduleStartTime = 9; // 24-hour clock int, 0000-2359 (e.g., 15, 900, 1130, 2345)
  uint32 scheduleEndTime = 10; // 24-hour clock int, 0000-2359 (e.g., 15, 900, 1130, 2345)
  repeated DayOfWeek scheduleDaysEnabled = 11;
+  bytes id = 12;
 }

 message ChatFolder {
--- a/test-cases/notification_profile_00.binproto
+++ b/test-cases/notification_profile_00.binproto
--- a/test-cases/notification_profile_00.txtproto
+++ b/test-cases/notification_profile_00.txtproto
@ -193,6 +193,7 @@ Frame {
    allowAllCalls = true
    allowAllMentions = true
    color = -1842178
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Ut Cubilia"
    scheduleEnabled = true
    scheduleEndTime = 434
--- a/test-cases/notification_profile_01.binproto
+++ b/test-cases/notification_profile_01.binproto
--- a/test-cases/notification_profile_01.txtproto
+++ b/test-cases/notification_profile_01.txtproto
@ -196,6 +196,7 @@ Frame {
    color = -2234372
    createdAtMs = 1905721875752
    emoji = "💀"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Congue Fastidii"
    scheduleDaysEnabled = [
      DayOfWeek.MONDAY
--- a/test-cases/notification_profile_02.binproto
+++ b/test-cases/notification_profile_02.binproto
--- a/test-cases/notification_profile_02.txtproto
+++ b/test-cases/notification_profile_02.txtproto
@ -199,6 +199,7 @@ Frame {
    color = -2561808
    createdAtMs = 1894221577852
    emoji = "👍"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Morbi Dicat"
    scheduleDaysEnabled = [
      DayOfWeek.TUESDAY,
--- a/test-cases/notification_profile_03.binproto
+++ b/test-cases/notification_profile_03.binproto
--- a/test-cases/notification_profile_03.txtproto
+++ b/test-cases/notification_profile_03.txtproto
@ -197,6 +197,7 @@ Frame {
    ]
    color = -3283763
    emoji = "👎"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Ut Cubilia"
    scheduleDaysEnabled = [
      DayOfWeek.THURSDAY,
--- a/test-cases/notification_profile_04.binproto
+++ b/test-cases/notification_profile_04.binproto
--- a/test-cases/notification_profile_04.txtproto
+++ b/test-cases/notification_profile_04.txtproto
@ -195,6 +195,7 @@ Frame {
    color = -1384200
    createdAtMs = 1905721875752
    emoji = "👍🏾"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Congue Fastidii"
    scheduleDaysEnabled = [
      DayOfWeek.SUNDAY,
--- a/test-cases/notification_profile_05.binproto
+++ b/test-cases/notification_profile_05.binproto
--- a/test-cases/notification_profile_05.txtproto
+++ b/test-cases/notification_profile_05.txtproto
@ -196,6 +196,7 @@ Frame {
    color = -662530
    createdAtMs = 1894221577852
    emoji = "👩‍💻"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Morbi Dicat"
    scheduleDaysEnabled = [
      DayOfWeek.THURSDAY,
--- a/test-cases/notification_profile_06.binproto
+++ b/test-cases/notification_profile_06.binproto
--- a/test-cases/notification_profile_06.txtproto
+++ b/test-cases/notification_profile_06.txtproto
@ -197,6 +197,7 @@ Frame {
      10
    ]
    color = -599828
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Ut Cubilia"
    scheduleDaysEnabled = [
      DayOfWeek.TUESDAY,
--- a/test-cases/notification_profile_07.binproto
+++ b/test-cases/notification_profile_07.binproto
--- a/test-cases/notification_profile_07.txtproto
+++ b/test-cases/notification_profile_07.txtproto
@ -198,6 +198,7 @@ Frame {
    color = -665641
    createdAtMs = 1905721875752
    emoji = "💀"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Congue Fastidii"
    scheduleDaysEnabled = [
      DayOfWeek.MONDAY,
--- a/test-cases/notification_profile_08.binproto
+++ b/test-cases/notification_profile_08.binproto
--- a/test-cases/notification_profile_08.txtproto
+++ b/test-cases/notification_profile_08.txtproto
@ -195,6 +195,7 @@ Frame {
    color = -68144
    createdAtMs = 1894221577852
    emoji = "👍"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Morbi Dicat"
    scheduleEnabled = true
    scheduleEndTime = 434
--- a/test-cases/notification_profile_09.binproto
+++ b/test-cases/notification_profile_09.binproto
--- a/test-cases/notification_profile_09.txtproto
+++ b/test-cases/notification_profile_09.txtproto
@ -195,6 +195,7 @@ Frame {
    ]
    color = -1382699
    emoji = "👎"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Ut Cubilia"
    scheduleDaysEnabled = [
      DayOfWeek.MONDAY
--- a/test-cases/notification_profile_10.binproto
+++ b/test-cases/notification_profile_10.binproto
--- a/test-cases/notification_profile_10.txtproto
+++ b/test-cases/notification_profile_10.txtproto
@ -199,6 +199,7 @@ Frame {
    color = -2960676
    createdAtMs = 1905721875752
    emoji = "👍🏾"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Congue Fastidii"
    scheduleDaysEnabled = [
      DayOfWeek.TUESDAY,
--- a/test-cases/notification_profile_11.binproto
+++ b/test-cases/notification_profile_11.binproto
--- a/test-cases/notification_profile_11.txtproto
+++ b/test-cases/notification_profile_11.txtproto
@ -198,6 +198,7 @@ Frame {
    color = -2631719
    createdAtMs = 1894221577852
    emoji = "👩‍💻"
+    id = <2faf620c7229690068c4b09c566976e5>
    name = "Morbi Dicat"
    scheduleDaysEnabled = [
      DayOfWeek.THURSDAY,