fix(debug): disambiguate crypto stats drift semantics (#4144)

mastaab · web-flow · commit cc41a919dacd · 2026-05-20T06:32:34.000Z
Expose self-membership, focused 1:1 display names, and CoreCrypto lookup failures separately so debug consumers can distinguish real MLS drift from left conversations or transient lookup errors.
diff --git a/data/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq b/data/persistence/src/commonMain/db_user/com/wire/kalium/persistence/Conversations.sq
@@ -244,6 +244,24 @@ WHERE qualified_id = :qualified_id;
 selectAllConversations:
 SELECT * FROM Conversation WHERE type IS NOT 'CONNECTION_PENDING' AND deleted_locally = 0 ORDER BY last_modified_date DESC, name ASC;
 
+selectAllConversationsWithOtherUserName:
+SELECT
+    Conversation.*,
+    User.name AS otherUserName,
+    EXISTS (
+        SELECT 1 FROM Member
+        WHERE Member.conversation = Conversation.qualified_id
+          AND Member.user = :selfUserId
+    ) AS selfIsMember
+FROM Conversation
+LEFT JOIN Member AS OtherMember ON Conversation.qualified_id = OtherMember.conversation
+    AND Conversation.type IS 'ONE_ON_ONE'
+    AND OtherMember.user IS NOT :selfUserId
+LEFT JOIN User ON User.qualified_id = OtherMember.user
+WHERE Conversation.type IS NOT 'CONNECTION_PENDING'
+  AND Conversation.deleted_locally = 0
+ORDER BY Conversation.last_modified_date DESC, Conversation.name ASC;
+
 selectAllTeamProteusConversationsReadyForMigration:
 SELECT
 qualified_id,
diff --git a/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAO.kt b/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAO.kt
@@ -73,6 +73,7 @@ interface ConversationDAO {
     )
     suspend fun updateAllConversationsNotificationDate()
     suspend fun getAllConversations(): Flow<List<ConversationEntity>>
+    suspend fun getAllConversationsWithOtherUserName(selfUserId: QualifiedIDEntity): Flow<List<ConversationWithOtherUserNameEntity>>
     suspend fun getAllConversationDetails(
         fromArchive: Boolean,
         filter: ConversationFilterEntity,
@@ -194,6 +195,12 @@ data class NameAndHandleEntity(
     val handle: String?
 )
 
+data class ConversationWithOtherUserNameEntity(
+    val conversation: ConversationEntity,
+    val otherUserName: String?,
+    val selfIsMember: Boolean,
+)
+
 data class EpochChangesDataEntity(
     val conversationId: QualifiedIDEntity,
     val mlsVerificationStatus: ConversationEntity.VerificationStatus,
diff --git a/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAOImpl.kt b/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationDAOImpl.kt
@@ -321,6 +321,16 @@ internal class ConversationDAOImpl internal constructor(
             .flowOn(readDispatcher.value)
     }
 
+    override suspend fun getAllConversationsWithOtherUserName(
+        selfUserId: QualifiedIDEntity
+    ): Flow<List<ConversationWithOtherUserNameEntity>> {
+        return conversationQueries
+            .selectAllConversationsWithOtherUserName(selfUserId, conversationMapper::toConversationWithOtherUserNameEntity)
+            .asFlow()
+            .mapToList()
+            .flowOn(readDispatcher.value)
+    }
+
     override suspend fun getAllConversationDetails(
         fromArchive: Boolean,
         filter: ConversationFilterEntity,
diff --git a/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationMapper.kt b/data/persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/conversation/ConversationMapper.kt
@@ -295,6 +295,93 @@ data object ConversationMapper {
         historySharingRetentionSeconds = history_sharing_retention_seconds
     )
 
+    @Suppress("LongParameterList", "FunctionParameterNaming")
+    fun toConversationWithOtherUserNameEntity(
+        qualified_id: QualifiedIDEntity,
+        name: String?,
+        type: ConversationEntity.Type,
+        team_id: String?,
+        mls_group_id: String?,
+        mls_group_state: ConversationEntity.GroupState,
+        mls_epoch: Long,
+        mls_proposal_timer: String?,
+        protocol: ConversationEntity.Protocol,
+        muted_status: ConversationEntity.MutedStatus,
+        muted_time: Long,
+        creator_id: String,
+        last_modified_date: Instant,
+        last_notified_date: Instant?,
+        last_read_date: Instant,
+        access_list: List<ConversationEntity.Access>,
+        access_role_list: List<ConversationEntity.AccessRole>,
+        mls_last_keying_material_update_date: Instant,
+        mls_cipher_suite: ConversationEntity.CipherSuite,
+        receipt_mode: ConversationEntity.ReceiptMode,
+        guest_room_link: String?,
+        message_timer: Long?,
+        user_message_timer: Long?,
+        incomplete_metadata: Boolean,
+        mls_degraded_notified: Boolean,
+        is_guest_password_protected: Boolean,
+        archived: Boolean,
+        archived_date_time: Instant?,
+        verification_status: ConversationEntity.VerificationStatus,
+        proteus_verification_status: ConversationEntity.VerificationStatus,
+        degraded_conversation_notified: Boolean,
+        legal_hold_status: ConversationEntity.LegalHoldStatus,
+        is_channel: Boolean,
+        channel_access: ConversationEntity.ChannelAccess?,
+        channel_add_permission: ConversationEntity.ChannelAddPermission?,
+        wireCell: String?,
+        deleted_locally: Boolean,
+        history_sharing_retention_seconds: Long,
+        otherUserName: String?,
+        selfIsMember: Boolean,
+    ) = ConversationWithOtherUserNameEntity(
+        conversation = toConversationEntity(
+            qualified_id = qualified_id,
+            name = name,
+            type = type,
+            team_id = team_id,
+            mls_group_id = mls_group_id,
+            mls_group_state = mls_group_state,
+            mls_epoch = mls_epoch,
+            mls_proposal_timer = mls_proposal_timer,
+            protocol = protocol,
+            muted_status = muted_status,
+            muted_time = muted_time,
+            creator_id = creator_id,
+            last_modified_date = last_modified_date,
+            last_notified_date = last_notified_date,
+            last_read_date = last_read_date,
+            access_list = access_list,
+            access_role_list = access_role_list,
+            mls_last_keying_material_update_date = mls_last_keying_material_update_date,
+            mls_cipher_suite = mls_cipher_suite,
+            receipt_mode = receipt_mode,
+            guest_room_link = guest_room_link,
+            message_timer = message_timer,
+            user_message_timer = user_message_timer,
+            incomplete_metadata = incomplete_metadata,
+            mls_degraded_notified = mls_degraded_notified,
+            is_guest_password_protected = is_guest_password_protected,
+            archived = archived,
+            archived_date_time = archived_date_time,
+            verification_status = verification_status,
+            proteus_verification_status = proteus_verification_status,
+            degraded_conversation_notified = degraded_conversation_notified,
+            legal_hold_status = legal_hold_status,
+            is_channel = is_channel,
+            channel_access = channel_access,
+            channel_add_permission = channel_add_permission,
+            wireCell = wireCell,
+            deleted_locally = deleted_locally,
+            history_sharing_retention_seconds = history_sharing_retention_seconds,
+        ),
+        otherUserName = otherUserName,
+        selfIsMember = selfIsMember,
+    )
+
     @Suppress("LongParameterList")
     fun mapProtocolInfo(
         protocol: ConversationEntity.Protocol,
diff --git a/data/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt b/data/persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/ConversationDAOTest.kt
@@ -1145,6 +1145,33 @@ class ConversationDAOTest : BaseDatabaseTest() {
         }
     }
 
+    @Test
+    fun givenOneOnOneConversationWithOtherUserAndSelfMember_whenGettingAllWithOtherUserName_thenReturnsNameAndMembership() = runTest {
+        val conversation = conversationEntity1.copy(name = null)
+        conversationDAO.insertConversation(conversation)
+        userDAO.upsertUser(user1.copy(name = "Other User", activeOneOnOneConversationId = conversation.id))
+        memberDAO.insertMember(MemberEntity(user1.id, MemberEntity.Role.Member), conversation.id)
+        insertSelfMember(conversation.id)
+
+        val result = conversationDAO.getAllConversationsWithOtherUserName(selfUserId).first()
+
+        assertEquals(1, result.size)
+        assertEquals(conversation.id, result.first().conversation.id)
+        assertEquals("Other User", result.first().otherUserName)
+        assertEquals(true, result.first().selfIsMember)
+    }
+
+    @Test
+    fun givenConversationWithoutSelfMember_whenGettingAllWithOtherUserName_thenReturnsFalseMembership() = runTest {
+        conversationDAO.insertConversation(conversationEntity4)
+
+        val result = conversationDAO.getAllConversationsWithOtherUserName(selfUserId).first()
+
+        assertEquals(1, result.size)
+        assertEquals(conversationEntity4.id, result.first().conversation.id)
+        assertEquals(false, result.first().selfIsMember)
+    }
+
     @Test
     fun givenConnectionRequestAndUserWithName_whenSelectingAllConversationDetails_thenShouldReturnConnectionRequest() = runTest {
         val fromArchive = false
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
@@ -115,6 +115,7 @@ internal interface ConversationRepository {
     ): Either<CoreFailure, Unit>
 
     suspend fun getConversationList(): Either<StorageFailure, Flow<List<Conversation>>>
+    suspend fun getConversationListWithOtherUserName(): Either<StorageFailure, Flow<List<ConversationWithOtherUserName>>>
     suspend fun observeConversationList(): Flow<List<Conversation>>
     suspend fun observeConversationListDetails(
         fromArchive: Boolean,
@@ -364,6 +365,12 @@ internal interface ConversationRepository {
     suspend fun getMLSConversationsByDomain(domain: String): Either<CoreFailure, List<Conversation>>
 }
 
+internal data class ConversationWithOtherUserName(
+    val conversation: Conversation,
+    val otherUserName: String?,
+    val selfIsMember: Boolean,
+)
+
 @OptIn(ConversationPersistenceApi::class)
 @Suppress("LongParameterList", "TooManyFunctions", "LargeClass")
 internal class ConversationDataSource internal constructor(
@@ -491,6 +498,19 @@ internal class ConversationDataSource internal constructor(
         observeConversationList()
     }
 
+    override suspend fun getConversationListWithOtherUserName(): Either<StorageFailure, Flow<List<ConversationWithOtherUserName>>> =
+        wrapStorageRequest {
+            conversationDAO.getAllConversationsWithOtherUserName(selfUserId.toDao()).map { conversations ->
+                conversations.map { conversationWithOtherUserName ->
+                    ConversationWithOtherUserName(
+                        conversation = conversationMapper.fromDaoModel(conversationWithOtherUserName.conversation),
+                        otherUserName = conversationWithOtherUserName.otherUserName,
+                        selfIsMember = conversationWithOtherUserName.selfIsMember,
+                    )
+                }
+            }
+        }
+
     override suspend fun observeConversationList(): Flow<List<Conversation>> {
         return conversationDAO.getAllConversations().map { it.map(conversationMapper::fromDaoModel) }
     }
diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/debug/GetConversationCryptoStatsUseCase.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/debug/GetConversationCryptoStatsUseCase.kt
diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/debug/GetConversationCryptoStatsUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/debug/GetConversationCryptoStatsUseCaseTest.kt
