refactor: lazy evaluate for kalium config [WPB-23190]

app/src/androidTest/kotlin/com/wire/android/TestCoreLogicModule.kt

@@ -21,6 +21,7 @@ package com.wire.android
 import android.content.Context
 import androidx.work.WorkManager
 import com.wire.android.di.CoreLogicModule
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.di.NoSession
 import com.wire.android.util.UserAgentProvider
@@ -119,4 +120,8 @@ class TestCoreLogicModule {
     @Provides
     fun provideAudioNormalizedLoudnessBuilder(@KaliumCoreLogic coreLogic: CoreLogic): AudioNormalizedLoudnessBuilder =
         coreLogic.audioNormalizedLoudnessBuilder
+
+    @DefaultWebSocketEnabledByDefault
+    @Provides
+    fun provideDefaultWebSocketEnabledByDefault(): Boolean = true
 }

app/src/main/kotlin/com/wire/android/di/CoreLogicModule.kt

@@ -23,6 +23,7 @@ import androidx.work.WorkManager
 import com.wire.android.datastore.UserDataStoreProvider
 import com.wire.android.util.ImageUtil
 import com.wire.android.util.UserAgentProvider
+import com.wire.android.util.isWebsocketEnabledByDefault
 import com.wire.kalium.logic.CoreLogic
 import com.wire.kalium.logic.data.asset.KaliumFileSystem
 import com.wire.kalium.logic.data.id.FederatedIdMapper
@@ -81,6 +82,10 @@ annotation class CurrentAccount
 @Retention(AnnotationRetention.BINARY)
 annotation class NoSession
 
