chore: fix rebase issues

wireapp · Sep 26, 2023 · fa8ae51 · fa8ae51
1 parent 7481d37
commit fa8ae51
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
@@ -836,8 +836,7 @@ class UserSessionScope internal constructor(
             authenticatedNetworkContainer.conversationApi,
             clientRepository,
             conversationRepository,
-            mlsConversationRepository,
-            mlsUnpacker
+            mlsConversationRepository
         )
 
     private val recoverMLSConversationsUseCase: RecoverMLSConversationsUseCase

diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestEvent.kt
@@ -283,6 +283,7 @@ object TestEvent {
         id = "eventId",
         conversationId = TestConversation.ID,
         transient = false,
+        live = false,
         protocol = Conversation.Protocol.MIXED,
         senderUserId = TestUser.OTHER_USER_ID
     )

diff --git a/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Members.sq b/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Members.sq
@@ -48,7 +48,9 @@ SELECT
     mls_cipher_suite,
     receipt_mode,
     message_timer,
-    user_message_timer
+    user_message_timer,
+    archived,
+    archived_date_time
 FROM Member
 JOIN Conversation ON Conversation.qualified_id = Member.conversation
 WHERE Member.user = ?;