Merge branch 'develop' into dependabot/gradle/mockk-1.13.13

wireapp · Dec 17, 2024 · 0b30d3b · 0b30d3b
2 parents ac5fead + 21ee4fc
commit 0b30d3b
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml
@@ -114,7 +114,7 @@ jobs:
           build-flavour: prod
           build-variant: compatrelease
       - name: Attach APK and version file to release
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.0
         with:
           files: |
             app/build/outputs/apk/prodCompatrelease/*.apk

diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml
@@ -48,7 +48,7 @@ jobs:
           npx [email protected] -t "$PREVIOUS_TAG...$CURRENT_TAG"
 
       - name: 'Attach changelog to tag'
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.0
         env:
           GITHUB_TOKEN: ${{ secrets.ANDROID_BOB_GH_TOKEN }}
         with:

diff --git a/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/debug/DebugDataOptionsViewModel.kt
@@ -304,6 +304,9 @@ class DebugDataOptionsViewModelImpl
                     }
 
                     is MLSKeyPackageCountResult.Failure.Generic -> {}
+                    MLSKeyPackageCountResult.Failure.NotEnabled -> {
+                        state = state.copy(mlsErrorMessage = "Not Enabled!")
+                    }
                 }
             }
         }

diff --git a/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModel.kt
@@ -73,7 +73,7 @@ class DeviceDetailsViewModel @Inject constructor(
     private val fingerprintUseCase: ClientFingerprintUseCase,
     private val updateClientVerificationStatus: UpdateClientVerificationStatusUseCase,
     private val observeUserInfo: ObserveUserInfoUseCase,
-    private val e2eiCertificate: GetMLSClientIdentityUseCase,
+    private val mlsClientIdentity: GetMLSClientIdentityUseCase,
     private val breakSession: BreakSessionUseCase,
     isE2EIEnabledUseCase: IsE2EIEnabledUseCase
 ) : SavedStateViewModel(savedStateHandle) {
@@ -134,7 +134,7 @@ class DeviceDetailsViewModel @Inject constructor(
 
     private fun getE2eiCertificate() {
         viewModelScope.launch {
-            state = e2eiCertificate(deviceId).fold({
+            state = mlsClientIdentity(deviceId).fold({
                 state.copy(isE2eiCertificateActivated = false, isLoadingCertificate = false)
             }, { mlsClientIdentity ->
                 state.copy(

diff --git a/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt b/app/src/test/kotlin/com/wire/android/ui/settings/devices/DeviceDetailsViewModelTest.kt
@@ -377,7 +377,7 @@ class DeviceDetailsViewModelTest {
                 updateClientVerificationStatus = updateClientVerificationStatus,
                 currentUserId = currentUserId,
                 observeUserInfo = observeUserInfo,
-                e2eiCertificate = getE2eiCertificate,
+                mlsClientIdentity = getE2eiCertificate,
                 isE2EIEnabledUseCase = isE2EIEnabledUseCase,
                 breakSession = breakSession
             )

diff --git a/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt b/...bled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt
@@ -86,7 +86,7 @@ class AnonymousAnalyticsRecorderImpl : AnonymousAnalyticsRecorder {
 
     override fun halt() = wrapCountlyRequest {
         isConfigured = false
-        Countly.sharedInstance().consent().removeConsentAll()
+        Countly.sharedInstance()?.consent()?.removeConsentAll()
     }
 
     override suspend fun setTrackingIdentifierWithMerge(

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -67,7 +67,7 @@ coil = "2.7.0"
 commonmark = "0.24.0"
 
 # Countly
-countly = "24.4.0"
+countly = "24.7.7"
 
 # RSS
 rss-parser = "6.0.7"

diff --git a/kalium b/kalium
-Original file line number
+Diff line change
@@ Expand Up / @@ -304,6 +304,9 @@ class DebugDataOptionsViewModelImpl @@
                         }
                         is MLSKeyPackageCountResult.Failure.Generic -> {}
+                        MLSKeyPackageCountResult.Failure.NotEnabled -> {
+                            state = state.copy(mlsErrorMessage = "Not Enabled!")
+                        }
                     }
                 }
             }
@@ Expand Down @@
+1 −1		.github/workflows/label-pr.yml
+2 −1		data/src/commonMain/kotlin/com/wire/kalium/logic/data/message/MessageContent.kt
+2 −2		gradle/libs.versions.toml
+1 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreFailure.kt
+5 −0		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/client/MLSClientProvider.kt
+35 −25		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepository.kt
+52 −45		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt
+4 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/data/message/ProtoContentMapper.kt
+2 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+4 −2		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/ClientScope.kt
+4 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/IsAllowedToRegisterMLSClientUseCase.kt
+2 −1		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/ClearConversationContentUseCase.kt
+13 −4		logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/keypackage/MLSKeyPackageCountUseCase.kt
+1 −0		.../src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/conversation/message/MLSMessageFailureHandler.kt
+10 −3		logic/src/commonMain/kotlin/com/wire/kalium/logic/sync/receiver/handler/ClearConversationContentHandler.kt
+44 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/client/MLSClientProviderTest.kt
+41 −0		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/ConversationRepositoryTest.kt
+9 −8		logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt
+41 −9		logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/keypackage/MLSKeyPackageCountUseCaseTest.kt
+212 −0		...c/commonTest/kotlin/com/wire/kalium/logic/sync/receiver/conversation/ClearConversationContentHandlerTest.kt
+7 −0		.../src/commonTest/kotlin/com/wire/kalium/logic/util/arrangement/repository/UserConfigRepositoryArrangement.kt
+1 −1		...-model/src/commonMain/kotlin/com/wire/kalium/network/api/authenticated/conversation/ConversationResponse.kt
+23 −2		network/src/commonTest/kotlin/com/wire/kalium/api/v0/user/client/ClientApiV0Test.kt
+1 −0		protobuf-codegen/src/main/proto/messages.proto