Move NativeLibraryManager to data module (#5899)

This commit is contained in:
Patrick Honkonen 2025-09-17 15:21:37 -04:00 committed by GitHub
parent 7d3ed2af88
commit a39f83349f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 14 additions and 10 deletions

View File

@ -2,6 +2,7 @@ package com.x8bit.bitwarden.data.platform.manager
import android.os.Build
import com.bitwarden.core.util.isBuildVersionAtLeast
import com.bitwarden.data.manager.NativeLibraryManager
import com.bitwarden.sdk.Client
import com.x8bit.bitwarden.data.platform.manager.sdk.SdkRepositoryFactory

View File

@ -9,6 +9,7 @@ import com.bitwarden.core.data.manager.toast.ToastManager
import com.bitwarden.core.data.manager.toast.ToastManagerImpl
import com.bitwarden.data.manager.DispatcherManager
import com.bitwarden.data.manager.DispatcherManagerImpl
import com.bitwarden.data.manager.NativeLibraryManager
import com.bitwarden.data.repository.ServerConfigRepository
import com.bitwarden.network.BitwardenServiceClient
import com.bitwarden.network.service.EventService
@ -41,8 +42,6 @@ import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManager
import com.x8bit.bitwarden.data.platform.manager.FirstTimeActionManagerImpl
import com.x8bit.bitwarden.data.platform.manager.LogsManager
import com.x8bit.bitwarden.data.platform.manager.LogsManagerImpl
import com.x8bit.bitwarden.data.platform.manager.NativeLibraryManager
import com.x8bit.bitwarden.data.platform.manager.NativeLibraryManagerImpl
import com.x8bit.bitwarden.data.platform.manager.PolicyManager
import com.x8bit.bitwarden.data.platform.manager.PolicyManagerImpl
import com.x8bit.bitwarden.data.platform.manager.PushManager
@ -242,10 +241,6 @@ object PlatformManagerModule {
)
}
@Provides
@Singleton
fun provideNativeLibraryManager(): NativeLibraryManager = NativeLibraryManagerImpl()
@Provides
@Singleton
fun provideSdkClientManager(

View File

@ -3,8 +3,8 @@ package com.x8bit.bitwarden.data.vault.datasource.sdk
import com.bitwarden.annotation.OmitFromCoverage
import com.bitwarden.core.data.util.asSuccess
import com.bitwarden.data.manager.DispatcherManager
import com.bitwarden.data.manager.NativeLibraryManager
import com.x8bit.bitwarden.data.platform.manager.FeatureFlagManager
import com.x8bit.bitwarden.data.platform.manager.NativeLibraryManager
import com.x8bit.bitwarden.data.platform.manager.SdkClientManagerImpl
import com.x8bit.bitwarden.data.platform.manager.sdk.SdkRepositoryFactory

View File

@ -1,6 +1,7 @@
package com.x8bit.bitwarden.data.platform.manager
import com.bitwarden.core.util.isBuildVersionAtLeast
import com.bitwarden.data.manager.NativeLibraryManager
import com.x8bit.bitwarden.data.platform.manager.sdk.SdkRepositoryFactory
import io.mockk.every
import io.mockk.mockk

View File

@ -54,6 +54,7 @@ dependencies {
implementation(libs.google.hilt.android)
ksp(libs.google.hilt.compiler)
implementation(libs.kotlinx.serialization)
implementation(libs.timber)
testImplementation(platform(libs.junit.bom))
testRuntimeOnly(libs.junit.platform.launcher)

View File

@ -1,4 +1,4 @@
package com.x8bit.bitwarden.data.platform.manager
package com.bitwarden.data.manager
/**
* Manager for loading native libraries.

View File

@ -1,4 +1,4 @@
package com.x8bit.bitwarden.data.platform.manager
package com.bitwarden.data.manager
import com.bitwarden.annotation.OmitFromCoverage
import timber.log.Timber
@ -7,7 +7,7 @@ import timber.log.Timber
* Primary implementation of [NativeLibraryManager].
*/
@OmitFromCoverage
class NativeLibraryManagerImpl : NativeLibraryManager {
internal class NativeLibraryManagerImpl : NativeLibraryManager {
override fun loadLibrary(libraryName: String): Result<Unit> {
return try {
System.loadLibrary(libraryName)

View File

@ -3,6 +3,8 @@ package com.bitwarden.data.manager.di
import android.content.Context
import com.bitwarden.data.manager.BitwardenPackageManager
import com.bitwarden.data.manager.BitwardenPackageManagerImpl
import com.bitwarden.data.manager.NativeLibraryManager
import com.bitwarden.data.manager.NativeLibraryManagerImpl
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
@ -22,4 +24,8 @@ object DataManagerModule {
fun provideBitwardenPackageManager(
@ApplicationContext context: Context,
): BitwardenPackageManager = BitwardenPackageManagerImpl(context = context)
@Provides
@Singleton
fun provideNativeLibraryManager(): NativeLibraryManager = NativeLibraryManagerImpl()
}