chore: fix rebase issues

wireapp · Sep 19, 2023 · 673f86d · 673f86d
1 parent 2771b3b
commit 673f86d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...ain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageUnpacker.kt b/...ain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageUnpacker.kt
@@ -130,7 +130,7 @@ internal class MLSMessageUnpackerImpl(
                 )
                 mlsConversationRepository.decryptMessage(messageEvent.content.decodeBase64Bytes(), protocolInfo.groupId)
             } else {
-                Either.Right(emptyList())
+                Either.Left(CoreFailure.NotSupportedByProteus)
             }
         }
 }
diff --git a/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/utils/stubs/TestStubs.kt b/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/utils/stubs/TestStubs.kt
@@ -159,7 +159,9 @@ internal object TestStubs {
         accessRole = listOf(ConversationEntity.AccessRole.NON_TEAM_MEMBER, ConversationEntity.AccessRole.TEAM_MEMBER),
         receiptMode = ConversationEntity.ReceiptMode.DISABLED,
         messageTimer = messageTimer,
-        userMessageTimer = null
+        userMessageTimer = null,
+        archived = false,
+        archivedInstant = null
     )
 
     val member1 = MemberEntity(user1.id, MemberEntity.Role.Admin)