fix: mixed conversation are effectively proteus

wireapp · Oct 11, 2023 · c052105 · c052105
1 parent 8e816a6
commit c052105
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt b/app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationTopAppBar.kt
@@ -188,7 +188,7 @@ private fun VerificationIcon(protocolInfo: Conversation.ProtocolInfo?, verificat
         is Conversation.ProtocolInfo.MLS ->
             R.drawable.ic_certificate_valid_mls to R.string.content_description_mls_certificate_valid
 
-        Conversation.ProtocolInfo.Proteus ->
+        is Conversation.ProtocolInfo.Proteus, is Conversation.ProtocolInfo.Mixed ->
             R.drawable.ic_certificate_valid_proteus to R.string.content_description_proteus_certificate_valid
     }
     Image(

diff --git a/kalium b/kalium
+6 −1		buildSrc/src/main/kotlin/com/wire/kalium/plugins/CommonJvmConfig.kt
+3 −1		buildSrc/src/main/kotlin/com/wire/kalium/plugins/LibraryPlugin.kt
+2 −1		buildSrc/src/main/kotlin/com/wire/kalium/plugins/Multiplatform.kt
+1 −1		gradle/libs.versions.toml
+2 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+2 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/GlobalKaliumScope.kt
+14 −59		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepository.kt
+2 −8		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/team/TeamRepository.kt
+5 −5		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+3 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/appVersioning/ObserveIfAppUpdateRequiredUseCase.kt
+11 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/auth/AuthenticationScope.kt
+4 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/connection/ConnectionScope.kt
+16 −12		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/connection/SendConnectionRequestUseCase.kt
+4 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/featureFlags/KaliumConfigs.kt
+12 −9		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiver.kt
+24 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/util/KaliumMockEngine.kt
+21 −48		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/connection/ConnectionRepositoryTest.kt
+43 −1		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/connection/SendConnectionRequestUseCaseTest.kt
+4 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/UserEventReceiverTest.kt
+9 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/UserRepositoryArrangement.kt
+8 −13		logic/src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/dao/MemberDAOArrangement.kt
+1 −1		logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt
+2 −1		...ain/kotlin/com/wire/kalium/network/api/v0/authenticated/networkContainer/AuthenticatedNetworkContainerV0.kt
+2 −1		...kotlin/com/wire/kalium/network/api/v0/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV0.kt
+2 −1		...ain/kotlin/com/wire/kalium/network/api/v2/authenticated/networkContainer/AuthenticatedNetworkContainerV2.kt
+2 −1		...kotlin/com/wire/kalium/network/api/v2/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV2.kt
+2 −1		...ain/kotlin/com/wire/kalium/network/api/v3/authenticated/networkContainer/AuthenticatedNetworkContainerV3.kt
+6 −5		...kotlin/com/wire/kalium/network/api/v3/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV3.kt
+2 −1		...ain/kotlin/com/wire/kalium/network/api/v4/authenticated/networkContainer/AuthenticatedNetworkContainerV4.kt
+3 −2		...kotlin/com/wire/kalium/network/api/v4/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV4.kt
+2 −1		...ain/kotlin/com/wire/kalium/network/api/v5/authenticated/networkContainer/AuthenticatedNetworkContainerV5.kt
+3 −2		...kotlin/com/wire/kalium/network/api/v5/unauthenticated/networkContainer/UnauthenticatedNetworkContainerV5.kt
+16 −7		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/AuthenticatedNetworkContainer.kt
+9 −2		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnauthenticatedNetworkContainer.kt
+3 −2		network/src/commonMain/kotlin/com/wire/kalium/network/networkContainer/UnboundNetworkContainer.kt
+10 −5		network/src/commonTest/kotlin/com/wire/kalium/api/ApiTest.kt
+1 −1		...istence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/dao/message/MessageExtensionsTest.kt
+2 −0		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAO.kt
+25 −23		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/UserDAOImpl.kt
+2 −6		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/member/MemberDAO.kt
+10 −7		persistence/src/commonMain/kotlin/com/wire/kalium/persistence/dao/newclient/NewClientDAOImpl.kt
+4 −4		persistence/src/commonTest/kotlin/com/wire/kalium/persistence/dao/MemberDAOTest.kt
+42 −0		tango-tests/.gitignore
+60 −0		tango-tests/build.gradle.kts
+142 −0		tango-tests/src/integrationTest/kotlin/PocIntegrationTest.kt
+35 −0		tango-tests/src/integrationTest/kotlin/TestNetworkStateObserver.kt
+74 −0		tango-tests/src/integrationTest/kotlin/action/ACMEActions.kt
+87 −0		tango-tests/src/integrationTest/kotlin/action/ClientActions.kt
+66 −0		tango-tests/src/integrationTest/kotlin/action/CommonResponses.kt
+132 −0		tango-tests/src/integrationTest/kotlin/action/LoginActions.kt
+75 −0		tango-tests/src/integrationTest/kotlin/util/ACMEApiResponseJsonSample.kt
+83 −0		tango-tests/src/integrationTest/kotlin/util/AccessTokenDTOJson.kt
+71 −0		tango-tests/src/integrationTest/kotlin/util/ClientResponseJson.kt
+57 −0		tango-tests/src/integrationTest/kotlin/util/ErrorResponseJson.kt
+71 −0		tango-tests/src/integrationTest/kotlin/util/ListOfClientsResponseJson.kt
+129 −0		tango-tests/src/integrationTest/kotlin/util/ListUsersResponseJson.kt
+79 −0		tango-tests/src/integrationTest/kotlin/util/LoginWithEmailRequestJson.kt
+158 −0		tango-tests/src/integrationTest/kotlin/util/MockUnboundNetworkClient.kt
+296 −0		tango-tests/src/integrationTest/kotlin/util/RegisterClientRequestJson.kt
+43 −0		tango-tests/src/integrationTest/kotlin/util/ServerConfigDTOJson.kt
+97 −0		tango-tests/src/integrationTest/kotlin/util/UserDTOJson.kt
+39 −0		tango-tests/src/integrationTest/kotlin/util/ValidSingleJsonObjectProvider.kt
+49 −0		tango-tests/src/integrationTest/kotlin/util/VersionInfoDTOJson.kt