nullptr/Wallenc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Наведён порядок в DI

Browse Source
This commit is contained in:
Роман Пытков
2026-05-18 18:29:32 +03:00
parent 03709d910b
commit fd6f2e5879
26 changed files with 283 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/app/DispatchersModule.kt
View File

@@ -11,12 +11,10 @@ import javax.inject.Singleton
@Qualifier @Qualifier
@Retention(AnnotationRetention.BINARY) @Retention(AnnotationRetention.BINARY)
@Singleton
annotation class MainDispatcher annotation class MainDispatcher
@Qualifier @Qualifier
@Retention(AnnotationRetention.BINARY) @Retention(AnnotationRetention.BINARY)
@Singleton
annotation class IoDispatcher annotation class IoDispatcher
@Module @Module

2
app/src/main/java/com/github/nullptroma/wallenc/app/di/LocaleModule.kt → app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/app/LocaleModule.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.app.di package com.github.nullptroma.wallenc.app.di.modules.app
import com.github.nullptroma.wallenc.app.locale.AppLocaleControllerImpl import com.github.nullptroma.wallenc.app.locale.AppLocaleControllerImpl
import com.github.nullptroma.wallenc.ui.locale.AppLocaleController import com.github.nullptroma.wallenc.ui.locale.AppLocaleController

6
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/app/SingletonModule.kt → app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/app/LoggerModule.kt
View File

@@ -10,10 +10,8 @@ import javax.inject.Singleton
@Module @Module
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
class SingletonModule { object LoggerModule {
@Provides @Provides
@Singleton @Singleton
fun provideLogger(): ILogger { fun provideLogger(): ILogger = Logger()
return Logger()
}
} }

2
app/src/main/java/com/github/nullptroma/wallenc/app/di/UiStringModule.kt → app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/app/UiStringModule.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.app.di package com.github.nullptroma.wallenc.app.di.modules.app
import android.content.Context import android.content.Context
import com.github.nullptroma.wallenc.ui.resources.UiStringResolver import com.github.nullptroma.wallenc.ui.resources.UiStringResolver

51
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/NetworkModule.kt Normal file
View File

