Skip to content

fix: move mls jobs to start from te UI [WPB-17367] #4003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MohamadJaara merged 11 commits into from
Apr 25, 2025
Merged

fix: move mls jobs to start from te UI [WPB-17367] #4003

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
5183a23
chore: remove debug option to lower the the threshold for updating co…
MohamadJaara Apr 24, 2025
1f41afb
tests
MohamadJaara Apr 24, 2025
4cbf77d
fix: move MLS jobs to start from the UI
MohamadJaara Apr 24, 2025
b5f54c2
add hilt providers
MohamadJaara Apr 24, 2025
8330f78
tests
MohamadJaara Apr 25, 2025
7938858
tests
MohamadJaara Apr 25, 2025
87d89ca
Merge remote-tracking branch 'origin/develop' into fix/more-MLS-jobs-…
MohamadJaara Apr 25, 2025
91038e0
detekt
MohamadJaara Apr 25, 2025
bdc9326
test
MohamadJaara Apr 25, 2025
5c05215
chore update kalium
MohamadJaara Apr 25, 2025
a07820d
detekt
MohamadJaara Apr 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,15 @@ import com.wire.kalium.logic.feature.analytics.GetCurrentAnalyticsTrackingIdenti
import com.wire.kalium.logic.feature.auth.AddAuthenticatedUserUseCase
import com.wire.kalium.logic.feature.auth.LogoutUseCase
import com.wire.kalium.logic.feature.auth.sso.ValidateSSOCodeUseCase
import com.wire.kalium.logic.feature.client.MLSClientManager
import com.wire.kalium.logic.feature.connection.BlockUserUseCase
import com.wire.kalium.logic.feature.connection.UnblockUserUseCase
import com.wire.kalium.logic.feature.conversation.ObserveOtherUserSecurityClassificationLabelUseCase
import com.wire.kalium.logic.feature.conversation.ObserveSecurityClassificationLabelUseCase
import com.wire.kalium.logic.feature.conversation.keyingmaterials.KeyingMaterialsManager
import com.wire.kalium.logic.feature.e2ei.usecase.FetchConversationMLSVerificationStatusUseCase
import com.wire.kalium.logic.feature.featureConfig.ObserveIsAppLockEditableUseCase
import com.wire.kalium.logic.feature.mlsmigration.MLSMigrationManager
import com.wire.kalium.logic.feature.selfDeletingMessages.ObserveSelfDeletionTimerSettingsForConversationUseCase
import com.wire.kalium.logic.feature.selfDeletingMessages.ObserveTeamSettingsSelfDeletingStatusUseCase
import com.wire.kalium.logic.feature.selfDeletingMessages.PersistNewSelfDeletionTimerUseCase
Expand Down Expand Up @@ -202,6 +205,30 @@ class UseCaseModule {
fun provideValidateSSOCodeUseCase(@KaliumCoreLogic coreLogic: CoreLogic): ValidateSSOCodeUseCase =
coreLogic.getGlobalScope().validateSSOCodeUseCase

@ViewModelScoped
@Provides
fun provideMLSMigrationManager(
@KaliumCoreLogic coreLogic: CoreLogic,
@CurrentAccount currentAccount: UserId
): MLSMigrationManager =
coreLogic.getSessionScope(currentAccount).mlsMigrationManager

@ViewModelScoped
@Provides
fun provideMLSClientManager(
@KaliumCoreLogic coreLogic: CoreLogic,
@CurrentAccount currentAccount: UserId
): MLSClientManager =
coreLogic.getSessionScope(currentAccount).mlsClientManager

@ViewModelScoped
@Provides
fun provideKeyingMaterialsManager(
@KaliumCoreLogic coreLogic: CoreLogic,
@CurrentAccount currentAccount: UserId
): KeyingMaterialsManager =
coreLogic.getSessionScope(currentAccount).keyingMaterialsManager

@ViewModelScoped
@Provides
fun provideValidatePasswordUseCase(@KaliumCoreLogic coreLogic: CoreLogic) =
Expand Down
13 changes: 11 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/home/AppSyncViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,12 @@ package com.wire.android.ui.home
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.wire.android.appLogger
import com.wire.kalium.logic.feature.client.MLSClientManager
import com.wire.kalium.logic.feature.conversation.keyingmaterials.KeyingMaterialsManager
import com.wire.kalium.logic.feature.e2ei.SyncCertificateRevocationListUseCase
import com.wire.kalium.logic.feature.e2ei.usecase.ObserveCertificateRevocationForSelfClientUseCase
import com.wire.kalium.logic.feature.featureConfig.FeatureFlagsSyncWorker
import com.wire.kalium.logic.feature.mlsmigration.MLSMigrationManager
import com.wire.kalium.logic.feature.server.UpdateApiVersionsUseCase
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Job
Expand All @@ -39,8 +42,11 @@ class AppSyncViewModel @Inject constructor(
private val syncCertificateRevocationListUseCase: SyncCertificateRevocationListUseCase,
private val observeCertificateRevocationForSelfClient: ObserveCertificateRevocationForSelfClientUseCase,
private val featureFlagsSyncWorker: FeatureFlagsSyncWorker,
private val updateApiVersions: UpdateApiVersionsUseCase
) : ViewModel() {
private val updateApiVersions: UpdateApiVersionsUseCase,
private val mLSMigrationManager: MLSMigrationManager,
private val keyingMaterialsManager: KeyingMaterialsManager,
private val mLSClientManager: MLSClientManager,
) : ViewModel() {

private val minIntervalBetweenPulls: Duration = MIN_INTERVAL_BETWEEN_PULLS

Expand Down Expand Up @@ -77,6 +83,9 @@ class AppSyncViewModel @Inject constructor(
viewModelScope.launch { featureFlagsSyncWorker.execute() },
viewModelScope.launch { observeCertificateRevocationForSelfClient.invoke() },
viewModelScope.launch { updateApiVersions() },
viewModelScope.launch { mLSClientManager() },
viewModelScope.launch { mLSMigrationManager() },
viewModelScope.launch { keyingMaterialsManager() },
).joinAll()
} catch (e: Exception) {
appLogger.e("Error while syncing app config", e)
Expand Down
2 changes: 1 addition & 1 deletion kalium
Open in desktop
Submodule kalium updated 7 files
+13 −13 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/UserSessionScope.kt
+18 −35 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/client/MLSClientManager.kt
+17 −34 .../src/commonMain/kotlin/com/wire/kalium/logic/feature/conversation/keyingmaterials/KeyingMaterialsManager.kt
+15 −29 logic/src/commonMain/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrationManager.kt
+56 −29 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/client/MLSClientManagerTest.kt
+63 −37 ...commonTest/kotlin/com/wire/kalium/logic/feature/conversation/keyingmaterials/KeyingMaterialsManagerTests.kt
+58 −25 logic/src/commonTest/kotlin/com/wire/kalium/logic/feature/mlsmigration/MLSMigrationManagerTest.kt
Loading