Merge branch 'develop' into feat/e2ei/rotate-conversation-with-e2ei-c…

…ertificate

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationGroupRepository.kt

@@ -156,6 +156,12 @@ internal class ConversationGroupRepositoryImpl(
                                 )
                             }
                         }
+                    }.flatMap {
+                        wrapStorageRequest {
+                            newGroupConversationSystemMessagesCreator.value.conversationStartedUnverifiedWarning(
+                                conversationEntity.id.toModel()
+                            )
+                        }
                     }.flatMap {
                         wrapStorageRequest {
                             conversationDAO.getConversationByQualifiedID(conversationEntity.id)?.let {

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/NewGroupConversationSystemMessagesCreator.kt

@@ -54,6 +54,8 @@ internal interface NewGroupConversationSystemMessagesCreator {
         conversationId: ConversationId,
         userIdList: Set<UserId>
     ): Either<CoreFailure, Unit>
+
+    suspend fun conversationStartedUnverifiedWarning(conversationId: ConversationId): Either<CoreFailure, Unit>
 }
 
 internal class NewGroupConversationSystemMessagesCreatorImpl(
@@ -196,4 +198,18 @@ internal class NewGroupConversationSystemMessagesCreatorImpl(
         }
 
     }
+
+    override suspend fun conversationStartedUnverifiedWarning(conversationId: ConversationId): Either<CoreFailure, Unit> =
+        persistMessage(
+            Message.System(
+                uuid4().toString(),
+                MessageContent.ConversationStartedUnverifiedWarning,
+                conversationId,
+                DateTimeUtil.currentIsoDateTimeString(),
+                selfUserId,
+                Message.Status.Sent,
+                Message.Visibility.VISIBLE,
+                expirationData = null
+            )
+        )
 }

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/Message.kt

@@ -348,6 +348,10 @@ sealed interface Message {
                 is MessageContent.ConversationProtocolChanged -> mutableMapOf(
                     typeKey to "conversationProtocolChanged"
                 )
+
+                is MessageContent.ConversationStartedUnverifiedWarning -> mutableMapOf(
+                    typeKey to "conversationStartedUnverifiedWarning"
+                )
             }
 
             val standardProperties = mapOf(

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt

@@ -298,6 +298,7 @@ sealed class MessageContent {
 
     data object HistoryLost : System()
     data object ConversationCreated : System()
+    data object ConversationStartedUnverifiedWarning : System()
     data object ConversationDegradedMLS : System()
     data object ConversationVerifiedMLS : System()
     data object ConversationDegradedProteus : System()
@@ -357,6 +358,7 @@ fun MessageContent?.getType() = when (this) {
     is MessageContent.Unknown -> "Unknown"
     MessageContent.ConversationVerifiedMLS -> "ConversationVerification.Verified.MLS"
     MessageContent.ConversationVerifiedProteus -> "ConversationVerification.Verified.Proteus"
+    is MessageContent.ConversationStartedUnverifiedWarning -> "ConversationStartedUnverifiedWarning"
     null -> "null"
 }
 

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageMapper.kt

@@ -264,6 +264,7 @@ class MessageMapperImpl(
             MessageEntity.ContentType.CONVERSATION_VERIFIED_MLS -> null
             MessageEntity.ContentType.CONVERSATION_VERIFIED_PREOTEUS -> null
             MessageEntity.ContentType.CONVERSATION_PROTOCOL_CHANGED -> null
+            MessageEntity.ContentType.CONVERSATION_STARTED_UNVERIFIED_WARNING -> null
         }
     }
 
@@ -378,6 +379,7 @@ class MessageMapperImpl(
             MessageEntity.FederationType.CONNECTION_REMOVED -> MessageContent.FederationStopped.ConnectionRemoved(domainList)
         }
         is MessageEntityContent.ConversationProtocolChanged -> MessageContent.ConversationProtocolChanged(protocol.toModel())
+        is MessageEntityContent.ConversationStartedUnverifiedWarning -> MessageContent.ConversationStartedUnverifiedWarning
     }
 }
 
@@ -592,4 +594,5 @@ fun MessageContent.System.toMessageEntityContent(): MessageEntityContent.System
     MessageContent.ConversationVerifiedProteus -> MessageEntityContent.ConversationVerifiedProteus
     is MessageContent.ConversationProtocolChanged -> MessageEntityContent.ConversationProtocolChanged(protocol.toDao())
     MessageContent.HistoryLostProtocolChanged -> MessageEntityContent.HistoryLostProtocolChanged