@@ -0,0 +1,51 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import com.github.nullptroma.wallenc.app.di.modules.app.IoDispatcher
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskApiFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepositoryFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoApi
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoApiFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.repository.YandexUserInfoRepository
import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.CoroutineDispatcher
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object NetworkModule {
@Provides
@Singleton
fun provideYandexUserInfoApi(): YandexUserInfoApi = YandexUserInfoApiFactory.create()
@Provides
@Singleton
fun provideYandexDiskApiFactory(
yandexAccountStore: YandexAccountStore,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexDiskApiFactory = YandexDiskApiFactory(
accountRepository = yandexAccountStore,
ioDispatcher = ioDispatcher,
)
@Provides
@Singleton
fun provideYandexDiskRepositoryFactory(
apiFactory: YandexDiskApiFactory,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexDiskRepositoryFactory = YandexDiskRepositoryFactory(
apiFactory = apiFactory,
ioDispatcher = ioDispatcher,
)
@Provides
@Singleton
fun provideYandexUserInfoRepository(
api: YandexUserInfoApi,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexUserInfoRepository = YandexUserInfoRepository(api, ioDispatcher)
}

55
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/PersistenceModule.kt Normal file
View File

@@ -0,0 +1,55 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import com.github.nullptroma.wallenc.app.di.modules.app.IoDispatcher
import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageKeyMapDao
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageSyncGroupDao
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.YandexAccountDao
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.StorageKeyMapRepository
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.StorageSyncGroupRepository
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.YandexAccountRepository
import com.github.nullptroma.wallenc.domain.vault.ports.StorageKeyMapStore
import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.CoroutineDispatcher
import javax.inject.Singleton
/**
* Room DAO/repository types live in `:infrastructure-android` under `domain.vault` packages.
*/
@Module
@InstallIn(SingletonComponent::class)
object PersistenceModule {
@Provides
@Singleton
fun provideStorageKeyMapRepository(
dao: StorageKeyMapDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): StorageKeyMapRepository = StorageKeyMapRepository(dao, ioDispatcher)
@Provides
@Singleton
fun provideStorageKeyMapStore(impl: StorageKeyMapRepository): StorageKeyMapStore = impl
@Provides
@Singleton
fun provideStorageSyncGroupStore(
dao: StorageSyncGroupDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): IStorageSyncGroupStore = StorageSyncGroupRepository(dao, ioDispatcher)
@Provides
@Singleton
fun provideYandexAccountRepository(
dao: YandexAccountDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexAccountRepository = YandexAccountRepository(dao, ioDispatcher)
@Provides
@Singleton
fun provideYandexAccountStore(impl: YandexAccountRepository): YandexAccountStore = impl
}

12
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/RoomModule.kt
View File

@@ -11,14 +11,16 @@ import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton import javax.inject.Singleton
/** Room types are implemented in `:infrastructure-android` with `domain.vault` packages. */
@Module @Module
@InstallIn(dagger.hilt.components.SingletonComponent::class) @InstallIn(SingletonComponent::class)
class RoomModule { object RoomModule {
@Provides @Provides
@Singleton @Singleton
fun provideRoomFactory(@ApplicationContext appContext: Context) : RoomFactory { fun provideRoomFactory(@ApplicationContext appContext: Context): RoomFactory {
return RoomFactory(appContext) return RoomFactory(appContext)
} }
@@ -48,9 +50,7 @@ class RoomModule {
@Provides @Provides
@Singleton @Singleton
fun provideAppDb( fun provideAppDb(factory: RoomFactory): IAppDb {
factory: RoomFactory
): IAppDb {
return factory.buildAppDb() return factory.buildAppDb()
} }
} }

169
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/SingletonModule.kt
View File

@@ -1,169 +0,0 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import android.content.Context
import com.github.nullptroma.wallenc.app.di.modules.app.IoDispatcher
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageKeyMapDao
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageMetaInfoDao
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageSyncGroupDao
import com.github.nullptroma.wallenc.domain.vault.db.app.dao.YandexAccountDao
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.StorageKeyMapRepository
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.StorageMetaInfoRepository
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.StorageSyncGroupRepository
import com.github.nullptroma.wallenc.domain.vault.db.app.repository.YandexAccountRepository
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskApiFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepositoryFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoApi
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoApiFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.repository.YandexUserInfoRepository
import com.github.nullptroma.wallenc.domain.vault.ports.StorageKeyMapStore
import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore
import com.github.nullptroma.wallenc.task.runtime.TaskOrchestrator
import com.github.nullptroma.wallenc.domain.vault.vaults.VaultsManager
import com.github.nullptroma.wallenc.domain.vault.vaults.local.LocalVault
import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore
import com.github.nullptroma.wallenc.domain.interfaces.IVault
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
import com.github.nullptroma.wallenc.vault.contract.VaultRegistrar
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.CoroutineDispatcher
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
class SingletonModule {
@Provides
@Singleton
fun provideTaskOrchestrator(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): ITaskOrchestrator = TaskOrchestrator(ioDispatcher)
@Provides
@Singleton
fun provideYandexUserInfoApi(): YandexUserInfoApi = YandexUserInfoApiFactory.create()
@Provides
@Singleton
fun provideYandexDiskApiFactory(
yandexAccountStore: YandexAccountStore,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexDiskApiFactory = YandexDiskApiFactory(
accountRepository = yandexAccountStore,
ioDispatcher = ioDispatcher,
)
@Provides
@Singleton
fun provideYandexDiskRepositoryFactory(
apiFactory: YandexDiskApiFactory,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): YandexDiskRepositoryFactory = YandexDiskRepositoryFactory(
apiFactory = apiFactory,
ioDispatcher = ioDispatcher,
)
@Provides
@Singleton
fun provideVaultsManager(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
localVault: IVault,
keyRepo: StorageKeyMapStore,
yandexAccountStore: YandexAccountStore,
yandexUserInfoRepository: YandexUserInfoRepository,
yandexDiskRepositoryFactory: YandexDiskRepositoryFactory,
): VaultsManager {
return VaultsManager(
ioDispatcher = ioDispatcher,
localVault = localVault,
keyRepo = keyRepo,
yandexAccountStore = yandexAccountStore,
yandexUserInfoRepository = yandexUserInfoRepository,
yandexDiskRepositoryFactory = yandexDiskRepositoryFactory,
)
}
@Provides
@Singleton
fun provideLocalVault(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
@ApplicationContext context: Context,
): IVault = LocalVault(
ioDispatcher = ioDispatcher,
vaultRoot = context.getExternalFilesDir("LocalVault"),
)
@Provides
@Singleton
fun provideIVaultsManager(impl: VaultsManager): IVaultsManager = impl
@Provides
@Singleton
fun provideVaultRegistrar(impl: VaultsManager): VaultRegistrar = impl
@Provides
fun provideUnlockManager(
vaultsManager: IVaultsManager
): IUnlockManager {
return vaultsManager.unlockManager
}
@Provides
@Singleton
fun provideStorageKeyMapRepository(
dao: StorageKeyMapDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher
): StorageKeyMapRepository {
return StorageKeyMapRepository(dao, ioDispatcher)
}
@Provides
@Singleton
fun provideStorageKeyMapStore(
impl: StorageKeyMapRepository,
): StorageKeyMapStore = impl
@Provides
@Singleton
fun provideStorageMetaInfoRepository(
dao: StorageMetaInfoDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher
): StorageMetaInfoRepository {
return StorageMetaInfoRepository(dao, ioDispatcher)
}
@Provides
@Singleton
fun provideStorageSyncGroupStore(
dao: StorageSyncGroupDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): IStorageSyncGroupStore = StorageSyncGroupRepository(dao, ioDispatcher)
@Provides
@Singleton
fun provideYandexAccountRepository(
dao: YandexAccountDao,
@IoDispatcher ioDispatcher: CoroutineDispatcher
): YandexAccountRepository {
return YandexAccountRepository(dao, ioDispatcher)
}
@Provides
@Singleton
fun provideYandexAccountStore(
impl: YandexAccountRepository,
): YandexAccountStore = impl
@Provides
@Singleton
fun provideYandexUserInfoRepository(
api: YandexUserInfoApi,
@IoDispatcher ioDispatcher: CoroutineDispatcher
): YandexUserInfoRepository {
return YandexUserInfoRepository(api, ioDispatcher)
}
}

22
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/TaskModule.kt Normal file
View File

@@ -0,0 +1,22 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import com.github.nullptroma.wallenc.app.di.modules.app.IoDispatcher
import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
import com.github.nullptroma.wallenc.task.runtime.TaskOrchestrator
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.CoroutineDispatcher
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object TaskModule {
@Provides
@Singleton
fun provideTaskOrchestrator(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
): ITaskOrchestrator = TaskOrchestrator(ioDispatcher)
}

23
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/VaultBindingsModule.kt Normal file
View File

@@ -0,0 +1,23 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import com.github.nullptroma.wallenc.domain.vault.vaults.VaultsManager
import com.github.nullptroma.wallenc.vault.contract.VaultRegistrar
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
abstract class VaultBindingsModule {
@Binds
@Singleton
abstract fun bindVaultsManager(impl: VaultsManager): IVaultsManager
@Binds
@Singleton
abstract fun bindVaultRegistrar(impl: VaultsManager): VaultRegistrar
}

59
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/VaultModule.kt Normal file
View File

@@ -0,0 +1,59 @@
package com.github.nullptroma.wallenc.app.di.modules.data
import android.content.Context
import com.github.nullptroma.wallenc.app.di.modules.app.IoDispatcher
import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import com.github.nullptroma.wallenc.domain.interfaces.IVault
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepositoryFactory
import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.repository.YandexUserInfoRepository
import com.github.nullptroma.wallenc.domain.vault.ports.StorageKeyMapStore
import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore
import com.github.nullptroma.wallenc.domain.vault.vaults.VaultsManager
import com.github.nullptroma.wallenc.domain.vault.vaults.local.LocalVault
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import kotlinx.coroutines.CoroutineDispatcher
import javax.inject.Singleton
@Module
@InstallIn(SingletonComponent::class)
object VaultModule {
@Provides
@Singleton
fun provideLocalVault(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
@ApplicationContext context: Context,
): IVault = LocalVault(
ioDispatcher = ioDispatcher,
// getExternalFilesDir may return null before storage is ready; LocalVault handles null root.
vaultRoot = context.getExternalFilesDir("LocalVault"),
)
@Provides
@Singleton
fun provideVaultsManager(
@IoDispatcher ioDispatcher: CoroutineDispatcher,
localVault: IVault,
keyRepo: StorageKeyMapStore,
yandexAccountStore: YandexAccountStore,
yandexUserInfoRepository: YandexUserInfoRepository,
yandexDiskRepositoryFactory: YandexDiskRepositoryFactory,
): VaultsManager = VaultsManager(
ioDispatcher = ioDispatcher,
localVault = localVault,
keyRepo = keyRepo,
yandexAccountStore = yandexAccountStore,
yandexUserInfoRepository = yandexUserInfoRepository,
yandexDiskRepositoryFactory = yandexDiskRepositoryFactory,
)
@Provides
@Singleton
fun provideUnlockManager(vaultsManager: IVaultsManager): IUnlockManager =
vaultsManager.unlockManager
}

121
app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/domain/UseCasesModule.kt
View File

@@ -1,131 +1,18 @@
package com.github.nullptroma.wallenc.app.di.modules.domain package com.github.nullptroma.wallenc.app.di.modules.domain
import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncEngine import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncEngine
import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore
import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import com.github.nullptroma.wallenc.usecases.GetOpenedStoragesUseCase
import com.github.nullptroma.wallenc.usecases.FindStorageUseCase
import com.github.nullptroma.wallenc.usecases.ManageStoragesEncryptionUseCase
import com.github.nullptroma.wallenc.usecases.ManageTextSecretsUseCase
import com.github.nullptroma.wallenc.usecases.ManageTwoFaTokensUseCase
import com.github.nullptroma.wallenc.usecases.ManageVaultUseCase
import com.github.nullptroma.wallenc.usecases.RemoveStorageUseCase
import com.github.nullptroma.wallenc.usecases.RenameStorageUseCase
import com.github.nullptroma.wallenc.usecases.RunStorageSyncUseCase
import com.github.nullptroma.wallenc.usecases.ManageStorageSyncGroupsUseCase
import com.github.nullptroma.wallenc.usecases.StorageSyncEngine import com.github.nullptroma.wallenc.usecases.StorageSyncEngine
import com.github.nullptroma.wallenc.usecases.StorageSyncReadiness import dagger.Binds
import com.github.nullptroma.wallenc.usecases.StorageFileManagementUseCase
import dagger.Module import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton import javax.inject.Singleton
@Module @Module
@InstallIn(SingletonComponent::class) @InstallIn(SingletonComponent::class)
class UseCasesModule { abstract class UseCasesModule {
@Provides
@Singleton
fun provideGetOpenedStoragesUseCase(unlockManager: IUnlockManager): GetOpenedStoragesUseCase {
return GetOpenedStoragesUseCase(unlockManager)
}
@Provides @Binds
@Singleton @Singleton
fun provideManageVaultUseCase(vaultsManager: IVaultsManager): ManageVaultUseCase { abstract fun bindStorageSyncEngine(impl: StorageSyncEngine): IStorageSyncEngine
return ManageVaultUseCase(vaultsManager)
}
@Provides
@Singleton
fun provideFindStorageUseCase(vaultsManager: IVaultsManager): FindStorageUseCase {
return FindStorageUseCase(vaultsManager)
}
@Provides
@Singleton
fun provideStorageFileManagementUseCase(): StorageFileManagementUseCase {
return StorageFileManagementUseCase()
}
@Provides
@Singleton
fun provideRenameStorageUseCase(): RenameStorageUseCase {
return RenameStorageUseCase()
}
@Provides
@Singleton
fun provideManageStoragesEncryptionUseCase(
unlockManager: IUnlockManager,
): ManageStoragesEncryptionUseCase {
return ManageStoragesEncryptionUseCase(unlockManager)
}
@Provides
@Singleton
fun provideRemoveStorageUseCase(
vaultsManager: IVaultsManager,
unlockManager: IUnlockManager,
manageStoragesEncryptionUseCase: ManageStoragesEncryptionUseCase,
): RemoveStorageUseCase {
return RemoveStorageUseCase(vaultsManager, unlockManager, manageStoragesEncryptionUseCase)
}
@Provides
@Singleton
fun provideManageTwoFaTokensUseCase(): ManageTwoFaTokensUseCase {
return ManageTwoFaTokensUseCase()
}
@Provides
@Singleton
fun provideManageTextSecretsUseCase(): ManageTextSecretsUseCase {
return ManageTextSecretsUseCase()
}
@Provides
@Singleton
fun provideStorageSyncEngine(
vaultsManager: IVaultsManager,
groupStore: IStorageSyncGroupStore,
findStorageUseCase: FindStorageUseCase,
): IStorageSyncEngine = StorageSyncEngine(
vaultsManager = vaultsManager,
groupStore = groupStore,
findStorageUseCase = findStorageUseCase,
)
@Provides
@Singleton
fun provideManageStorageSyncGroupsUseCase(
groupStore: IStorageSyncGroupStore,
): ManageStorageSyncGroupsUseCase = ManageStorageSyncGroupsUseCase(groupStore)
@Provides
@Singleton
fun provideStorageSyncReadiness(
vaultsManager: IVaultsManager,
groupStore: IStorageSyncGroupStore,
findStorageUseCase: FindStorageUseCase,
): StorageSyncReadiness = StorageSyncReadiness(
vaultsManager = vaultsManager,
groupStore = groupStore,
findStorageUseCase = findStorageUseCase,
)
@Provides
@Singleton
fun provideRunStorageSyncUseCase(
orchestrator: ITaskOrchestrator,
syncEngine: IStorageSyncEngine,
syncReadiness: StorageSyncReadiness,
): RunStorageSyncUseCase = RunStorageSyncUseCase(
orchestrator = orchestrator,
syncEngine = syncEngine,
syncReadiness = syncReadiness,
)
} }

1
usecases/build.gradle.kts
View File

@@ -14,6 +14,7 @@ kotlin {
} }
dependencies { dependencies {
compileOnly("javax.inject:javax.inject:1")
implementation(project(":domain")) implementation(project(":domain"))
implementation(libs.kotlinx.coroutines.core) implementation(libs.kotlinx.coroutines.core)
implementation(libs.kotlinx.serialization.json) implementation(libs.kotlinx.serialization.json)

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/FindStorageUseCase.kt
View File

@@ -3,8 +3,11 @@ package com.github.nullptroma.wallenc.usecases
import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
class FindStorageUseCase( @Singleton
class FindStorageUseCase @Inject constructor(
private val vaultsManager: IVaultsManager, private val vaultsManager: IVaultsManager,
) { ) {
fun find(storageUuid: UUID): IStorage? { fun find(storageUuid: UUID): IStorage? {

7
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/GetOpenedStoragesUseCase.kt
View File

@@ -4,8 +4,13 @@ import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
class GetOpenedStoragesUseCase(private val unlockManager: IUnlockManager) { @Singleton
class GetOpenedStoragesUseCase @Inject constructor(
private val unlockManager: IUnlockManager,
) {
val openedStorages: StateFlow<Map<UUID, IStorageInfo>> val openedStorages: StateFlow<Map<UUID, IStorageInfo>>
get() = unlockManager.openedStorages get() = unlockManager.openedStorages
} }

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/ManageStorageSyncGroupsUseCase.kt
View File

@@ -4,6 +4,8 @@ import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore
import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroup import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroup
import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroupEncryptionKind import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroupEncryptionKind
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
data class StorageSyncCompatibilityInput( data class StorageSyncCompatibilityInput(
val isEncrypted: Boolean, val isEncrypted: Boolean,
@@ -19,7 +21,8 @@ sealed interface AddStorageToSyncGroupResult {
data object MissingEncryptionSecret : AddStorageToSyncGroupResult data object MissingEncryptionSecret : AddStorageToSyncGroupResult
} }
class ManageStorageSyncGroupsUseCase( @Singleton
class ManageStorageSyncGroupsUseCase @Inject constructor(
private val groupStore: IStorageSyncGroupStore, private val groupStore: IStorageSyncGroupStore,
) { ) {
suspend fun getGroups(): List<StorageSyncGroup> = groupStore.getGroups() suspend fun getGroups(): List<StorageSyncGroup> = groupStore.getGroups()

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/ManageStoragesEncryptionUseCase.kt
View File

@@ -7,8 +7,11 @@ import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import com.github.nullptroma.wallenc.domain.tasks.TaskProgress import com.github.nullptroma.wallenc.domain.tasks.TaskProgress
import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.first
import javax.inject.Inject
import javax.inject.Singleton
class ManageStoragesEncryptionUseCase( @Singleton
class ManageStoragesEncryptionUseCase @Inject constructor(
private val unlockManager: IUnlockManager, private val unlockManager: IUnlockManager,
) { ) {
sealed interface CanEncryptResult { sealed interface CanEncryptResult {

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/ManageTextSecretsUseCase.kt
View File

@@ -21,8 +21,11 @@ import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.contentOrNull import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
class ManageTextSecretsUseCase { @Singleton
class ManageTextSecretsUseCase @Inject constructor() {
private val mutex = Mutex() private val mutex = Mutex()
fun observe(storageInfo: IStorageInfo): Flow<List<TextSecretRecord>> { fun observe(storageInfo: IStorageInfo): Flow<List<TextSecretRecord>> {

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/ManageTwoFaTokensUseCase.kt
View File

@@ -18,8 +18,11 @@ import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.contentOrNull import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.jsonPrimitive import kotlinx.serialization.json.jsonPrimitive
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
class ManageTwoFaTokensUseCase { @Singleton
class ManageTwoFaTokensUseCase @Inject constructor() {
private val mutex = Mutex() private val mutex = Mutex()
fun observe(storageInfo: IStorageInfo): Flow<List<TwoFaTokenRecord>> { fun observe(storageInfo: IStorageInfo): Flow<List<TwoFaTokenRecord>> {

7
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/ManageVaultUseCase.kt
View File

@@ -9,9 +9,14 @@ import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.map
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
@OptIn(ExperimentalCoroutinesApi::class) @OptIn(ExperimentalCoroutinesApi::class)
class ManageVaultUseCase(private val manager: IVaultsManager) { @Singleton
class ManageVaultUseCase @Inject constructor(
private val manager: IVaultsManager,
) {
/** Найти vault по идентификатору в текущем состоянии. */ /** Найти vault по идентификатору в текущем состоянии. */
fun find(vaultUuid: UUID): IVault? = fun find(vaultUuid: UUID): IVault? =

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/RemoveStorageUseCase.kt
View File

@@ -6,8 +6,11 @@ import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
import com.github.nullptroma.wallenc.domain.interfaces.IVault import com.github.nullptroma.wallenc.domain.interfaces.IVault
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
class RemoveStorageUseCase( @Singleton
class RemoveStorageUseCase @Inject constructor(
private val vaultsManager: IVaultsManager, private val vaultsManager: IVaultsManager,
private val unlockManager: IUnlockManager, private val unlockManager: IUnlockManager,
private val manageStoragesEncryptionUseCase: ManageStoragesEncryptionUseCase, private val manageStoragesEncryptionUseCase: ManageStoragesEncryptionUseCase,

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/RenameStorageUseCase.kt
View File

@@ -2,8 +2,11 @@ package com.github.nullptroma.wallenc.usecases
import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
import javax.inject.Inject
import javax.inject.Singleton
class RenameStorageUseCase { @Singleton
class RenameStorageUseCase @Inject constructor() {
suspend fun rename(storage: IStorageInfo, newName: String) { suspend fun rename(storage: IStorageInfo, newName: String) {
when (storage) { when (storage) {
is IStorage -> storage.rename(newName) is IStorage -> storage.rename(newName)

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/RunStorageSyncUseCase.kt
View File

@@ -12,8 +12,11 @@ import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.asStateFlow
import java.util.concurrent.atomic.AtomicBoolean import java.util.concurrent.atomic.AtomicBoolean
import javax.inject.Inject
import javax.inject.Singleton
class RunStorageSyncUseCase( @Singleton
class RunStorageSyncUseCase @Inject constructor(
private val orchestrator: ITaskOrchestrator, private val orchestrator: ITaskOrchestrator,
private val syncEngine: IStorageSyncEngine, private val syncEngine: IStorageSyncEngine,
private val syncReadiness: StorageSyncReadiness, private val syncReadiness: StorageSyncReadiness,

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/StorageFileManagementUseCase.kt
View File

@@ -4,8 +4,11 @@ import com.github.nullptroma.wallenc.domain.interfaces.IDirectory
import com.github.nullptroma.wallenc.domain.interfaces.IFile import com.github.nullptroma.wallenc.domain.interfaces.IFile
import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorage
import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
import javax.inject.Inject
import javax.inject.Singleton
class StorageFileManagementUseCase { @Singleton
class StorageFileManagementUseCase @Inject constructor() {
private var _storage: IStorage? = null private var _storage: IStorage? = null
fun setStorage(storage: IStorageInfo) { fun setStorage(storage: IStorageInfo) {

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/StorageSyncEngine.kt
View File

@@ -16,8 +16,11 @@ import java.time.Instant
import java.util.UUID import java.util.UUID
import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.ConcurrentHashMap
import java.util.concurrent.atomic.AtomicLong import java.util.concurrent.atomic.AtomicLong
import javax.inject.Inject
import javax.inject.Singleton
class StorageSyncEngine( @Singleton
class StorageSyncEngine @Inject constructor(
private val vaultsManager: IVaultsManager, private val vaultsManager: IVaultsManager,
private val groupStore: IStorageSyncGroupStore, private val groupStore: IStorageSyncGroupStore,
private val findStorageUseCase: FindStorageUseCase, private val findStorageUseCase: FindStorageUseCase,

5
usecases/src/main/java/com/github/nullptroma/wallenc/usecases/StorageSyncReadiness.kt
View File

@@ -4,11 +4,14 @@ import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore
import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
import kotlinx.coroutines.delay import kotlinx.coroutines.delay
import java.util.UUID import java.util.UUID
import javax.inject.Inject
import javax.inject.Singleton
/** /**
* Ожидание готовности хранилищ перед синхронизацией (холодный старт из WorkManager). * Ожидание готовности хранилищ перед синхронизацией (холодный старт из WorkManager).
*/ */
class StorageSyncReadiness( @Singleton
class StorageSyncReadiness @Inject constructor(
private val vaultsManager: IVaultsManager, private val vaultsManager: IVaultsManager,
private val groupStore: IStorageSyncGroupStore, private val groupStore: IStorageSyncGroupStore,
private val findStorageUseCase: FindStorageUseCase, private val findStorageUseCase: FindStorageUseCase,