My Story and Group recipient updates

signalapp · Sep 18, 2024 · 362d845 · 362d845
1 parent 17c5ea9
commit 362d845
Show file tree

Hide file tree

Showing 609 changed files with 688 additions and 402 deletions.
diff --git a/src/main/kotlin/StandardFrames.kt b/src/main/kotlin/StandardFrames.kt
@@ -40,7 +40,7 @@ object StandardFrames {
       distributionList = DistributionListItem(
         distributionId = MY_STORY_UUID,
         distributionList = DistributionList(
-          name = "My Story",
+          name = "",
           privacyMode = DistributionList.PrivacyMode.ALL
         )
       )

diff --git a/src/main/kotlin/tests/RecipientDistributionListTestCase.kt b/src/main/kotlin/tests/RecipientDistributionListTestCase.kt
@@ -38,7 +38,9 @@ object RecipientDistributionListTestCase : TestCase("recipient_distribution_list
       val memberRecipientIds = some(memberRecipientIdGenerator)
 
       frames += DistributionList(
-        name = someNonEmptyString(),
+        // Empty name specifically for My Story, which has a localized name
+        // built into clients.
+        name = "",
         allowReplies = someBoolean(),
         memberRecipientIds = if (privacyMode == DistributionList.PrivacyMode.ALL) {
           emptyList()

diff --git a/src/main/kotlin/tests/RecipientGroupsTestCase.kt b/src/main/kotlin/tests/RecipientGroupsTestCase.kt
@@ -6,10 +6,7 @@ import TestCase
 import asList
 import map
 import okio.ByteString.Companion.toByteString
-import org.thoughtcrime.securesms.backup.v2.proto.Contact
-import org.thoughtcrime.securesms.backup.v2.proto.Frame
-import org.thoughtcrime.securesms.backup.v2.proto.Group
-import org.thoughtcrime.securesms.backup.v2.proto.Recipient
+import org.thoughtcrime.securesms.backup.v2.proto.*
 
 /**
  * Every reasonable permutation of Recipient.Group
@@ -26,77 +23,92 @@ object RecipientGroupsTestCase : TestCase("recipient_groups") {
     frames += StandardFrames.recipientEve
     frames += StandardFrames.recipientFrank
 
+    val groupRecipientId = 10L
+
+    val snapshot: Group.GroupSnapshot = somePermutation {
+      frames += Group.GroupSnapshot(
+        title = Group.GroupAttributeBlob(
+          title = someNonEmptyString()
+        ),
+        description = someNullablePermutation {
+          frames += Group.GroupAttributeBlob(
+            descriptionText = someNonEmptyString()
+          )
+        },
+        avatarUrl = someUrl(),
+        disappearingMessagesTimer = someNullablePermutation {
+          frames += Group.GroupAttributeBlob(
+            disappearingMessagesDuration = somePositiveInt()
+          )
+        },
+        accessControl = Group.AccessControl(
+          attributes = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.UNSATISFIABLE),
+          members = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.UNSATISFIABLE),
+          addFromInviteLink = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.MEMBER)
+        ),
+        version = somePositiveInt(),
+        members = Generators.permutation<Group.Member> {
+          val userGenerator: Generator<Contact> = Generators.list(StandardFrames.recipientAlice.recipient!!.contact!!, StandardFrames.recipientBob.recipient!!.contact!!, StandardFrames.recipientCarol.recipient!!.contact!!)
+          val user = some(userGenerator)
+          frames += Group.Member(
+            userId = user.aci!!,
+            role = someEnum(Group.Member.Role::class.java, excluding = Group.Member.Role.UNKNOWN)
+          )
+        }.asList(1, 2, 3).map { members ->
+          members + Group.Member(
+            userId = StandardFrames.SELF_ACI.toByteString(),
+            role = Group.Member.Role.DEFAULT
+          )
+        }.let { some(it) },
+        membersPendingProfileKey = Generators.permutation<Group.MemberPendingProfileKey> {
+          frames += Group.MemberPendingProfileKey(
+            member = Group.Member(
+              userId = StandardFrames.recipientDan.recipient!!.contact!!.aci!!,
+              role = Group.Member.Role.DEFAULT
+            ),
+            addedByUserId = StandardFrames.recipientAlice.recipient!!.contact!!.aci!!
+          )
+        }.asList(0, 1).let { some(it) },
+        membersPendingAdminApproval = Generators.permutation<Group.MemberPendingAdminApproval> {
+          frames += Group.MemberPendingAdminApproval(
+            userId = StandardFrames.recipientEve.recipient!!.contact!!.aci!!
+          )
+        }.asList(0, 1).let { some(it) },
+        members_banned = Generators.permutation<Group.MemberBanned> {
+          frames += Group.MemberBanned(
+            userId = StandardFrames.recipientFrank.recipient!!.contact!!.aci!!,
+            timestamp = someIncrementingTimestamp()
+          )
+        }.asList(0, 1).let { some(it) },
+        inviteLinkPassword = someBytes(32).toByteString(),
+        announcements_only = someBoolean()
+      )
+    }
+
     frames += Frame(
       recipient = Recipient(
-        id = 10,
+        id = groupRecipientId,
         group = Group(
           masterKey = someBytes(32).toByteString(),
           whitelisted = someBoolean(),
           hideStory = someBoolean(),
           storySendMode = someEnum(Group.StorySendMode::class.java),
-          snapshot = somePermutation {
-            frames += Group.GroupSnapshot(
-              title = Group.GroupAttributeBlob(
-                title = someNonEmptyString()
-              ),
-              description = someNullablePermutation {
-                frames += Group.GroupAttributeBlob(
-                  descriptionText = someNonEmptyString()
-                )
-              },
-              avatarUrl = someUrl(),
-              disappearingMessagesTimer = somePermutation {
-                frames += Group.GroupAttributeBlob(
-                  disappearingMessagesDuration = somePositiveInt()
-                )
-              },
-              accessControl = Group.AccessControl(
-                attributes = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.UNSATISFIABLE),
-                members = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.UNSATISFIABLE),
-                addFromInviteLink = someEnum(Group.AccessControl.AccessRequired::class.java, Group.AccessControl.AccessRequired.UNKNOWN, Group.AccessControl.AccessRequired.ANY, Group.AccessControl.AccessRequired.MEMBER)
-              ),
-              version = somePositiveInt(),
-              members = Generators.permutation<Group.Member> {
-                val userGenerator: Generator<Contact> = Generators.list(StandardFrames.recipientAlice.recipient!!.contact!!, StandardFrames.recipientBob.recipient!!.contact!!, StandardFrames.recipientCarol.recipient!!.contact!!)
-                val user = some(userGenerator)
-                frames += Group.Member(
-                  userId = user.aci!!,
-                  role = someEnum(Group.Member.Role::class.java, excluding = Group.Member.Role.UNKNOWN)
-                )
-              }.asList(1, 2, 3).map { members ->
-                members + Group.Member(
-                  userId = StandardFrames.SELF_ACI.toByteString(),
-                  role = Group.Member.Role.DEFAULT
-                )
-              }.let { some(it) },
-              membersPendingProfileKey = Generators.permutation<Group.MemberPendingProfileKey> {
-                frames += Group.MemberPendingProfileKey(
-                  member = Group.Member(
-                    userId = StandardFrames.recipientDan.recipient!!.contact!!.aci!!,
-                    role = Group.Member.Role.DEFAULT
-                  ),
-                  addedByUserId = StandardFrames.recipientAlice.recipient!!.contact!!.aci!!,
-                  timestamp = someIncrementingTimestamp()
-                )
-              }.asList(0, 1).let { some(it) },
-              membersPendingAdminApproval = Generators.permutation<Group.MemberPendingAdminApproval> {
-                frames += Group.MemberPendingAdminApproval(
-                  userId = StandardFrames.recipientEve.recipient!!.contact!!.aci!!,
-                  timestamp = someIncrementingTimestamp()
-                )
-              }.asList(0, 1).let { some(it) },
-              members_banned = Generators.permutation<Group.MemberBanned> {
-                frames += Group.MemberBanned(
-                  userId = StandardFrames.recipientFrank.recipient!!.contact!!.aci!!,
-                  timestamp = someIncrementingTimestamp()
-                )
-              }.asList(0, 1).let { some(it) },
-              inviteLinkPassword = someBytes(32).toByteString(),
-              announcements_only = someBoolean()
-            )
-          }
+          snapshot = snapshot
         )
       )
     )
+
+    frames += Frame(
+      chat = Chat(
+        id = 1,
+        recipientId = groupRecipientId,
+        expirationTimerMs = if (snapshot.disappearingMessagesTimer != null) {
+          snapshot.disappearingMessagesTimer!!.disappearingMessagesDuration!!.toLong() * 1000
+        } else {
+          0
+        },
+        expireTimerVersion = 1
+      )
+    )
   }
 }
diff --git a/test-cases/account_data_00.binproto b/test-cases/account_data_00.binproto
diff --git a/test-cases/account_data_00.txtproto b/test-cases/account_data_00.txtproto
@@ -75,7 +75,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_01.binproto b/test-cases/account_data_01.binproto
diff --git a/test-cases/account_data_01.txtproto b/test-cases/account_data_01.txtproto
@@ -85,7 +85,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_02.binproto b/test-cases/account_data_02.binproto
diff --git a/test-cases/account_data_02.txtproto b/test-cases/account_data_02.txtproto
@@ -102,7 +102,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_03.binproto b/test-cases/account_data_03.binproto
diff --git a/test-cases/account_data_03.txtproto b/test-cases/account_data_03.txtproto
@@ -89,7 +89,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_04.binproto b/test-cases/account_data_04.binproto
diff --git a/test-cases/account_data_04.txtproto b/test-cases/account_data_04.txtproto
@@ -96,7 +96,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_05.binproto b/test-cases/account_data_05.binproto
diff --git a/test-cases/account_data_05.txtproto b/test-cases/account_data_05.txtproto
@@ -86,7 +86,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_06.binproto b/test-cases/account_data_06.binproto
diff --git a/test-cases/account_data_06.txtproto b/test-cases/account_data_06.txtproto
@@ -102,7 +102,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_07.binproto b/test-cases/account_data_07.binproto
diff --git a/test-cases/account_data_07.txtproto b/test-cases/account_data_07.txtproto
@@ -87,7 +87,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_08.binproto b/test-cases/account_data_08.binproto
diff --git a/test-cases/account_data_08.txtproto b/test-cases/account_data_08.txtproto
@@ -89,7 +89,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_09.binproto b/test-cases/account_data_09.binproto
diff --git a/test-cases/account_data_09.txtproto b/test-cases/account_data_09.txtproto
@@ -71,7 +71,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_10.binproto b/test-cases/account_data_10.binproto
diff --git a/test-cases/account_data_10.txtproto b/test-cases/account_data_10.txtproto
@@ -89,7 +89,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_11.binproto b/test-cases/account_data_11.binproto
diff --git a/test-cases/account_data_11.txtproto b/test-cases/account_data_11.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_12.binproto b/test-cases/account_data_12.binproto
diff --git a/test-cases/account_data_12.txtproto b/test-cases/account_data_12.txtproto
@@ -85,7 +85,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_13.binproto b/test-cases/account_data_13.binproto
diff --git a/test-cases/account_data_13.txtproto b/test-cases/account_data_13.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_14.binproto b/test-cases/account_data_14.binproto
diff --git a/test-cases/account_data_14.txtproto b/test-cases/account_data_14.txtproto
@@ -89,7 +89,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_15.binproto b/test-cases/account_data_15.binproto
diff --git a/test-cases/account_data_15.txtproto b/test-cases/account_data_15.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_16.binproto b/test-cases/account_data_16.binproto
diff --git a/test-cases/account_data_16.txtproto b/test-cases/account_data_16.txtproto
@@ -85,7 +85,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_17.binproto b/test-cases/account_data_17.binproto
diff --git a/test-cases/account_data_17.txtproto b/test-cases/account_data_17.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_18.binproto b/test-cases/account_data_18.binproto
diff --git a/test-cases/account_data_18.txtproto b/test-cases/account_data_18.txtproto
@@ -83,7 +83,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_19.binproto b/test-cases/account_data_19.binproto
diff --git a/test-cases/account_data_19.txtproto b/test-cases/account_data_19.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_20.binproto b/test-cases/account_data_20.binproto
diff --git a/test-cases/account_data_20.txtproto b/test-cases/account_data_20.txtproto
@@ -85,7 +85,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_21.binproto b/test-cases/account_data_21.binproto
diff --git a/test-cases/account_data_21.txtproto b/test-cases/account_data_21.txtproto
@@ -77,7 +77,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_22.binproto b/test-cases/account_data_22.binproto
diff --git a/test-cases/account_data_22.txtproto b/test-cases/account_data_22.txtproto
@@ -89,7 +89,7 @@ Frame {
     distributionList = DistributionListItem {
       distributionId = <00000000000000000000000000000000>
       distributionList = DistributionList {
-        name = "My Story"
+        name = ""
         privacyMode = PrivacyMode.ALL
       }
     }

diff --git a/test-cases/account_data_23.binproto b/test-cases/account_data_23.binproto