+    is MessageContent.ConversationStartedUnverifiedWarning -> MessageEntityContent.ConversationStartedUnverifiedWarning
 }

logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/PersistMessageUseCase.kt

@@ -109,5 +109,6 @@ internal class PersistMessageUseCaseImpl(
             is MessageContent.FederationStopped.ConnectionRemoved -> false
             is MessageContent.FederationStopped.Removed -> false
             is MessageContent.ConversationProtocolChanged -> false
+            is MessageContent.ConversationStartedUnverifiedWarning -> false
         }
 }

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt

@@ -1296,7 +1296,8 @@ class UserSessionScope internal constructor(
             logout,
             oneOnOneResolver,
             userId,
-            clientIdProvider
+            clientIdProvider,
+            lazy { conversations.newGroupConversationSystemMessagesCreator }
         )
 
     private val userPropertiesEventReceiver: UserPropertiesEventReceiver
@@ -1647,7 +1648,8 @@ class UserSessionScope internal constructor(
             connectionRepository,
             conversationRepository,
             userRepository,
-            oneOnOneResolver
+            oneOnOneResolver,
+            conversations.newGroupConversationSystemMessagesCreator
         )
 
     val observeSecurityClassificationLabel: ObserveSecurityClassificationLabelUseCase

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/connection/AcceptConnectionRequestUseCase.kt

@@ -21,6 +21,7 @@ package com.wire.kalium.logic.feature.connection
 import com.wire.kalium.logic.CoreFailure
 import com.wire.kalium.logic.data.connection.ConnectionRepository
 import com.wire.kalium.logic.data.conversation.ConversationRepository
+import com.wire.kalium.logic.data.conversation.NewGroupConversationSystemMessagesCreator
 import com.wire.kalium.logic.data.user.ConnectionState
 import com.wire.kalium.logic.data.user.UserId
 import com.wire.kalium.logic.feature.conversation.mls.OneOnOneResolver
@@ -33,7 +34,7 @@ import com.wire.kalium.util.DateTimeUtil
 /**
  * Use Case that allows a user accept a connection request to connect with another User
  */