+@Qualifier
+@Retention(AnnotationRetention.BINARY)
+annotation class DefaultWebSocketEnabledByDefault
+
 @Module
 @InstallIn(SingletonComponent::class)
 class CoreLogicModule {
@@ -144,6 +149,11 @@ class CoreLogicModule {
     @Provides
     fun provideAudioNormalizedLoudnessBuilder(@KaliumCoreLogic coreLogic: CoreLogic): AudioNormalizedLoudnessBuilder =
         coreLogic.audioNormalizedLoudnessBuilder
+
+    @DefaultWebSocketEnabledByDefault
+    @Provides
+    fun provideDefaultWebSocketEnabledByDefault(@ApplicationContext context: Context): Boolean =
+        isWebsocketEnabledByDefault(context)
 }
 
 @Module

app/src/main/kotlin/com/wire/android/di/KaliumConfigsModule.kt

@@ -18,10 +18,8 @@
 
 package com.wire.android.di
 
-import android.content.Context
 import android.os.Build
 import com.wire.android.BuildConfig
-import com.wire.android.util.isWebsocketEnabledByDefault
 import com.wire.kalium.logic.featureFlags.BuildFileRestrictionState
 import com.wire.kalium.logic.featureFlags.KaliumConfigs
 import dagger.Module
@@ -34,20 +32,20 @@ import dagger.hilt.components.SingletonComponent
 class KaliumConfigsModule {
 
     @Provides
-    fun provideKaliumConfigs(context: Context): KaliumConfigs {
-        val fileRestriction: BuildFileRestrictionState = if (BuildConfig.FILE_RESTRICTION_ENABLED) {
-            BuildConfig.FILE_RESTRICTION_LIST.split(",").map { it.trim() }.let {
-                BuildFileRestrictionState.AllowSome(it)
-            }
-        } else {
-            BuildFileRestrictionState.NoRestriction
-        }
-
+    fun provideKaliumConfigs(): KaliumConfigs {
         return KaliumConfigs(
-            fileRestrictionState = fileRestriction,
+            fileRestrictionState = lazy {
+                if (BuildConfig.FILE_RESTRICTION_ENABLED) {
+                    BuildConfig.FILE_RESTRICTION_LIST.split(",").map { it.trim() }.let {
+                        BuildFileRestrictionState.AllowSome(it)
+                    }
+                } else {
+                    BuildFileRestrictionState.NoRestriction
+                }
+            },
             forceConstantBitrateCalls = BuildConfig.FORCE_CONSTANT_BITRATE_CALLS,
             // we use upsert, available from SQL3.24, which is supported from Android API30, so for older APIs we have to use SQLCipher
-            shouldEncryptData = !BuildConfig.DEBUG || Build.VERSION.SDK_INT < Build.VERSION_CODES.R,
+            shouldEncryptData = { !BuildConfig.DEBUG || Build.VERSION.SDK_INT < Build.VERSION_CODES.R },
             lowerKeyPackageLimits = BuildConfig.LOWER_KEYPACKAGE_LIMIT,
             developmentApiEnabled = BuildConfig.DEVELOPMENT_API_ENABLED,
             ignoreSSLCertificatesForUnboundCalls = BuildConfig.IGNORE_SSL_CERTIFICATES,
@@ -57,7 +55,6 @@ class KaliumConfigsModule {
             wipeOnCookieInvalid = BuildConfig.WIPE_ON_COOKIE_INVALID,
             wipeOnDeviceRemoval = BuildConfig.WIPE_ON_DEVICE_REMOVAL,
             wipeOnRootedDevice = BuildConfig.WIPE_ON_ROOTED_DEVICE,
-            isWebSocketEnabledByDefault = isWebsocketEnabledByDefault(context),
             certPinningConfig = BuildConfig.CERTIFICATE_PINNING_CONFIG,
             maxRemoteSearchResultCount = BuildConfig.MAX_REMOTE_SEARCH_RESULT_COUNT,
             limitTeamMembersFetchDuringSlowSync = BuildConfig.LIMIT_TEAM_MEMBERS_FETCH_DURING_SLOW_SYNC,

app/src/main/kotlin/com/wire/android/ui/authentication/create/code/CreateAccountCodeViewModel.kt

@@ -27,6 +27,7 @@
 import androidx.lifecycle.viewModelScope
 import com.wire.android.BuildConfig
 import com.wire.android.di.ClientScopeProvider
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.ui.authentication.create.common.CreateAccountFlowType
 import com.wire.android.ui.authentication.create.common.CreateAccountNavArgs
@@ -58,7 +59,8 @@
     @KaliumCoreLogic private val coreLogic: CoreLogic,
     private val addAuthenticatedUser: AddAuthenticatedUserUseCase,
     private val clientScopeProviderFactory: ClientScopeProvider.Factory,
-    defaultServerConfig: ServerConfig.Links
+    defaultServerConfig: ServerConfig.Links,
+    @DefaultWebSocketEnabledByDefault private val defaultWebSocketEnabledByDefault: Boolean
 ) : ViewModel() {
 
     val createAccountNavArgs: CreateAccountNavArgs = savedStateHandle.navArgs()
@@ -184,6 +186,7 @@
                 ssoId = registerResult.ssoID,
                 serverConfigId = registerResult.serverConfigId,
                 proxyCredentials = registerResult.proxyCredentials,
+                isPersistentWebSocketEnabled = defaultWebSocketEnabledByDefault,
                 replace = false
             ).let {
                 when (it) {

app/src/main/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailViewModel.kt

@@ -29,6 +29,7 @@ import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
 import com.wire.android.datastore.UserDataStoreProvider
 import com.wire.android.di.ClientScopeProvider
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.ui.authentication.login.LoginNavArgs
 import com.wire.android.ui.authentication.login.LoginState
@@ -79,6 +80,7 @@ class LoginEmailViewModel @Inject constructor(
     private val resendCodeTimer: CountdownTimer,
     private val dispatchers: DispatcherProvider,
     defaultServerConfig: ServerConfig.Links,
+    @DefaultWebSocketEnabledByDefault private val defaultWebSocketEnabledByDefault: Boolean,
 ) : LoginViewModel(
     savedStateHandle,
     clientScopeProviderFactory,
@@ -206,6 +208,7 @@ class LoginEmailViewModel @Inject constructor(
                     managedBy = loginResult.managedBy,
                     serverConfigId = loginResult.serverConfigId,
                     proxyCredentials = loginResult.proxyCredentials,
+                    isPersistentWebSocketEnabled = defaultWebSocketEnabledByDefault,
                     replace = false
                 )
             }.let {

app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOViewModel.kt

@@ -29,6 +29,7 @@
 import com.wire.android.config.DefaultServerConfig
 import com.wire.android.datastore.UserDataStoreProvider
 import com.wire.android.di.ClientScopeProvider
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.ui.authentication.login.LoginState
 import com.wire.android.ui.authentication.login.LoginViewModel
@@ -82,15 +83,16 @@
         @KaliumCoreLogic coreLogic: CoreLogic,
         clientScopeProviderFactory: ClientScopeProvider.Factory,
         userDataStoreProvider: UserDataStoreProvider,
-        serverConfig: ServerConfig.Links
+        serverConfig: ServerConfig.Links,
+        @DefaultWebSocketEnabledByDefault defaultWebSocketEnabledByDefault: Boolean,
     ) : this(
         savedStateHandle,
         addAuthenticatedUser,
         validateEmailUseCase,
         coreLogic,
         clientScopeProviderFactory,
         userDataStoreProvider,
-        LoginSSOViewModelExtension(addAuthenticatedUser, coreLogic),
+        LoginSSOViewModelExtension(addAuthenticatedUser, coreLogic, defaultWebSocketEnabledByDefault),
         serverConfig
     )
 

app/src/main/kotlin/com/wire/android/ui/authentication/login/sso/LoginSSOViewModelExtension.kt

@@ -32,6 +32,7 @@
 class LoginSSOViewModelExtension(
     private val addAuthenticatedUser: AddAuthenticatedUserUseCase,
     private val coreLogic: CoreLogic,
+    private val defaultWebSocketEnabledByDefault: Boolean,
 ) {
     suspend fun withAuthenticationScope(
         serverConfig: ServerConfig.Links,
@@ -100,6 +101,7 @@
                             serverConfigId = serverConfigId,
                             proxyCredentials = ssoLoginResult.proxyCredentials,
                             managedBy = ssoLoginResult.managedBy,
+                            isPersistentWebSocketEnabled = defaultWebSocketEnabledByDefault,
                             replace = false
                         ).let { authenticatedUserResult ->
                             when (authenticatedUserResult) {

app/src/main/kotlin/com/wire/android/ui/newauthentication/login/NewLoginViewModel.kt

@@ -29,6 +29,7 @@
 import com.wire.android.appLogger
 import com.wire.android.datastore.UserDataStoreProvider
 import com.wire.android.di.ClientScopeProvider
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.ui.authentication.login.DomainClaimedByOrg
 import com.wire.android.ui.authentication.login.LoginNavArgs
@@ -91,14 +92,15 @@
         dispatchers: DispatcherProvider,
         defaultServerConfig: ServerConfig.Links,
         @Named("ssoCodeConfig") defaultSSOCodeConfig: String,
+        @DefaultWebSocketEnabledByDefault defaultWebSocketEnabledByDefault: Boolean,
     ) : this(
         validateEmailOrSSOCode,
         coreLogic,
         savedStateHandle,
         clientScopeProviderFactory,
         userDataStoreProvider,
         LoginViewModelExtension(clientScopeProviderFactory, userDataStoreProvider),
-        LoginSSOViewModelExtension(addAuthenticatedUser, coreLogic),
+        LoginSSOViewModelExtension(addAuthenticatedUser, coreLogic, defaultWebSocketEnabledByDefault),
         dispatchers,
         defaultServerConfig,
         defaultSSOCodeConfig

app/src/main/kotlin/com/wire/android/ui/registration/code/CreateAccountVerificationCodeViewModel.kt

@@ -28,6 +28,7 @@
 import com.wire.android.BuildConfig
 import com.wire.android.analytics.RegistrationAnalyticsManagerUseCase
 import com.wire.android.di.ClientScopeProvider
+import com.wire.android.di.DefaultWebSocketEnabledByDefault
 import com.wire.android.di.KaliumCoreLogic
 import com.wire.android.feature.analytics.model.AnalyticsEvent
 import com.wire.android.ui.authentication.create.common.CreateAccountDataNavArgs
@@ -56,7 +57,8 @@
     private val addAuthenticatedUser: AddAuthenticatedUserUseCase,
     private val registrationAnalyticsManager: RegistrationAnalyticsManagerUseCase,
     private val clientScopeProviderFactory: ClientScopeProvider.Factory,
-    defaultServerConfig: ServerConfig.Links
+    defaultServerConfig: ServerConfig.Links,
+    @DefaultWebSocketEnabledByDefault private val defaultWebSocketEnabledByDefault: Boolean,
 ) : ViewModel() {
 
     val createAccountNavArgs: CreateAccountDataNavArgs = savedStateHandle.navArgs()
@@ -164,6 +166,7 @@
                 ssoId = registerResult.ssoID,
                 serverConfigId = registerResult.serverConfigId,
                 proxyCredentials = registerResult.proxyCredentials,
+                isPersistentWebSocketEnabled = defaultWebSocketEnabledByDefault,
                 replace = false
             ).let {
                 when (it) {

app/src/test/kotlin/com/wire/android/ui/authentication/login/email/LoginEmailViewModelTest.kt

@@ -453,7 +453,7 @@ class LoginEmailViewModelTest {
         loginViewModel.userIdentifierTextState.setTextAndPlaceCursorAtEnd(email)
         loginViewModel.secondFactorVerificationCodeTextState.setTextAndPlaceCursorAtEnd(code)
         advanceUntilIdle()
-        coVerify(exactly = 0) { arrangement.addAuthenticatedUserUseCase(any(), any(), any(), any()) }
+        coVerify(exactly = 0) { arrangement.addAuthenticatedUserUseCase(any(), any(), any(), any(), any()) }
         coVerify(exactly = 0) { arrangement.getOrRegisterClientUseCase(any()) }
         assertEquals(LoginState.Error.DialogError.Request2FAWithHandle, loginViewModel.loginState.flowState)
     }
@@ -689,7 +689,7 @@ class LoginEmailViewModelTest {
         }
         coVerify(exactly = 1) { // verify that the second login job has been started
             arrangement.loginUseCase(any(), any(), any(), any(), any())
-            arrangement.addAuthenticatedUserUseCase(any(), any(), eq(authToken2), any(), any())
+            arrangement.addAuthenticatedUserUseCase(any(), any(), eq(authToken2), any(), any(), any(), any())
         }
     }
 
@@ -880,7 +880,8 @@ class LoginEmailViewModelTest {
             coreLogic,
             countdownTimer,
             dispatcherProvider,
-            ServerConfig.STAGING
+            ServerConfig.STAGING,
+            false,
         ).also { it.autoLoginWhenFullCodeEntered = true }
 
         fun withLoginReturning(result: AuthenticationResult) = apply {
@@ -891,7 +892,7 @@ class LoginEmailViewModelTest {
 
         fun withAddAuthenticatedUserReturning(result: AddAuthenticatedUserUseCase.Result) = apply {
             coEvery {
-                addAuthenticatedUserUseCase(any(), any(), any(), any(), any())
+                addAuthenticatedUserUseCase(any(), any(), any(), any(), any(), any(), any())
             } returns result
         }