diff --git a/src/main/kotlin/Permutations.kt b/src/main/kotlin/Permutations.kt index c6de831..8b455df 100644 --- a/src/main/kotlin/Permutations.kt +++ b/src/main/kotlin/Permutations.kt @@ -403,14 +403,20 @@ object Generators { contentTypeGenerator = Generators.list("image/png") ) - fun filePointer( - contentTypeGenerator: Generator = Generators.list("image/jpeg", "image/png", "image/gif", "audio/mp3", "video/mp4") - ): Generator = filePointerInternal( + fun stickerFilePointer(): Generator = filePointerInternal( + includeFileName = true, + includeMediaSize = true, + includeCaption = false, + includeBlurHash = false, + contentTypeGenerator = Generators.list("image/png", "image/apng", "image/webp") + ) + + fun bodyAttachmentFilePointer(): Generator = filePointerInternal( includeFileName = true, includeMediaSize = true, includeCaption = true, includeBlurHash = true, - contentTypeGenerator = contentTypeGenerator + contentTypeGenerator = Generators.list("image/jpeg", "image/png", "image/gif", "audio/mp3", "video/mp4") ) private fun filePointerInternal( diff --git a/src/main/kotlin/tests/ChatItemStandardMessageStandardAttachmentsTestCase.kt b/src/main/kotlin/tests/ChatItemStandardMessageStandardAttachmentsTestCase.kt index 801865f..3595a2a 100644 --- a/src/main/kotlin/tests/ChatItemStandardMessageStandardAttachmentsTestCase.kt +++ b/src/main/kotlin/tests/ChatItemStandardMessageStandardAttachmentsTestCase.kt @@ -45,7 +45,7 @@ object ChatItemStandardMessageStandardAttachmentsTestCase : TestCase("chat_item_ }, attachments = Generators.permutation { frames += MessageAttachment( - pointer = some(Generators.filePointer()), + pointer = some(Generators.bodyAttachmentFilePointer()), flag = MessageAttachment.Flag.NONE, wasDownloaded = someBoolean(), clientUuid = some(Generators.uuids().nullable())?.toByteArray()?.toByteString() diff --git a/src/main/kotlin/tests/ChatItemStickerMessageTestCase.kt b/src/main/kotlin/tests/ChatItemStickerMessageTestCase.kt index 975bb2a..8e28a29 100644 --- a/src/main/kotlin/tests/ChatItemStickerMessageTestCase.kt +++ b/src/main/kotlin/tests/ChatItemStickerMessageTestCase.kt @@ -27,8 +27,6 @@ object ChatItemStickerMessageTestCase : TestCase("chat_item_sticker_message") { val incoming = some(incomingGenerator) val outgoing = some(outgoingGenerator) - val contentTypeGenerator = Generators.list("image/png", "image/apng", "image/webp") - frames += Frame( chatItem = ChatItem( chatId = StandardFrames.chatAlice.chat!!.id, @@ -46,7 +44,7 @@ object ChatItemStickerMessageTestCase : TestCase("chat_item_sticker_message") { packKey = someBytes(32).toByteString(), stickerId = someInt(1, 32), emoji = someEmoji(), - data_ = some(Generators.filePointer(contentTypeGenerator)) + data_ = some(Generators.stickerFilePointer()) ), reactions = some(Generators.reactions(2, StandardFrames.recipientSelf.recipient!!, StandardFrames.recipientAlice.recipient!!)) ) diff --git a/src/main/kotlin/tests/RecipientContactsTestCase.kt b/src/main/kotlin/tests/RecipientContactsTestCase.kt index a3bc7de..58855b5 100644 --- a/src/main/kotlin/tests/RecipientContactsTestCase.kt +++ b/src/main/kotlin/tests/RecipientContactsTestCase.kt @@ -2,6 +2,7 @@ package tests import PermutationScope import TestCase +import nullable import okio.ByteString.Companion.toByteString import oneOf import org.thoughtcrime.securesms.backup.v2.proto.Contact @@ -40,8 +41,8 @@ object RecipientContactsTestCase : TestCase("recipient_contacts") { notRegistered = someOneOf(notRegistered), profileKey = someNullableBytes(32)?.toByteString(), profileSharing = someBoolean(), - profileGivenName = someNullableString(), - profileFamilyName = someNullableString(), + profileGivenName = some(Generators.nonEmptyStrings().nullable()), + profileFamilyName = some(Generators.nonEmptyStrings().nullable()), hideStory = someBoolean() ) ) diff --git a/src/main/kotlin/tests/RecipientDistributionListTestCase.kt b/src/main/kotlin/tests/RecipientDistributionListTestCase.kt index 601d23d..9284df4 100644 --- a/src/main/kotlin/tests/RecipientDistributionListTestCase.kt +++ b/src/main/kotlin/tests/RecipientDistributionListTestCase.kt @@ -32,7 +32,7 @@ object RecipientDistributionListTestCase : TestCase("recipient_distribution_list val myStoryGenerator = Generators.permutation { val privacyModeGenerator = Generators.enum(DistributionList.PrivacyMode::class.java, excluding = DistributionList.PrivacyMode.UNKNOWN) - val memberRecipientIdGenerator = Generators.list(memberIds).asList(0, 1, 2, 3) + val memberRecipientIdGenerator = Generators.list(memberIds).asList(1, 2, 3) val privacyMode = some(privacyModeGenerator) val memberRecipientIds = some(memberRecipientIdGenerator) @@ -62,7 +62,7 @@ object RecipientDistributionListTestCase : TestCase("recipient_distribution_list val (deletionTimestampGenerator, distributionListGenerator) = oneOf( Generators.single(someIncrementingTimestamp()), Generators.permutation { - val memberRecipientIdGenerator = Generators.list(memberIds).asList(0, 1, 2, 3) + val memberRecipientIdGenerator = Generators.list(memberIds).asList(1, 2, 3) val privacyMode = DistributionList.PrivacyMode.ONLY_WITH val memberRecipientIds = some(memberRecipientIdGenerator) diff --git a/test-cases/chat_item_sticker_message_01.binproto b/test-cases/chat_item_sticker_message_01.binproto index 51c3006..c0fd016 100644 Binary files a/test-cases/chat_item_sticker_message_01.binproto and b/test-cases/chat_item_sticker_message_01.binproto differ diff --git a/test-cases/chat_item_sticker_message_01.txtproto b/test-cases/chat_item_sticker_message_01.txtproto index 691e76c..dd4aa34 100644 --- a/test-cases/chat_item_sticker_message_01.txtproto +++ b/test-cases/chat_item_sticker_message_01.txtproto @@ -127,7 +127,7 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1668034297678 + sentTimestamp = 1775172671564 sortOrder = 1 } ] @@ -141,8 +141,6 @@ Frame { size = 1343527527 transitCdnKey = "SkLQGER" } - blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" - caption = "" contentType = "image/apng" fileName = "iGqMx" height = 39 diff --git a/test-cases/chat_item_sticker_message_02.binproto b/test-cases/chat_item_sticker_message_02.binproto index 8b6f07d..ba09802 100644 Binary files a/test-cases/chat_item_sticker_message_02.binproto and b/test-cases/chat_item_sticker_message_02.binproto differ diff --git a/test-cases/chat_item_sticker_message_02.txtproto b/test-cases/chat_item_sticker_message_02.txtproto index 94fadb7..e30eb91 100644 --- a/test-cases/chat_item_sticker_message_02.txtproto +++ b/test-cases/chat_item_sticker_message_02.txtproto @@ -131,13 +131,13 @@ Frame { Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1668034297679 + sentTimestamp = 1775172671565 sortOrder = 2 }, Reaction { authorId = 1 emoji = "👎" - sentTimestamp = 1668034297680 + sentTimestamp = 1775172671566 } ] sticker = Sticker { @@ -151,8 +151,6 @@ Frame { transitCdnKey = "wSQuECQWuuuEFC" transitCdnNumber = 2 } - blurHash = "LGG*f,-i.l-o?G$~?Zt7pHN1=tE3" - caption = "GMNaiqnl" contentType = "image/webp" fileName = "pdcKiDzzeAEZOb" height = 1838 diff --git a/test-cases/chat_item_sticker_message_03.binproto b/test-cases/chat_item_sticker_message_03.binproto index c5c132e..eb28175 100644 Binary files a/test-cases/chat_item_sticker_message_03.binproto and b/test-cases/chat_item_sticker_message_03.binproto differ diff --git a/test-cases/chat_item_sticker_message_03.txtproto b/test-cases/chat_item_sticker_message_03.txtproto index ed6b71e..0c71076 100644 --- a/test-cases/chat_item_sticker_message_03.txtproto +++ b/test-cases/chat_item_sticker_message_03.txtproto @@ -138,8 +138,6 @@ Frame { mediaName = "67fdcb1ac685a8aedbd29cb42e984d65" size = 1322441015 } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - caption = "bYTMdKV" contentType = "image/png" height = 3586 incrementalMac = diff --git a/test-cases/chat_item_sticker_message_04.binproto b/test-cases/chat_item_sticker_message_04.binproto index 3f8018f..790f398 100644 Binary files a/test-cases/chat_item_sticker_message_04.binproto and b/test-cases/chat_item_sticker_message_04.binproto differ diff --git a/test-cases/chat_item_sticker_message_04.txtproto b/test-cases/chat_item_sticker_message_04.txtproto index ba6e05e..3d220a5 100644 --- a/test-cases/chat_item_sticker_message_04.txtproto +++ b/test-cases/chat_item_sticker_message_04.txtproto @@ -132,8 +132,8 @@ Frame { Reaction { authorId = 4 emoji = "👍🏾" - sentTimestamp = 1668034297681 - sortOrder = 1784708167318 + sentTimestamp = 1775172671567 + sortOrder = 1890617579856 } ] sticker = Sticker { @@ -144,7 +144,6 @@ Frame { key = <88cf6bfa88e3f24a21a78511518391fb> size = 1850075618 } - blurHash = "LJR,66e.~Cxu%LoLM|S2%3WWIosm" contentType = "image/apng" fileName = "iGqMx" } diff --git a/test-cases/chat_item_sticker_message_05.binproto b/test-cases/chat_item_sticker_message_05.binproto index d301c5b..f1aaa0c 100644 Binary files a/test-cases/chat_item_sticker_message_05.binproto and b/test-cases/chat_item_sticker_message_05.binproto differ diff --git a/test-cases/chat_item_sticker_message_05.txtproto b/test-cases/chat_item_sticker_message_05.txtproto index 70903cb..d8e48b2 100644 --- a/test-cases/chat_item_sticker_message_05.txtproto +++ b/test-cases/chat_item_sticker_message_05.txtproto @@ -133,13 +133,13 @@ Frame { Reaction { authorId = 1 emoji = "👩‍💻" - sentTimestamp = 1668034297682 - sortOrder = 1899836917778 + sentTimestamp = 1775172671568 + sortOrder = 1876547590663 }, Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1668034297678 + sentTimestamp = 1775172671564 sortOrder = 1 } ] @@ -153,8 +153,6 @@ Frame { size = 464606141 uploadTimestamp = 1664616494583 } - blurHash = "LIM:}RB8?-^L.d4]O.nkK_ruI?od" - caption = "" contentType = "image/webp" fileName = "pdcKiDzzeAEZOb" height = 39 diff --git a/test-cases/chat_item_sticker_message_06.binproto b/test-cases/chat_item_sticker_message_06.binproto index 4d29d6d..ba04669 100644 Binary files a/test-cases/chat_item_sticker_message_06.binproto and b/test-cases/chat_item_sticker_message_06.binproto differ diff --git a/test-cases/chat_item_sticker_message_06.txtproto b/test-cases/chat_item_sticker_message_06.txtproto index 6616b4d..a1a1609 100644 --- a/test-cases/chat_item_sticker_message_06.txtproto +++ b/test-cases/chat_item_sticker_message_06.txtproto @@ -138,7 +138,6 @@ Frame { size = 228533420 uploadTimestamp = 1866570650701 } - caption = "GMNaiqnl" contentType = "image/png" height = 1838 width = 2923 diff --git a/test-cases/chat_item_sticker_message_07.binproto b/test-cases/chat_item_sticker_message_07.binproto index 9320544..0a458e6 100644 Binary files a/test-cases/chat_item_sticker_message_07.binproto and b/test-cases/chat_item_sticker_message_07.binproto differ diff --git a/test-cases/chat_item_sticker_message_07.txtproto b/test-cases/chat_item_sticker_message_07.txtproto index d6b9270..ad6a857 100644 --- a/test-cases/chat_item_sticker_message_07.txtproto +++ b/test-cases/chat_item_sticker_message_07.txtproto @@ -134,14 +134,12 @@ Frame { Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1668034297679 + sentTimestamp = 1775172671565 sortOrder = 2 } ] sticker = Sticker { data_ = FilePointer { - blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" - caption = "bYTMdKV" contentType = "image/apng" fileName = "iGqMx" height = 3586 diff --git a/test-cases/chat_item_sticker_message_08.binproto b/test-cases/chat_item_sticker_message_08.binproto index de10de1..9d37bc4 100644 Binary files a/test-cases/chat_item_sticker_message_08.binproto and b/test-cases/chat_item_sticker_message_08.binproto differ diff --git a/test-cases/chat_item_sticker_message_08.txtproto b/test-cases/chat_item_sticker_message_08.txtproto index a8876f9..e43ed23 100644 --- a/test-cases/chat_item_sticker_message_08.txtproto +++ b/test-cases/chat_item_sticker_message_08.txtproto @@ -131,13 +131,13 @@ Frame { Reaction { authorId = 1 emoji = "👎" - sentTimestamp = 1668034297680 + sentTimestamp = 1775172671566 }, Reaction { authorId = 4 emoji = "👍🏾" - sentTimestamp = 1668034297681 - sortOrder = 1784708167318 + sentTimestamp = 1775172671567 + sortOrder = 1890617579856 } ] sticker = Sticker { diff --git a/test-cases/chat_item_sticker_message_09.binproto b/test-cases/chat_item_sticker_message_09.binproto index 04a60d8..1c618ec 100644 Binary files a/test-cases/chat_item_sticker_message_09.binproto and b/test-cases/chat_item_sticker_message_09.binproto differ diff --git a/test-cases/chat_item_sticker_message_09.txtproto b/test-cases/chat_item_sticker_message_09.txtproto index 8a9241c..a2dd92a 100644 --- a/test-cases/chat_item_sticker_message_09.txtproto +++ b/test-cases/chat_item_sticker_message_09.txtproto @@ -140,8 +140,6 @@ Frame { size = 1343527527 transitCdnKey = "SkLQGER" } - blurHash = "LfLh6Voa9NIW?wNF-ooL-;WAX8oy" - caption = "" contentType = "image/apng" fileName = "iGqMx" height = 39 diff --git a/test-cases/chat_item_sticker_message_10.binproto b/test-cases/chat_item_sticker_message_10.binproto index 48b9fbe..02eb8d7 100644 Binary files a/test-cases/chat_item_sticker_message_10.binproto and b/test-cases/chat_item_sticker_message_10.binproto differ diff --git a/test-cases/chat_item_sticker_message_10.txtproto b/test-cases/chat_item_sticker_message_10.txtproto index 3a86051..a8f2088 100644 --- a/test-cases/chat_item_sticker_message_10.txtproto +++ b/test-cases/chat_item_sticker_message_10.txtproto @@ -132,8 +132,8 @@ Frame { Reaction { authorId = 1 emoji = "👩‍💻" - sentTimestamp = 1668034297682 - sortOrder = 1899836917778 + sentTimestamp = 1775172671568 + sortOrder = 1876547590663 } ] sticker = Sticker { @@ -147,8 +147,6 @@ Frame { transitCdnKey = "wSQuECQWuuuEFC" transitCdnNumber = 2 } - blurHash = "LGG*f,-i.l-o?G$~?Zt7pHN1=tE3" - caption = "GMNaiqnl" contentType = "image/webp" fileName = "pdcKiDzzeAEZOb" height = 1838 diff --git a/test-cases/chat_item_sticker_message_11.binproto b/test-cases/chat_item_sticker_message_11.binproto index 2cb7d11..4a5e73b 100644 Binary files a/test-cases/chat_item_sticker_message_11.binproto and b/test-cases/chat_item_sticker_message_11.binproto differ diff --git a/test-cases/chat_item_sticker_message_11.txtproto b/test-cases/chat_item_sticker_message_11.txtproto index e3e6bf0..f571433 100644 --- a/test-cases/chat_item_sticker_message_11.txtproto +++ b/test-cases/chat_item_sticker_message_11.txtproto @@ -131,13 +131,13 @@ Frame { Reaction { authorId = 1 emoji = "💀" - sentTimestamp = 1668034297678 + sentTimestamp = 1775172671564 sortOrder = 1 }, Reaction { authorId = 4 emoji = "👍" - sentTimestamp = 1668034297679 + sentTimestamp = 1775172671565 sortOrder = 2 } ] @@ -149,8 +149,6 @@ Frame { mediaName = "67fdcb1ac685a8aedbd29cb42e984d65" size = 1322441015 } - blurHash = "LdIOX?NE9Y4T~pRPRjE1X9f5jrt6" - caption = "bYTMdKV" contentType = "image/png" height = 3586 incrementalMac = diff --git a/test-cases/chat_item_sticker_message_12.binproto b/test-cases/chat_item_sticker_message_12.binproto index 2ab822f..fb7ca54 100644 Binary files a/test-cases/chat_item_sticker_message_12.binproto and b/test-cases/chat_item_sticker_message_12.binproto differ diff --git a/test-cases/chat_item_sticker_message_12.txtproto b/test-cases/chat_item_sticker_message_12.txtproto index 9bdea25..88823c0 100644 --- a/test-cases/chat_item_sticker_message_12.txtproto +++ b/test-cases/chat_item_sticker_message_12.txtproto @@ -138,7 +138,6 @@ Frame { key = <88cf6bfa88e3f24a21a78511518391fb> size = 1850075618 } - blurHash = "LJR,66e.~Cxu%LoLM|S2%3WWIosm" contentType = "image/apng" fileName = "iGqMx" } diff --git a/test-cases/chat_item_sticker_message_13.binproto b/test-cases/chat_item_sticker_message_13.binproto index 82cb05e..637f04e 100644 Binary files a/test-cases/chat_item_sticker_message_13.binproto and b/test-cases/chat_item_sticker_message_13.binproto differ diff --git a/test-cases/chat_item_sticker_message_13.txtproto b/test-cases/chat_item_sticker_message_13.txtproto index 9d685ee..72908ed 100644 --- a/test-cases/chat_item_sticker_message_13.txtproto +++ b/test-cases/chat_item_sticker_message_13.txtproto @@ -134,7 +134,7 @@ Frame { Reaction { authorId = 1 emoji = "👎" - sentTimestamp = 1668034297680 + sentTimestamp = 1775172671566 } ] sticker = Sticker { @@ -147,8 +147,6 @@ Frame { size = 464606141 uploadTimestamp = 1664616494583 } - blurHash = "LIM:}RB8?-^L.d4]O.nkK_ruI?od" - caption = "" contentType = "image/webp" fileName = "pdcKiDzzeAEZOb" height = 39 diff --git a/test-cases/chat_item_sticker_message_14.binproto b/test-cases/chat_item_sticker_message_14.binproto index a96e559..3313fb2 100644 Binary files a/test-cases/chat_item_sticker_message_14.binproto and b/test-cases/chat_item_sticker_message_14.binproto differ diff --git a/test-cases/chat_item_sticker_message_14.txtproto b/test-cases/chat_item_sticker_message_14.txtproto index 2d17276..e7a88c9 100644 --- a/test-cases/chat_item_sticker_message_14.txtproto +++ b/test-cases/chat_item_sticker_message_14.txtproto @@ -133,14 +133,14 @@ Frame { Reaction { authorId = 4 emoji = "👍🏾" - sentTimestamp = 1668034297681 - sortOrder = 1784708167318 + sentTimestamp = 1775172671567 + sortOrder = 1890617579856 }, Reaction { authorId = 1 emoji = "👩‍💻" - sentTimestamp = 1668034297682 - sortOrder = 1899836917778 + sentTimestamp = 1775172671568 + sortOrder = 1876547590663 } ] sticker = Sticker { @@ -153,7 +153,6 @@ Frame { size = 228533420 uploadTimestamp = 1866570650701 } - caption = "GMNaiqnl" contentType = "image/png" height = 1838 width = 2923 diff --git a/test-cases/recipient_contacts_01.binproto b/test-cases/recipient_contacts_01.binproto index 78b8661..3d8ae94 100644 Binary files a/test-cases/recipient_contacts_01.binproto and b/test-cases/recipient_contacts_01.binproto differ diff --git a/test-cases/recipient_contacts_01.txtproto b/test-cases/recipient_contacts_01.txtproto index 13ebc15..ccf1579 100644 --- a/test-cases/recipient_contacts_01.txtproto +++ b/test-cases/recipient_contacts_01.txtproto @@ -96,8 +96,8 @@ Frame { e164 = 33639987949 notRegistered = NotRegistered {} pni = - profileFamilyName = "" - profileGivenName = "" + profileFamilyName = "CQWuu" + profileGivenName = "pIJqySkLQ" profileKey = <149f599dab4f9c8a0a0f6193b4fffb255879953e257ab94747b56ae57f372e1b> username = "zGYSDTsXBkoGHk.3420" visibility = Visibility.HIDDEN diff --git a/test-cases/recipient_contacts_02.binproto b/test-cases/recipient_contacts_02.binproto index dbf0004..255ccdf 100644 Binary files a/test-cases/recipient_contacts_02.binproto and b/test-cases/recipient_contacts_02.binproto differ diff --git a/test-cases/recipient_contacts_02.txtproto b/test-cases/recipient_contacts_02.txtproto index 5100c18..a5d7e3a 100644 --- a/test-cases/recipient_contacts_02.txtproto +++ b/test-cases/recipient_contacts_02.txtproto @@ -100,8 +100,8 @@ Frame { unregisteredTimestamp = 1833527071192 } pni = - profileFamilyName = "CQWuu" - profileGivenName = "pIJqySkLQ" + profileFamilyName = "EFCmCqQNEWGrA" + profileGivenName = "ERtwSQu" profileSharing = true username = "nzNFkpZzmNnJ.3791" visibility = Visibility.HIDDEN_MESSAGE_REQUEST diff --git a/test-cases/recipient_contacts_03.binproto b/test-cases/recipient_contacts_03.binproto index 88cc4b3..2a1f0bd 100644 Binary files a/test-cases/recipient_contacts_03.binproto and b/test-cases/recipient_contacts_03.binproto differ diff --git a/test-cases/recipient_contacts_03.txtproto b/test-cases/recipient_contacts_03.txtproto index 41d9c3d..dd64318 100644 --- a/test-cases/recipient_contacts_03.txtproto +++ b/test-cases/recipient_contacts_03.txtproto @@ -98,8 +98,6 @@ Frame { unregisteredTimestamp = 1695248715439 } pni = - profileFamilyName = "EFCmCqQNEWGrA" - profileGivenName = "ERtwSQu" profileKey = <149f599dab4f9c8a0a0f6193b4fffb255879953e257ab94747b56ae57f372e1b> username = "avlHxOeTt.05" visibility = Visibility.VISIBLE diff --git a/test-cases/recipient_distribution_list_00.binproto b/test-cases/recipient_distribution_list_00.binproto index 21c6188..82b54fb 100644 Binary files a/test-cases/recipient_distribution_list_00.binproto and b/test-cases/recipient_distribution_list_00.binproto differ diff --git a/test-cases/recipient_distribution_list_00.txtproto b/test-cases/recipient_distribution_list_00.txtproto index 3c2e1a2..0c56dce 100644 --- a/test-cases/recipient_distribution_list_00.txtproto +++ b/test-cases/recipient_distribution_list_00.txtproto @@ -130,6 +130,9 @@ Frame { distributionId = <00000000000000000000000000000000> distributionList = DistributionList { allowReplies = true + memberRecipientIds = [ + 4 + ] name = "EtjaXtfWb" privacyMode = PrivacyMode.ONLY_WITH } @@ -141,8 +144,8 @@ Frame { Frame { recipient = Recipient { distributionList = DistributionListItem { - deletionTimestamp = 1828988507550 - distributionId = <4918c8d4170946868d1955d4fa82c95b> + deletionTimestamp = 1727080952861 + distributionId = } id = 8 } diff --git a/test-cases/recipient_distribution_list_01.binproto b/test-cases/recipient_distribution_list_01.binproto index e0488c1..2865cf4 100644 Binary files a/test-cases/recipient_distribution_list_01.binproto and b/test-cases/recipient_distribution_list_01.binproto differ diff --git a/test-cases/recipient_distribution_list_01.txtproto b/test-cases/recipient_distribution_list_01.txtproto index 93d44bb..5241365 100644 --- a/test-cases/recipient_distribution_list_01.txtproto +++ b/test-cases/recipient_distribution_list_01.txtproto @@ -130,7 +130,8 @@ Frame { distributionId = <00000000000000000000000000000000> distributionList = DistributionList { memberRecipientIds = [ - 4 + 5, + 6 ] name = "gYOzQSvJcbzGY" privacyMode = PrivacyMode.ALL_EXCEPT @@ -143,10 +144,13 @@ Frame { Frame { recipient = Recipient { distributionList = DistributionListItem { - distributionId = <4918c8d4170946868d1955d4fa82c95b> + distributionId = distributionList = DistributionList { allowReplies = true - name = "uEFCmCq" + memberRecipientIds = [ + 4 + ] + name = "YWfDTgpIJ" privacyMode = PrivacyMode.ONLY_WITH } } diff --git a/test-cases/recipient_distribution_list_02.binproto b/test-cases/recipient_distribution_list_02.binproto index 499a0ba..b0e2252 100644 Binary files a/test-cases/recipient_distribution_list_02.binproto and b/test-cases/recipient_distribution_list_02.binproto differ diff --git a/test-cases/recipient_distribution_list_02.txtproto b/test-cases/recipient_distribution_list_02.txtproto index f0495d4..fbbf336 100644 --- a/test-cases/recipient_distribution_list_02.txtproto +++ b/test-cases/recipient_distribution_list_02.txtproto @@ -141,12 +141,13 @@ Frame { Frame { recipient = Recipient { distributionList = DistributionListItem { - distributionId = <4918c8d4170946868d1955d4fa82c95b> + distributionId = distributionList = DistributionList { memberRecipientIds = [ - 4 + 5, + 6 ] - name = "NEWGrAzrH" + name = "ySkLQGERtwS" privacyMode = PrivacyMode.ONLY_WITH } } diff --git a/test-cases/recipient_distribution_list_03.binproto b/test-cases/recipient_distribution_list_03.binproto index 8530e5e..6e902f4 100644 Binary files a/test-cases/recipient_distribution_list_03.binproto and b/test-cases/recipient_distribution_list_03.binproto differ diff --git a/test-cases/recipient_distribution_list_03.txtproto b/test-cases/recipient_distribution_list_03.txtproto index 630391d..dfd39c2 100644 --- a/test-cases/recipient_distribution_list_03.txtproto +++ b/test-cases/recipient_distribution_list_03.txtproto @@ -129,12 +129,11 @@ Frame { distributionList = DistributionListItem { distributionId = <00000000000000000000000000000000> distributionList = DistributionList { + allowReplies = true memberRecipientIds = [ - 4, - 5, - 6 + 4 ] - name = "gYOzQSvJcbzGY" + name = "EtjaXtfWb" privacyMode = PrivacyMode.ONLY_WITH } } @@ -145,14 +144,15 @@ Frame { Frame { recipient = Recipient { distributionList = DistributionListItem { - distributionId = <4918c8d4170946868d1955d4fa82c95b> + distributionId = distributionList = DistributionList { allowReplies = true memberRecipientIds = [ + 4, 5, 6 ] - name = "uEFCmCq" + name = "YWfDTgpIJ" privacyMode = PrivacyMode.ONLY_WITH } } diff --git a/test-cases/recipient_distribution_list_04.binproto b/test-cases/recipient_distribution_list_04.binproto deleted file mode 100644 index c83c333..0000000 Binary files a/test-cases/recipient_distribution_list_04.binproto and /dev/null differ diff --git a/test-cases/recipient_distribution_list_04.txtproto b/test-cases/recipient_distribution_list_04.txtproto deleted file mode 100644 index fb8ae9e..0000000 --- a/test-cases/recipient_distribution_list_04.txtproto +++ /dev/null @@ -1,157 +0,0 @@ -// This file was auto-generated! It's only meant to show you what's in the .binproto. Do not edit! - -BackupInfo { - backupTimeMs = 1715636551000 - version = 1 -} - -Frame { - account = AccountData { - accountSettings = AccountSettings { - customChatColors = [ - CustomChatColor { - id = 1 - solid = -16777216 - }, - CustomChatColor { - id = 2 - solid = -65536 - }, - CustomChatColor { - id = 3 - solid = -16711936 - } - ] - displayBadgesOnProfile = true - hasCompletedUsernameOnboarding = true - hasSeenGroupStoryEducationSheet = true - hasSetMyStoriesPrivacy = true - hasViewedOnboardingStory = true - keepMutedChatsArchived = true - linkPreviews = true - notDiscoverableByPhoneNumber = true - phoneNumberSharingMode = PhoneNumberSharingMode.NOBODY - preferContactAvatars = true - preferredReactionEmoji = [ - "a", - "b", - "c" - ] - readReceipts = true - sealedSenderIndicators = true - storiesDisabled = true - storyViewReceiptsEnabled = true - typingIndicators = true - universalExpireTimerSeconds = 3600 - } - avatarUrlPath = "" - donationSubscriberData = SubscriberData { - currencyCode = "USD" - manuallyCancelled = true - subscriberId = - } - familyName = "Fett" - givenName = "Boba" - profileKey = <610291abedc34249489da39a31c9a5cd99cdd26ff58732e268e357ee0075d9d8> - username = "boba_fett.66" - usernameLink = UsernameLink { - color = Color.OLIVE - entropy = <65675c73d00eb01005e3bb7c4a47f296cb6554f78981238815e915d824fd2e93> - serverId = <61c101a200d5421789c20518d8497af0> - } - } -} - -Frame { - recipient = Recipient { - id = 1 - self = Self {} - } -} - -Frame { - recipient = Recipient { - id = 2 - releaseNotes = ReleaseNotes {} - } -} - -Frame { - recipient = Recipient { - contact = Contact { - aci = <000a11ce000040008000000000000001> - e164 = 16105550101 - pni = <000a11ce000040008000000000000002> - profileFamilyName = "Smith" - profileGivenName = "Alice" - profileKey = - registered = Registered {} - visibility = Visibility.VISIBLE - } - id = 4 - } -} - -Frame { - recipient = Recipient { - contact = Contact { - aci = <00000b0b000040008000000000000001> - e164 = 16105550102 - pni = <00000b0b000040008000000000000002> - profileFamilyName = "Jones" - profileGivenName = "Bob" - profileKey = <0410410410410410410410410410410410410410410410410410410410410410> - registered = Registered {} - visibility = Visibility.VISIBLE - } - id = 5 - } -} - -Frame { - recipient = Recipient { - contact = Contact { - aci = <0000ca01000040008000000000000001> - e164 = 16105550103 - pni = <0000ca01000040008000000000000002> - profileFamilyName = "Johnson" - profileGivenName = "Carol" - profileKey = <0820820820820820820820820820820820820820820820820820820820820820> - registered = Registered {} - visibility = Visibility.VISIBLE - } - id = 6 - } -} - -Frame { - recipient = Recipient { - distributionList = DistributionListItem { - distributionId = <00000000000000000000000000000000> - distributionList = DistributionList { - allowReplies = true - name = "EtjaXtfWb" - privacyMode = PrivacyMode.ONLY_WITH - } - } - id = 7 - } -} - -Frame { - recipient = Recipient { - distributionList = DistributionListItem { - distributionId = <4918c8d4170946868d1955d4fa82c95b> - distributionList = DistributionList { - memberRecipientIds = [ - 4, - 5, - 6 - ] - name = "NEWGrAzrH" - privacyMode = PrivacyMode.ONLY_WITH - } - } - id = 8 - } -} \ No newline at end of file