From 1d75080ab221e5c57a0824b742320e49ca03cfa7 Mon Sep 17 00:00:00 2001 From: yamilmedina Date: Fri, 10 May 2024 11:53:35 +0200 Subject: [PATCH] chore: align more pr comments --- .../kotlin/com/wire/kalium/logic/CoreLogic.kt | 12 ++++++------ .../kotlin/com/wire/kalium/logic/CoreLogic.kt | 4 ++-- .../kotlin/com/wire/kalium/logic/CoreLogic.kt | 6 +++--- .../kotlin/com/wire/kalium/logic/CoreLogic.kt | 4 ++-- .../com/wire/kalium/persistence/GlobalDBBaseTest.kt | 3 +-- .../com/wire/kalium/persistence/GlobalDBBaseTest.kt | 2 +- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt b/logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt index 65c15048cb1..93085bfaaaf 100644 --- a/logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt +++ b/logic/src/androidMain/kotlin/com/wire/kalium/logic/CoreLogic.kt @@ -54,11 +54,11 @@ actual class CoreLogic( kaliumConfigs.shouldEncryptData ) - override val globalDatabase: GlobalDatabaseBuilder = globalDatabaseProvider( - PlatformDatabaseData(appContext), - KaliumDispatcherImpl.io, - if (kaliumConfigs.shouldEncryptData) SecurityHelperImpl(globalPreferences.passphraseStorage).globalDBSecret() else null, - true + override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider( + platformDatabaseData = PlatformDatabaseData(appContext), + queriesContext = KaliumDispatcherImpl.io, + passphrase = if (kaliumConfigs.shouldEncryptData) SecurityHelperImpl(globalPreferences.passphraseStorage).globalDBSecret() else null, + enableWAL = true ) override fun getSessionScope(userId: UserId): UserSessionScope = @@ -87,7 +87,7 @@ actual class CoreLogic( rootPathsProvider, appContext, getGlobalScope(), - globalDatabase, + globalDatabaseBuilder, kaliumConfigs, globalPreferences, globalCallManager, diff --git a/logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt b/logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt index e34cc1b32b6..db8bd573086 100644 --- a/logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt +++ b/logic/src/appleMain/kotlin/com/wire/kalium/logic/CoreLogic.kt @@ -50,7 +50,7 @@ actual class CoreLogic( shouldEncryptData = kaliumConfigs.shouldEncryptData ) - override val globalDatabase: GlobalDatabaseBuilder = globalDatabaseProvider( + override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider( platformDatabaseData = PlatformDatabaseData( storageData = if (useInMemoryStorage) { StorageData.InMemory @@ -71,7 +71,7 @@ actual class CoreLogic( kaliumConfigs, globalPreferences, globalCallManager, - globalDatabase, + globalDatabaseBuilder, userStorageProvider, networkStateObserver, logoutCallbackManager, diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt index 4783410675c..7475c2aeb5e 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/CoreLogic.kt @@ -50,7 +50,7 @@ abstract class CoreLogicCommon internal constructor( protected val idMapper: IdMapper = MapperProvider.idMapper() ) { protected abstract val globalPreferences: GlobalPrefProvider - protected abstract val globalDatabase: GlobalDatabaseBuilder + protected abstract val globalDatabaseBuilder: GlobalDatabaseBuilder protected abstract val userSessionScopeProvider: Lazy protected val userStorageProvider: UserStorageProvider = PlatformUserStorageProvider() @@ -61,7 +61,7 @@ abstract class CoreLogicCommon internal constructor( private val globalKaliumScope by lazy { GlobalKaliumScope( userAgent, - globalDatabase, + globalDatabaseBuilder, globalPreferences, kaliumConfigs, userSessionScopeProvider, @@ -81,7 +81,7 @@ abstract class CoreLogicCommon internal constructor( serverConfig, proxyCredentials, networkStateObserver, - globalDatabase, + globalDatabaseBuilder, kaliumConfigs ) diff --git a/logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt b/logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt index 27dea2f4784..027260fcc3d 100644 --- a/logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt +++ b/logic/src/jvmMain/kotlin/com/wire/kalium/logic/CoreLogic.kt @@ -56,7 +56,7 @@ actual class CoreLogic( shouldEncryptData = kaliumConfigs.shouldEncryptData ) - override val globalDatabase: GlobalDatabaseBuilder = globalDatabaseProvider( + override val globalDatabaseBuilder: GlobalDatabaseBuilder = globalDatabaseProvider( platformDatabaseData = PlatformDatabaseData( storageData = if (useInMemoryStorage) { StorageData.InMemory @@ -87,7 +87,7 @@ actual class CoreLogic( kaliumConfigs, globalPreferences, globalCallManager, - globalDatabase, + globalDatabaseBuilder, userStorageProvider, networkStateObserver, logoutCallbackManager, diff --git a/persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt b/persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt index da458dca2d7..cfbb214b97b 100644 --- a/persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt +++ b/persistence/src/androidInstrumentedTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt @@ -38,7 +38,6 @@ actual abstract class GlobalDBBaseTest { platformDatabaseData = PlatformDatabaseData(ApplicationProvider.getApplicationContext()), queriesContext = KaliumDispatcherImpl.unconfined, passphrase = GlobalDatabaseSecret("test_db_secret".toByteArray()), - enableWAL = true, - encryptionEnabled = false, + enableWAL = true ) } diff --git a/persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt b/persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt index ef04105f953..48d3e69d0d2 100644 --- a/persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt +++ b/persistence/src/appleTest/kotlin/com/wire/kalium/persistence/GlobalDBBaseTest.kt @@ -39,7 +39,7 @@ actual abstract class GlobalDBBaseTest { actual fun createDatabase(): GlobalDatabaseBuilder { return globalDatabaseProvider( - PlatformDatabaseData(StorageData.FileBacked(storePath)), StandardTestDispatcher(), null, false, false + PlatformDatabaseData(StorageData.FileBacked(storePath)), StandardTestDispatcher(), null, false ) } }