diff --git a/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt b/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt index 293cf4e6fcb..ada93ee009d 100644 --- a/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt +++ b/data/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/Conversation.kt @@ -299,7 +299,6 @@ sealed class ConversationDetails(open val conversation: Conversation) { override val conversation: Conversation, val hasOngoingCall: Boolean = false, val isSelfUserMember: Boolean, - val isSelfUserCreator: Boolean, val selfRole: Conversation.Member.Role? // val isTeamAdmin: Boolean, TODO kubaz ) : ConversationDetails(conversation) diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt index 7a37f8ca9e2..a30db2c41f7 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationMapper.kt @@ -271,7 +271,6 @@ internal class ConversationMapperImpl( conversation = fromConversationViewToEntity(daoModel), hasOngoingCall = callStatus != null, // todo: we can do better! isSelfUserMember = isMember, - isSelfUserCreator = isCreator == 1L, selfRole = selfRole?.let { conversationRoleMapper.fromDAO(it) } ) } diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt index 1b0b223aa64..d3751f62295 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/call/CallRepositoryTest.kt @@ -174,7 +174,6 @@ class CallRepositoryTest { Arrangement.groupConversation, false, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) @@ -212,7 +211,6 @@ class CallRepositoryTest { ConversationDetails.Group( Arrangement.groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) @@ -266,7 +264,6 @@ class CallRepositoryTest { ConversationDetails.Group( Arrangement.groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) @@ -309,7 +306,6 @@ class CallRepositoryTest { ConversationDetails.Group( Arrangement.groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) @@ -366,7 +362,6 @@ class CallRepositoryTest { ConversationDetails.Group( Arrangement.groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt index 6212866cc8e..77cbac0d93a 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/call/usecase/EndCallOnConversationChangeUseCaseTest.kt @@ -249,7 +249,6 @@ class EndCallOnConversationChangeUseCaseTest { conversation = conversation, hasOngoingCall = true, isSelfUserMember = false, - isSelfUserCreator = false, selfRole = null ) diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationDetailsUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationDetailsUseCaseTest.kt index 3bf203d73db..3ff8776be81 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationDetailsUseCaseTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationDetailsUseCaseTest.kt @@ -81,7 +81,6 @@ class ObserveConversationDetailsUseCaseTest { ConversationDetails.Group( conversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ), @@ -89,7 +88,6 @@ class ObserveConversationDetailsUseCaseTest { ConversationDetails.Group( conversation.copy(name = "New Name"), isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsUseCaseTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsUseCaseTest.kt index e2f9044bf6c..a3340b10fef 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsUseCaseTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/conversation/ObserveConversationListDetailsUseCaseTest.kt @@ -65,7 +65,6 @@ class ObserveConversationListDetailsUseCaseTest { ConversationDetails.Group( groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) @@ -100,14 +99,12 @@ class ObserveConversationListDetailsUseCaseTest { ConversationDetails.Group( groupConversation1, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) val groupConversationDetails2 = ConversationDetails.Group( groupConversation2, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) @@ -141,7 +138,6 @@ class ObserveConversationListDetailsUseCaseTest { val groupConversationDetails = ConversationDetails.Group( conversation = groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) @@ -175,7 +171,6 @@ class ObserveConversationListDetailsUseCaseTest { ConversationDetails.Group( groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) ) @@ -223,7 +218,6 @@ class ObserveConversationListDetailsUseCaseTest { val groupConversationDetails = ConversationDetails.Group( groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) @@ -258,7 +252,6 @@ class ObserveConversationListDetailsUseCaseTest { val groupConversationDetails = ConversationDetails.Group( groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) @@ -287,7 +280,6 @@ class ObserveConversationListDetailsUseCaseTest { val groupConversationDetails = ConversationDetails.Group( groupConversation, isSelfUserMember = true, - isSelfUserCreator = true, selfRole = Conversation.Member.Role.Member ) diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestConversationDetails.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestConversationDetails.kt index 1372c6fc446..1dce7148793 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestConversationDetails.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/framework/TestConversationDetails.kt @@ -45,7 +45,6 @@ object TestConversationDetails { val CONVERSATION_GROUP = ConversationDetails.Group( conversation = TestConversation.GROUP(), - isSelfUserCreator = true, isSelfUserMember = true, selfRole = Conversation.Member.Role.Member )