diff --git a/.github/workflows/build-prod-app.yml b/.github/workflows/build-prod-app.yml index b42866dfe69..f682e36fc1f 100644 --- 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 index a239d508807..05955c37a68 100644 --- a/.github/workflows/generate-changelog.yml +++ b/.github/workflows/generate-changelog.yml @@ -48,7 +48,7 @@ jobs: npx generate-changelog@1.8.0 -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 index e98c20eb903..27fdf191eb9 100644 --- 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 index 826154cc6b6..1ca4096174f 100644 --- 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 index 6b69dabbd6e..5e0ea113b3a 100644 --- 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/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt b/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt index 71fe3723667..6baadc5b295 100644 --- a/core/analytics-enabled/src/main/kotlin/com/wire/android/feature/analytics/AnonymousAnalyticsRecorderImpl.kt +++ b/core/analytics-enabled/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 index 09d6d7a9bd6..8e874ab82ac 100644 --- 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 index 0667f9b780a..9926d3dc47c 160000 --- a/kalium +++ b/kalium @@ -1 +1 @@ -Subproject commit 0667f9b780a8262768b0c37af3d49d4f83c55701 +Subproject commit 9926d3dc47c1a238dfd9c292095fbb4ededf81ba