Add test cases for Group.blocked

Author: sashaweiss-signal

build.gradle.kts

@@ -19,7 +19,7 @@ application {
 }
 
 dependencies {
-  implementation("org.signal:libsignal-client:0.65.2")
+  implementation("org.signal:libsignal-client:0.65.4")
   implementation("com.thedeanda:lorem:2.2")
   implementation(kotlin("reflect"))
 }

src/main/kotlin/tests/RecipientGroupsTestCase.kt

@@ -86,15 +86,23 @@ object RecipientGroupsTestCase : TestCase("recipient_groups") {
       )
     }
 
+    // If blocked, can't be whitelisted.
+    val (isBlocked, isWhitelisted) = some(Generators.list<Pair<Boolean, Boolean>>(
+      Pair(true, false),
+      Pair(false, true),
+      Pair(false, false)
+    ))
+
     frames += Frame(
       recipient = Recipient(
         id = groupRecipientId,
         group = Group(
           masterKey = someBytes(32).toByteString(),
-          whitelisted = someBoolean(),
+          whitelisted = if (isBlocked) false else isWhitelisted,
           hideStory = someBoolean(),
           storySendMode = someEnum(Group.StorySendMode::class.java),
-          snapshot = snapshot
+          snapshot = snapshot,
+          blocked = isBlocked
         )
       )
     )
@@ -109,5 +117,19 @@ object RecipientGroupsTestCase : TestCase("recipient_groups") {
         expireTimerVersion = 1
       )
     )
+
+    if (isBlocked) {
+      frames += Frame(
+        chatItem = ChatItem(
+          chatId = 1,
+          authorId = StandardFrames.recipientSelf.recipient!!.id,
+          dateSent = someNonZeroTimestamp(),
+          directionless = ChatItem.DirectionlessMessageDetails(),
+          updateMessage = ChatUpdateMessage(
+            simpleUpdate = SimpleChatUpdate(type = SimpleChatUpdate.Type.BLOCKED)
+          )
+        )
+      )
+    }
   }
 }

test-cases/recipient_groups_00.binproto

@@ -208,6 +208,7 @@ Frame {
 Frame {
   recipient = Recipient {
     group = Group {
+      blocked = true
       hideStory = true
       masterKey = <228e188ff7647a4b753e5d1b1bcfadd2b72893989279e8c805d886b98779cc84>
       snapshot = GroupSnapshot {
@@ -235,7 +236,6 @@ Frame {
         version = 957662124
       }
       storySendMode = StorySendMode.DEFAULT
-      whitelisted = true
     }
     id = 10
   }
@@ -247,4 +247,18 @@ Frame {
     id = 1
     recipientId = 10
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 1
+    chatId = 1
+    dateSent = 1675251188008
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.BLOCKED
+      }
+    }
+  }
 }

test-cases/recipient_groups_00.txtproto

@@ -263,6 +263,7 @@ Frame {
         version = 1394492158
       }
       storySendMode = StorySendMode.DISABLED
+      whitelisted = true
     }
     id = 10
   }

test-cases/recipient_groups_01.binproto

@@ -249,7 +249,6 @@ Frame {
         version = 328224940
       }
       storySendMode = StorySendMode.ENABLED
-      whitelisted = true
     }
     id = 10
   }

test-cases/recipient_groups_01.txtproto

@@ -208,6 +208,7 @@ Frame {
 Frame {
   recipient = Recipient {
     group = Group {
+      blocked = true
       masterKey = <228e188ff7647a4b753e5d1b1bcfadd2b72893989279e8c805d886b98779cc84>
       snapshot = GroupSnapshot {
         accessControl = AccessControl {
@@ -271,4 +272,18 @@ Frame {
     id = 1
     recipientId = 10
   }
+}
+
+Frame {
+  chatItem = ChatItem {
+    authorId = 1
+    chatId = 1
+    dateSent = 1722382677508
+    directionless = DirectionlessMessageDetails {}
+    updateMessage = ChatUpdateMessage {
+      simpleUpdate = SimpleChatUpdate {
+        type = Type.BLOCKED
+      }
+    }
+  }
 }