-fun interface AcceptConnectionRequestUseCase {
+interface AcceptConnectionRequestUseCase {
     /**
      * Use case [AcceptConnectionRequestUseCase] operation
      *
@@ -46,7 +47,8 @@ fun interface AcceptConnectionRequestUseCase {
 internal class AcceptConnectionRequestUseCaseImpl(
     private val connectionRepository: ConnectionRepository,
     private val conversationRepository: ConversationRepository,
-    private val oneOnOneResolver: OneOnOneResolver
+    private val oneOnOneResolver: OneOnOneResolver,
+    private val newGroupConversationSystemMessagesCreator: NewGroupConversationSystemMessagesCreator
 ) : AcceptConnectionRequestUseCase {
 
     override suspend fun invoke(userId: UserId): AcceptConnectionRequestUseCaseResult {
@@ -62,6 +64,10 @@ internal class AcceptConnectionRequestUseCaseImpl(
                         oneOnOneResolver.resolveOneOnOneConversationWithUserId(
                             connection.qualifiedToId
                         ).map { }
+                    }.flatMap {
+                        newGroupConversationSystemMessagesCreator.conversationStartedUnverifiedWarning(
+                            connection.qualifiedConversationId
+                        )
                     }
             }
             .fold({

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/connection/ConnectionScope.kt

@@ -20,22 +20,25 @@ package com.wire.kalium.logic.feature.connection
 
 import com.wire.kalium.logic.data.connection.ConnectionRepository
 import com.wire.kalium.logic.data.conversation.ConversationRepository
+import com.wire.kalium.logic.data.conversation.NewGroupConversationSystemMessagesCreator
 import com.wire.kalium.logic.data.user.UserRepository
 import com.wire.kalium.logic.feature.conversation.mls.OneOnOneResolver
 
 class ConnectionScope internal constructor(
     private val connectionRepository: ConnectionRepository,
     private val conversationRepository: ConversationRepository,
     private val userRepository: UserRepository,
-    private val oneOnOneResolver: OneOnOneResolver
+    private val oneOnOneResolver: OneOnOneResolver,
+    private val newGroupConversationSystemMessagesCreator: NewGroupConversationSystemMessagesCreator
 ) {
     val sendConnectionRequest: SendConnectionRequestUseCase get() = SendConnectionRequestUseCaseImpl(connectionRepository, userRepository)
 
     val acceptConnectionRequest: AcceptConnectionRequestUseCase
         get() = AcceptConnectionRequestUseCaseImpl(
             connectionRepository,
             conversationRepository,
-            oneOnOneResolver
+            oneOnOneResolver,
+            newGroupConversationSystemMessagesCreator
         )
 
     val cancelConnectionRequest: CancelConnectionRequestUseCase get() = CancelConnectionRequestUseCaseImpl(connectionRepository)

logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/UpdateConversationArchivedStatusUseCase.kt

@@ -21,9 +21,11 @@ package com.wire.kalium.logic.feature.conversation
 import com.wire.kalium.logic.data.conversation.ConversationRepository
 import com.wire.kalium.logic.data.conversation.MutedConversationStatus
 import com.wire.kalium.logic.data.id.ConversationId
+import com.wire.kalium.logic.functional.Either
 import com.wire.kalium.logic.functional.flatMap
 import com.wire.kalium.logic.functional.fold
 import com.wire.kalium.logic.functional.onFailure
+import com.wire.kalium.logic.functional.onSuccess
 import com.wire.kalium.logic.kaliumLogger
 import com.wire.kalium.util.DateTimeUtil
 
@@ -33,12 +35,14 @@ interface UpdateConversationArchivedStatusUseCase {
      *
      * @param conversationId the id of the conversation where status wants to be changed
      * @param shouldArchiveConversation new archived status to be updated on the given conversation
+     * @param onlyLocally controls if archived status should only be updated locally
      * @param archivedStatusTimestamp the timestamp when the archiving event occurred
      * @return an [ConversationUpdateStatusResult] containing Success or Failure cases
      */
     suspend operator fun invoke(
         conversationId: ConversationId,
         shouldArchiveConversation: Boolean,
+        onlyLocally: Boolean,
         archivedStatusTimestamp: Long = DateTimeUtil.currentInstant().toEpochMilliseconds()
     ): ArchiveStatusUpdateResult
 }
@@ -50,43 +54,92 @@ internal class UpdateConversationArchivedStatusUseCaseImpl(
     override suspend operator fun invoke(
         conversationId: ConversationId,
         shouldArchiveConversation: Boolean,
+        onlyLocally: Boolean,
         archivedStatusTimestamp: Long
     ): ArchiveStatusUpdateResult =
-        conversationRepository.updateArchivedStatusRemotely(conversationId, shouldArchiveConversation, archivedStatusTimestamp).onFailure {
-            kaliumLogger.e("Something went wrong when updating remotely convId (${conversationId.toLogString()}) archiving " +
-                    "status to archived = ($shouldArchiveConversation)")
-        }.flatMap {
-            conversationRepository.updateArchivedStatusLocally(conversationId, shouldArchiveConversation, archivedStatusTimestamp)
-        }.fold({
-            kaliumLogger.e("Something went wrong when updating locally convId (${conversationId.toLogString()}) archiving " +
-                    "status to archived = ($shouldArchiveConversation)")
-            ArchiveStatusUpdateResult.Failure
-        }, {
-            kaliumLogger.d("Successfully updated remotely and locally convId (${conversationId.toLogString()}) archiving " +
-                    "status to archived = ($shouldArchiveConversation)")
+        if (!onlyLocally) {
+            archiveRemotely(conversationId, shouldArchiveConversation, archivedStatusTimestamp)
+        } else {
+            Either.Right(Unit)
+        }
+            .flatMap {
+                conversationRepository.updateArchivedStatusLocally(conversationId, shouldArchiveConversation, archivedStatusTimestamp)
+            }.fold({
+                kaliumLogger.e(
+                    "Something went wrong when updating locally convId (${conversationId.toLogString()}) archiving " +
+                            "status to archived = ($shouldArchiveConversation)"
+                )
+                ArchiveStatusUpdateResult.Failure
+            }, {
+                kaliumLogger.d(
+                    "Successfully updated locally convId (${conversationId.toLogString()}) archiving " +
+                            "status to archived = ($shouldArchiveConversation)"
+                )
 
-            // Now we should make sure the conversation gets muted if it's archived or un-muted if it's unarchived
-            val updatedMutedStatus = if (shouldArchiveConversation) {
-                MutedConversationStatus.AllMuted
-            } else {
-                MutedConversationStatus.AllAllowed
-            }
-            conversationRepository.updateMutedStatusRemotely(conversationId, updatedMutedStatus, archivedStatusTimestamp)
-                .flatMap {
-                    conversationRepository.updateMutedStatusLocally(conversationId, updatedMutedStatus, archivedStatusTimestamp)
-                }.fold({
-                    kaliumLogger.e(
-                        "Something went wrong when updating the muting status of the convId: " +
-                                "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}"
-                    )
-                }, {
-                    kaliumLogger.d(
-                        "Successfully updated remotely and locally the muting status of the convId: " +
-                                "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}")
-                })
-            // Even if the muting status update fails, we should still return success as the archived status update was successful
-            ArchiveStatusUpdateResult.Success
-        })
+                // Now we should make sure the conversation gets muted if it's archived or un-muted if it's unarchived
+                val updatedMutedStatus = if (shouldArchiveConversation) {
+                    MutedConversationStatus.AllMuted
+                } else {
+                    MutedConversationStatus.AllAllowed
+                }
+
+                if (!onlyLocally) {
+                    updateMutedStatusRemotely(conversationId, updatedMutedStatus, archivedStatusTimestamp)
+                } else {
+                    Either.Right(Unit)
+                }
+                    .flatMap {
+                        conversationRepository.updateMutedStatusLocally(conversationId, updatedMutedStatus, archivedStatusTimestamp)
+                    }.fold({
+                        kaliumLogger.e(
+                            "Something went wrong when updating locally the muting status of the convId: " +
+                                    "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}"
+                        )
+                    }, {
+                        kaliumLogger.d(
+                            "Successfully updated locally the muting status of the convId: " +
+                                    "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}"
+                        )
+                    })
+                // Even if the muting status update fails, we should still return success as the archived status update was successful
+                ArchiveStatusUpdateResult.Success
+            })
+
+    private suspend fun archiveRemotely(
+        conversationId: ConversationId,
+        shouldArchiveConversation: Boolean,
+        archivedStatusTimestamp: Long
+    ) = conversationRepository.updateArchivedStatusRemotely(conversationId, shouldArchiveConversation, archivedStatusTimestamp)
+        .onFailure {
+            kaliumLogger.e(
+                "Something went wrong when updating remotely convId (${conversationId.toLogString()}) archiving " +
+                        "status to archived = ($shouldArchiveConversation)"
+            )
+        }
+        .onSuccess {
+            kaliumLogger.d(
+                "Successfully updated remotely convId (${conversationId.toLogString()}) archiving " +
+                        "status to archived = ($shouldArchiveConversation)"
+            )
+        }
+
+    private suspend fun updateMutedStatusRemotely(
+        conversationId: ConversationId,
+        updatedMutedStatus: MutedConversationStatus,
+        archivedStatusTimestamp: Long
+    ) = conversationRepository.updateMutedStatusRemotely(conversationId, updatedMutedStatus, archivedStatusTimestamp)
+        .onFailure {
+            kaliumLogger.e(
+                "Something went wrong when updating remotely the muting status of the convId: " +
+                        "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}"
+            )
+        }
+        .onSuccess {
+            kaliumLogger.d(
+                "Successfully updated remotely the muting status of the convId: " +
+                        "(${conversationId.toLogString()}) to (${updatedMutedStatus.status}"
+            )
+        }
 }
 
 sealed class ArchiveStatusUpdateResult {

logic/src/commonMain/kotlin/com/wire/kalium/logic/network/SessionManagerImpl.kt

@@ -64,23 +64,23 @@ class SessionManagerImpl internal constructor(
     private val serverConfigMapper: ServerConfigMapper = MapperProvider.serverConfigMapper()
 ) : SessionManager {
 
-    private var session: SessionDTO? = null
     private var serverConfig: ServerConfigDTO? = null
 
-    override suspend fun session(): SessionDTO? = withContext(coroutineContext) {
-        session ?: run {
-            wrapStorageRequest { tokenStorage.getToken(userId.toDao()) }
-                .map { sessionMapper.fromEntityToSessionDTO(it) }
-                .onSuccess { session = it }
-                .onFailure {
-                    kaliumLogger.e(
+    override suspend fun session(): SessionDTO = withContext(coroutineContext) {
+        wrapStorageRequest { tokenStorage.getToken(userId.toDao()) }
+            .map { sessionMapper.fromEntityToSessionDTO(it) }
+            .fold(
+                {
+                    error(
                         """SESSION MANAGER: 
                     |"error": "missing user session",
                     |"cause": "$it" """.trimMargin()
                     )
+                }, { session ->
+                    kaliumLogger.i("_TOKEN_ FOUND SESSION = $session")
+                    session
                 }
-            session
-        }
+            )
     }
 
     override fun serverConfig(): ServerConfigDTO = serverConfig ?: run {
@@ -118,9 +118,7 @@ class SessionManagerImpl internal constructor(
                 throw FailureToRefreshTokenException(message)
             }, {
                 it
-            }).also {
-                session = it
-            }
+            })
         }
     }