bitwarden/android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2025-12-11 13:57:03 -06:00
Code Issues Packages Projects Releases 169 Wiki Activity

Move NativeLibraryManager to data module (#5899)

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/SdkClientManagerImpl.kt
View File

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

7
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/di/PlatformManagerModule.kt
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.core.data.manager.toast.ToastManagerImpl
import com.bitwarden.data.manager.DispatcherManager import com.bitwarden.data.manager.DispatcherManager
import com.bitwarden.data.manager.DispatcherManagerImpl import com.bitwarden.data.manager.DispatcherManagerImpl
import com.bitwarden.data.manager.NativeLibraryManager
import com.bitwarden.data.repository.ServerConfigRepository import com.bitwarden.data.repository.ServerConfigRepository
import com.bitwarden.network.BitwardenServiceClient import com.bitwarden.network.BitwardenServiceClient
import com.bitwarden.network.service.EventService 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.FirstTimeActionManagerImpl
import com.x8bit.bitwarden.data.platform.manager.LogsManager import com.x8bit.bitwarden.data.platform.manager.LogsManager
import com.x8bit.bitwarden.data.platform.manager.LogsManagerImpl 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.PolicyManager
import com.x8bit.bitwarden.data.platform.manager.PolicyManagerImpl import com.x8bit.bitwarden.data.platform.manager.PolicyManagerImpl
import com.x8bit.bitwarden.data.platform.manager.PushManager import com.x8bit.bitwarden.data.platform.manager.PushManager
@ -242,10 +241,6 @@ object PlatformManagerModule {
) )
} }
@Provides
@Singleton
fun provideNativeLibraryManager(): NativeLibraryManager = NativeLibraryManagerImpl()
@Provides @Provides
@Singleton @Singleton
fun provideSdkClientManager( fun provideSdkClientManager(

2
app/src/main/kotlin/com/x8bit/bitwarden/data/vault/datasource/sdk/ScopedVaultSdkSourceImpl.kt
View File

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

1
app/src/test/kotlin/com/x8bit/bitwarden/data/platform/manager/SdkClientManagerTest.kt
View File

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

1
data/build.gradle.kts
View File

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

2
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManager.kt → data/src/main/kotlin/com/bitwarden/data/manager/NativeLibraryManager.kt
View File

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

4
app/src/main/kotlin/com/x8bit/bitwarden/data/platform/manager/NativeLibraryManagerImpl.kt → data/src/main/kotlin/com/bitwarden/data/manager/NativeLibraryManagerImpl.kt
View File

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

6
data/src/main/kotlin/com/bitwarden/data/manager/di/DataManagerModule.kt
View File

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