From c7a08342b2b38d0b0d7e055904dca841eaa6af31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D1=8B=D1=82=D0=BA=D0=BE=D0=B2=20=D0=A0=D0=BE=D0=BC?= =?UTF-8?q?=D0=B0=D0=BD?= Date: Mon, 18 May 2026 11:14:43 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wallenc/app/auth/YandexSignInService.kt | 2 +- .../wallenc/app/di/modules/data/RoomModule.kt | 12 +++---- .../app/di/modules/data/SingletonModule.kt | 34 +++++++++---------- .../infrastructure/ExampleInstrumentedTest.kt | 4 +-- .../vault}/auth/YandexOAuthScopes.kt | 2 +- .../vault}/model/StorageKeyMap.kt | 2 +- .../vault}/model/YandexAccount.kt | 2 +- .../network/yandexdisk/YandexDiskApi.kt | 12 +++---- .../yandexdisk/YandexDiskApiFactory.kt | 6 ++-- .../yandexdisk/YandexDiskExceptions.kt | 2 +- .../network/yandexdisk/dto/YandexDiskDto.kt | 2 +- .../dto/YandexVaultPersistedStats.kt | 2 +- .../repository/YandexDiskRepository.kt | 18 +++++----- .../repository/YandexDiskRepositoryFactory.kt | 4 +-- .../yandexuserinfo/YandexUserInfoApi.kt | 2 +- .../YandexUserInfoApiFactory.kt | 2 +- .../yandexuserinfo/YandexUserInfoDto.kt | 2 +- .../repository/YandexUserInfoRepository.kt | 6 ++-- .../vault}/ports/StorageKeyMapStore.kt | 5 +-- .../vault}/ports/YandexAccountStore.kt | 4 +-- .../vault}/storages/UnlockManager.kt | 8 ++--- .../vault}/storages/common/BaseStorage.kt | 10 +++--- .../storages/encrypt/EncryptedStorage.kt | 4 +-- .../encrypt/EncryptedStorageAccessor.kt | 6 ++-- .../vault}/storages/local/LocalStorage.kt | 4 +-- .../storages/local/LocalStorageAccessor.kt | 4 +-- .../vault}/storages/yandex/YandexStorage.kt | 8 ++--- .../storages/yandex/YandexStorageAccessor.kt | 12 +++---- .../vault}/utils/CloseHandledStream.kt | 2 +- .../vault}/utils/IProvider.kt | 2 +- .../vault}/vaults/VaultsManager.kt | 18 +++++----- .../vault}/vaults/local/LocalVault.kt | 4 +-- .../vaults/yandex/YandexRegistration.kt | 2 +- .../vault}/vaults/yandex/YandexVault.kt | 8 ++--- .../wallenc/infrastructure/ExampleUnitTest.kt | 2 +- infrastructure-android/build.gradle.kts | 2 +- .../wallenc/infrastructure/db/RoomFactory.kt | 4 +-- .../wallenc/infrastructure/db/app/AppDb.kt | 18 +++++----- .../db/app/dao/StorageKeyMapDao.kt | 4 +-- .../db/app/dao/StorageMetaInfoDao.kt | 4 +-- .../db/app/dao/StorageSyncGroupDao.kt | 4 +-- .../db/app/dao/YandexAccountDao.kt | 4 +-- .../db/app/model/DbStorageKeyMap.kt | 4 +-- .../db/app/model/DbStorageMetaInfo.kt | 2 +- .../db/app/model/DbStorageSyncGroup.kt | 2 +- .../db/app/model/DbYandexAccount.kt | 2 +- .../app/repository/StorageKeyMapRepository.kt | 10 +++--- .../repository/StorageMetaInfoRepository.kt | 8 ++--- .../repository/StorageSyncGroupRepository.kt | 8 ++--- .../app/repository/YandexAccountRepository.kt | 10 +++--- 50 files changed, 153 insertions(+), 152 deletions(-) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/auth/YandexOAuthScopes.kt (92%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/model/StorageKeyMap.kt (73%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/model/YandexAccount.kt (69%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/YandexDiskApi.kt (78%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/YandexDiskApiFactory.kt (91%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/YandexDiskExceptions.kt (59%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/dto/YandexDiskDto.kt (95%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/dto/YandexVaultPersistedStats.kt (73%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/repository/YandexDiskRepository.kt (94%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt (72%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexuserinfo/YandexUserInfoApi.kt (78%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexuserinfo/YandexUserInfoApiFactory.kt (87%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexuserinfo/YandexUserInfoDto.kt (80%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/network/yandexuserinfo/repository/YandexUserInfoRepository.kt (58%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/ports/StorageKeyMapStore.kt (57%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/ports/YandexAccountStore.kt (76%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/UnlockManager.kt (95%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/common/BaseStorage.kt (95%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/encrypt/EncryptedStorage.kt (94%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/encrypt/EncryptedStorageAccessor.kt (98%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/local/LocalStorage.kt (83%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/local/LocalStorageAccessor.kt (99%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/yandex/YandexStorage.kt (76%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/storages/yandex/YandexStorageAccessor.kt (98%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/utils/CloseHandledStream.kt (97%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/utils/IProvider.kt (64%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/vaults/VaultsManager.kt (85%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/vaults/local/LocalVault.kt (97%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/vaults/yandex/YandexRegistration.kt (91%) rename domain-vault/src/main/java/com/github/nullptroma/wallenc/{infrastructure => domain/vault}/vaults/yandex/YandexVault.kt (94%) diff --git a/app/src/main/java/com/github/nullptroma/wallenc/app/auth/YandexSignInService.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/auth/YandexSignInService.kt index 7842335..78920ff 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/app/auth/YandexSignInService.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/auth/YandexSignInService.kt @@ -3,7 +3,7 @@ package com.github.nullptroma.wallenc.app.auth import android.content.Context import androidx.activity.ComponentActivity import androidx.activity.result.ActivityResultLauncher -import com.github.nullptroma.wallenc.infrastructure.vaults.yandex.YandexRegistration +import com.github.nullptroma.wallenc.domain.vault.vaults.yandex.YandexRegistration import com.github.nullptroma.wallenc.vault.contract.CloudBrand import com.github.nullptroma.wallenc.vault.contract.RemoteVaultAuthenticator import com.github.nullptroma.wallenc.vault.contract.VaultLinkOutcome diff --git a/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/RoomModule.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/RoomModule.kt index ccef822..a44cf43 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/RoomModule.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/RoomModule.kt @@ -1,12 +1,12 @@ package com.github.nullptroma.wallenc.app.di.modules.data import android.content.Context -import com.github.nullptroma.wallenc.infrastructure.db.RoomFactory -import com.github.nullptroma.wallenc.infrastructure.db.app.IAppDb -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageKeyMapDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageMetaInfoDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageSyncGroupDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.YandexAccountDao +import com.github.nullptroma.wallenc.domain.vault.db.RoomFactory +import com.github.nullptroma.wallenc.domain.vault.db.app.IAppDb +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 dagger.Module import dagger.Provides import dagger.hilt.InstallIn diff --git a/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/SingletonModule.kt b/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/SingletonModule.kt index 86d1173..1d1842a 100644 --- a/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/SingletonModule.kt +++ b/app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/data/SingletonModule.kt @@ -2,24 +2,24 @@ 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.infrastructure.db.app.dao.StorageKeyMapDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageMetaInfoDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageSyncGroupDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.YandexAccountDao -import com.github.nullptroma.wallenc.infrastructure.db.app.repository.StorageKeyMapRepository -import com.github.nullptroma.wallenc.infrastructure.db.app.repository.StorageMetaInfoRepository -import com.github.nullptroma.wallenc.infrastructure.db.app.repository.StorageSyncGroupRepository -import com.github.nullptroma.wallenc.infrastructure.db.app.repository.YandexAccountRepository -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskApiFactory -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository.YandexDiskRepositoryFactory -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoApi -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoApiFactory -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.repository.YandexUserInfoRepository -import com.github.nullptroma.wallenc.infrastructure.ports.StorageKeyMapStore -import com.github.nullptroma.wallenc.infrastructure.ports.YandexAccountStore +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.infrastructure.vaults.VaultsManager -import com.github.nullptroma.wallenc.infrastructure.vaults.local.LocalVault +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 diff --git a/domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt b/domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt index 8abb240..22a9d9f 100644 --- a/domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt +++ b/domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure +package com.github.nullptroma.wallenc.domain.vault import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.github.nullptroma.wallenc.infrastructure.test", appContext.packageName) + assertEquals("com.github.nullptroma.wallenc.domain.vault.test", appContext.packageName) } } \ No newline at end of file diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/auth/YandexOAuthScopes.kt similarity index 92% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/auth/YandexOAuthScopes.kt index 108bbf1..b57fb63 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/auth/YandexOAuthScopes.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.auth +package com.github.nullptroma.wallenc.domain.vault.auth /** * Scope-ы Яндекс.OAuth, которые нам нужны: только app_folder + disk.info. diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/StorageKeyMap.kt similarity index 73% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/StorageKeyMap.kt index d24230b..3d7ca40 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/StorageKeyMap.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.model +package com.github.nullptroma.wallenc.domain.vault.model import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey import java.util.UUID diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/YandexAccount.kt similarity index 69% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/YandexAccount.kt index 6f6c4c9..d00c126 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/YandexAccount.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.model +package com.github.nullptroma.wallenc.domain.vault.model data class YandexAccount( val vaultUuid: String, diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApi.kt similarity index 78% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApi.kt index afddce8..f203fe0 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApi.kt @@ -1,10 +1,10 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.CustomPropertiesPatchDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.DiskInfoDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.LinkDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.OperationStatusDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.ResourceDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.CustomPropertiesPatchDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.DiskInfoDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.LinkDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.OperationStatusDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.ResourceDto import okhttp3.ResponseBody import retrofit2.Response import retrofit2.http.Body diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApiFactory.kt similarity index 91% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApiFactory.kt index e87e6b2..e9f18d6 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApiFactory.kt @@ -1,7 +1,7 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.github.nullptroma.wallenc.infrastructure.ports.YandexAccountStore +import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.runBlocking import okhttp3.OkHttpClient @@ -32,7 +32,7 @@ class YandexDiskApiFactory( /** * [tokenProvider] вызывается на каждый HTTP-запрос к cloud-api (свежий токен из БД). */ - fun createAuthenticatedApi(tokenProvider: () -> String?): YandexDiskApi { + fun createAuthenticatedApi(tokenProvider: () -> String?): com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskApi { val client = OkHttpClient.Builder() .addInterceptor { chain -> val token = tokenProvider() diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskExceptions.kt similarity index 59% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskExceptions.kt index 8a2f54c..0ea9a84 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskExceptions.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk import java.io.IOException diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexDiskDto.kt similarity index 95% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexDiskDto.kt index 5a7d64b..53450eb 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexDiskDto.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexVaultPersistedStats.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexVaultPersistedStats.kt similarity index 73% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexVaultPersistedStats.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexVaultPersistedStats.kt index eb46dee..02e8ca5 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexVaultPersistedStats.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexVaultPersistedStats.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto import com.fasterxml.jackson.annotation.JsonIgnoreProperties diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepository.kt similarity index 94% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepository.kt index 2cc5199..1558540 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepository.kt @@ -1,15 +1,15 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskApi -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskAuthException -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.CustomPropertiesPatchDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.DiskInfoDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.EmbeddedResourceListDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.LinkDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.OperationStatusDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.ResourceDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskApi +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskAuthException +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.CustomPropertiesPatchDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.DiskInfoDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.EmbeddedResourceListDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.LinkDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.OperationStatusDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.ResourceDto import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.delay import kotlinx.coroutines.withContext diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt similarity index 72% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt index 283545c..f73ded3 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt @@ -1,6 +1,6 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository +package com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskApiFactory +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskApiFactory import kotlinx.coroutines.CoroutineDispatcher import java.util.UUID diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApi.kt similarity index 78% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApi.kt index a5c2d29..2f0693f 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApi.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo +package com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo import retrofit2.http.GET import retrofit2.http.Header diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApiFactory.kt similarity index 87% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApiFactory.kt index 8a4bb15..0b75fed 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApiFactory.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo +package com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import retrofit2.Retrofit diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoDto.kt similarity index 80% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoDto.kt index 92735cf..63269b2 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoDto.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo +package com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo import com.fasterxml.jackson.annotation.JsonIgnoreProperties import com.fasterxml.jackson.annotation.JsonProperty diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/repository/YandexUserInfoRepository.kt similarity index 58% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/repository/YandexUserInfoRepository.kt index 1ae6816..21db4dc 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/repository/YandexUserInfoRepository.kt @@ -1,7 +1,7 @@ -package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.repository +package com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.repository -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoApi -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoApi +import com.github.nullptroma.wallenc.domain.vault.network.yandexuserinfo.YandexUserInfoDto import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/StorageKeyMapStore.kt similarity index 57% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/StorageKeyMapStore.kt index ae1ea25..454126c 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/StorageKeyMapStore.kt @@ -1,6 +1,7 @@ -package com.github.nullptroma.wallenc.infrastructure.ports +package com.github.nullptroma.wallenc.domain.vault.ports + +import com.github.nullptroma.wallenc.domain.vault.model.StorageKeyMap -import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap interface StorageKeyMapStore { suspend fun add(value: StorageKeyMap) diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/YandexAccountStore.kt similarity index 76% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/YandexAccountStore.kt index 7af1009..c28628c 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/YandexAccountStore.kt @@ -1,6 +1,6 @@ -package com.github.nullptroma.wallenc.infrastructure.ports +package com.github.nullptroma.wallenc.domain.vault.ports -import com.github.nullptroma.wallenc.infrastructure.model.YandexAccount +import com.github.nullptroma.wallenc.domain.vault.model.YandexAccount import kotlinx.coroutines.flow.Flow interface YandexAccountStore { diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/UnlockManager.kt similarity index 95% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/UnlockManager.kt index 7287221..3a83419 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/UnlockManager.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.storages +package com.github.nullptroma.wallenc.domain.vault.storages -import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap -import com.github.nullptroma.wallenc.infrastructure.ports.StorageKeyMapStore -import com.github.nullptroma.wallenc.infrastructure.storages.encrypt.EncryptedStorage +import com.github.nullptroma.wallenc.domain.vault.model.StorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.ports.StorageKeyMapStore +import com.github.nullptroma.wallenc.domain.vault.storages.encrypt.EncryptedStorage import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey import com.github.nullptroma.wallenc.domain.encrypt.Encryptor import com.github.nullptroma.wallenc.domain.interfaces.IStorage diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/common/BaseStorage.kt similarity index 95% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/common/BaseStorage.kt index 3fb6e6d..fba0d2a 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/common/BaseStorage.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.common +package com.github.nullptroma.wallenc.domain.vault.storages.common import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.github.nullptroma.wallenc.domain.common.impl.CommonStorageMetaInfo @@ -54,7 +54,7 @@ abstract class BaseStorage( /** * Базовая реализация [IStorageAccessor] передаёт UUID полностью; подклассы * могут переопределить, чтобы сохранить совместимость с уже существующими - * именами файлов (например, [com.github.nullptroma.wallenc.infrastructure.storages.encrypt.EncryptedStorage] + * именами файлов (например, [com.github.nullptroma.wallenc.domain.vault.storages.encrypt.EncryptedStorage] * раньше использовал первые 8 символов). */ protected open fun metaInfoUuidPart(): String = uuid.toString() @@ -123,16 +123,16 @@ abstract class BaseStorage( .sortedByDescending { it.length } val total = paths.size if (total == 0) { - onProgress(TaskProgress(1f, null)) return@withContext } paths.forEachIndexed { index, path -> accessor.delete(path) if (index % PROGRESS_REPORT_INTERVAL == 0 || index == paths.lastIndex) { + val done = index + 1 onProgress( TaskProgress( - fraction = (index + 1).toFloat() / total, - label = null, + fraction = done.toFloat() / total, + label = "$done / $total", ), ) coroutineContext.ensureActive() diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorage.kt similarity index 94% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorage.kt index 1643a4a..af86156 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorage.kt @@ -1,6 +1,6 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.encrypt +package com.github.nullptroma.wallenc.domain.vault.storages.encrypt -import com.github.nullptroma.wallenc.infrastructure.storages.common.BaseStorage +import com.github.nullptroma.wallenc.domain.vault.storages.common.BaseStorage import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey import com.github.nullptroma.wallenc.domain.encrypt.Encryptor import com.github.nullptroma.wallenc.domain.interfaces.IStorage diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorageAccessor.kt similarity index 98% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorageAccessor.kt index a354c09..8b8b78d 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorageAccessor.kt @@ -1,7 +1,7 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.encrypt +package com.github.nullptroma.wallenc.domain.vault.storages.encrypt -import com.github.nullptroma.wallenc.infrastructure.utils.CloseHandledStreamExtension.Companion.onClosed -import com.github.nullptroma.wallenc.infrastructure.utils.CloseHandledStreamExtension.Companion.onClosing +import com.github.nullptroma.wallenc.domain.vault.utils.CloseHandledStreamExtension.Companion.onClosed +import com.github.nullptroma.wallenc.domain.vault.utils.CloseHandledStreamExtension.Companion.onClosing import com.github.nullptroma.wallenc.domain.common.impl.CommonDirectory import com.github.nullptroma.wallenc.domain.common.impl.CommonFile import com.github.nullptroma.wallenc.domain.common.impl.CommonMetaInfo diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorage.kt similarity index 83% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorage.kt index 040ce05..49b75de 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorage.kt @@ -1,6 +1,6 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.local +package com.github.nullptroma.wallenc.domain.vault.storages.local -import com.github.nullptroma.wallenc.infrastructure.storages.common.BaseStorage +import com.github.nullptroma.wallenc.domain.vault.storages.common.BaseStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorageAccessor import kotlinx.coroutines.CoroutineDispatcher import java.util.UUID diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorageAccessor.kt similarity index 99% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorageAccessor.kt index c545c62..bb63146 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorageAccessor.kt @@ -1,9 +1,9 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.local +package com.github.nullptroma.wallenc.domain.vault.storages.local import com.fasterxml.jackson.core.JacksonException import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper import com.fasterxml.jackson.module.kotlin.readValue -import com.github.nullptroma.wallenc.infrastructure.utils.CloseHandledStreamExtension.Companion.onClosed +import com.github.nullptroma.wallenc.domain.vault.utils.CloseHandledStreamExtension.Companion.onClosed import com.github.nullptroma.wallenc.domain.common.impl.CommonDirectory import com.github.nullptroma.wallenc.domain.common.impl.CommonFile import com.github.nullptroma.wallenc.domain.common.impl.CommonMetaInfo diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorage.kt similarity index 76% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorage.kt index 5236caa..817e0a7 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorage.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.yandex +package com.github.nullptroma.wallenc.domain.vault.storages.yandex -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository.YandexDiskRepository -import com.github.nullptroma.wallenc.infrastructure.storages.common.BaseStorage -import com.github.nullptroma.wallenc.infrastructure.storages.local.LocalStorage +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepository +import com.github.nullptroma.wallenc.domain.vault.storages.common.BaseStorage +import com.github.nullptroma.wallenc.domain.vault.storages.local.LocalStorage import com.github.nullptroma.wallenc.domain.interfaces.IStorageAccessor import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.CoroutineScope diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorageAccessor.kt similarity index 98% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorageAccessor.kt index 40d7c20..ce9a0b5 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorageAccessor.kt @@ -1,11 +1,11 @@ -package com.github.nullptroma.wallenc.infrastructure.storages.yandex +package com.github.nullptroma.wallenc.domain.vault.storages.yandex import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskAuthException -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.ResourceDto -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto.YandexVaultPersistedStats -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository.YandexDiskRepository -import com.github.nullptroma.wallenc.infrastructure.utils.CloseHandledStreamExtension.Companion.onClosed +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskAuthException +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.ResourceDto +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.dto.YandexVaultPersistedStats +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepository +import com.github.nullptroma.wallenc.domain.vault.utils.CloseHandledStreamExtension.Companion.onClosed import com.github.nullptroma.wallenc.domain.common.impl.CommonDirectory import com.github.nullptroma.wallenc.domain.common.impl.CommonFile import com.github.nullptroma.wallenc.domain.common.impl.CommonMetaInfo diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/CloseHandledStream.kt similarity index 97% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/CloseHandledStream.kt index b4758aa..58af5aa 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/CloseHandledStream.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.utils +package com.github.nullptroma.wallenc.domain.vault.utils import java.io.InputStream import java.io.OutputStream diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/IProvider.kt similarity index 64% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/IProvider.kt index 5d3de34..4f4c060 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/IProvider.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.utils +package com.github.nullptroma.wallenc.domain.vault.utils interface IProvider { suspend fun get(): T? diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/VaultsManager.kt similarity index 85% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/VaultsManager.kt index bc99018..61143c4 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/VaultsManager.kt @@ -1,13 +1,13 @@ -package com.github.nullptroma.wallenc.infrastructure.vaults +package com.github.nullptroma.wallenc.domain.vault.vaults -import com.github.nullptroma.wallenc.infrastructure.model.YandexAccount -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository.YandexDiskRepositoryFactory -import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.repository.YandexUserInfoRepository -import com.github.nullptroma.wallenc.infrastructure.ports.StorageKeyMapStore -import com.github.nullptroma.wallenc.infrastructure.ports.YandexAccountStore -import com.github.nullptroma.wallenc.infrastructure.storages.UnlockManager -import com.github.nullptroma.wallenc.infrastructure.vaults.yandex.YandexRegistration -import com.github.nullptroma.wallenc.infrastructure.vaults.yandex.YandexVault +import com.github.nullptroma.wallenc.domain.vault.model.YandexAccount +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.storages.UnlockManager +import com.github.nullptroma.wallenc.domain.vault.vaults.yandex.YandexRegistration +import com.github.nullptroma.wallenc.domain.vault.vaults.yandex.YandexVault import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager import com.github.nullptroma.wallenc.domain.interfaces.IVault diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/local/LocalVault.kt similarity index 97% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/local/LocalVault.kt index 9edefea..2762d31 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/local/LocalVault.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.vaults.local +package com.github.nullptroma.wallenc.domain.vault.vaults.local import com.github.nullptroma.wallenc.domain.datatypes.StorageEncryptionInfo import com.github.nullptroma.wallenc.domain.interfaces.IStorage -import com.github.nullptroma.wallenc.infrastructure.storages.local.LocalStorage +import com.github.nullptroma.wallenc.domain.vault.storages.local.LocalStorage import com.github.nullptroma.wallenc.vault.contract.DescribedVault import com.github.nullptroma.wallenc.vault.contract.VaultDescriptor import kotlinx.coroutines.CoroutineDispatcher diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexRegistration.kt similarity index 91% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexRegistration.kt index 2bdf01a..6a39468 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexRegistration.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.vaults.yandex +package com.github.nullptroma.wallenc.domain.vault.vaults.yandex import com.github.nullptroma.wallenc.vault.contract.VaultRegistration diff --git a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexVault.kt similarity index 94% rename from domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexVault.kt index 7ddb3f3..394fb1f 100644 --- a/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt +++ b/domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexVault.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.vaults.yandex +package com.github.nullptroma.wallenc.domain.vault.vaults.yandex -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskAuthException -import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository.YandexDiskRepository -import com.github.nullptroma.wallenc.infrastructure.storages.yandex.YandexStorage +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.YandexDiskAuthException +import com.github.nullptroma.wallenc.domain.vault.network.yandexdisk.repository.YandexDiskRepository +import com.github.nullptroma.wallenc.domain.vault.storages.yandex.YandexStorage import com.github.nullptroma.wallenc.domain.datatypes.StorageEncryptionInfo import com.github.nullptroma.wallenc.domain.interfaces.IStorage import com.github.nullptroma.wallenc.vault.contract.CloudBrand diff --git a/domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt b/domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt index 4d74c3f..408fe7b 100644 --- a/domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt +++ b/domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure +package com.github.nullptroma.wallenc.domain.vault import org.junit.Test diff --git a/infrastructure-android/build.gradle.kts b/infrastructure-android/build.gradle.kts index a2f7ed1..a215eb9 100644 --- a/infrastructure-android/build.gradle.kts +++ b/infrastructure-android/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "com.github.nullptroma.wallenc.infrastructure.android" + namespace = "com.github.nullptroma.wallenc.domain.vault.android" compileSdk = 37 defaultConfig { diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/RoomFactory.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/RoomFactory.kt index c5d4c9d..2274bdd 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/RoomFactory.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/RoomFactory.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.db +package com.github.nullptroma.wallenc.domain.vault.db import android.content.Context import androidx.room.Room -import com.github.nullptroma.wallenc.infrastructure.db.app.AppDb +import com.github.nullptroma.wallenc.domain.vault.db.app.AppDb class RoomFactory(private val context: Context) { fun buildAppDb(): AppDb { diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/AppDb.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/AppDb.kt index 471a35f..5d3b6d3 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/AppDb.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/AppDb.kt @@ -1,15 +1,15 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app +package com.github.nullptroma.wallenc.domain.vault.db.app import androidx.room.Database import androidx.room.RoomDatabase -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageKeyMapDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageMetaInfoDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageSyncGroupDao -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.YandexAccountDao -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageKeyMap -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageMetaInfo -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageSyncGroup -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbYandexAccount +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.model.DbStorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageMetaInfo +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageSyncGroup +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbYandexAccount interface IAppDb { val storageKeyMapDao: StorageKeyMapDao diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageKeyMapDao.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageKeyMapDao.kt index 76a8637..fc523cc 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageKeyMapDao.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageKeyMapDao.kt @@ -1,11 +1,11 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.dao +package com.github.nullptroma.wallenc.domain.vault.db.app.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageKeyMap @Dao interface StorageKeyMapDao { diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageMetaInfoDao.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageMetaInfoDao.kt index 085731a..7332d45 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageMetaInfoDao.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageMetaInfoDao.kt @@ -1,11 +1,11 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.dao +package com.github.nullptroma.wallenc.domain.vault.db.app.dao import androidx.room.Dao import androidx.room.Delete import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageMetaInfo +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageMetaInfo import kotlinx.coroutines.flow.Flow import java.util.UUID diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageSyncGroupDao.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageSyncGroupDao.kt index ced4f28..1f22e3f 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageSyncGroupDao.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageSyncGroupDao.kt @@ -1,10 +1,10 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.dao +package com.github.nullptroma.wallenc.domain.vault.db.app.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageSyncGroup +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageSyncGroup @Dao interface StorageSyncGroupDao { diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/YandexAccountDao.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/YandexAccountDao.kt index 9c18a17..2ddc62f 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/YandexAccountDao.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/YandexAccountDao.kt @@ -1,9 +1,9 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.dao +package com.github.nullptroma.wallenc.domain.vault.db.app.dao import androidx.room.Dao import androidx.room.Insert import androidx.room.Query -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbYandexAccount +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbYandexAccount import kotlinx.coroutines.flow.Flow @Dao diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageKeyMap.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageKeyMap.kt index e36b91c..e7dfb6f 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageKeyMap.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageKeyMap.kt @@ -1,8 +1,8 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.model +package com.github.nullptroma.wallenc.domain.vault.db.app.model import androidx.room.ColumnInfo import androidx.room.Entity -import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.model.StorageKeyMap import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey import java.util.UUID diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageMetaInfo.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageMetaInfo.kt index e553ec8..7674394 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageMetaInfo.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageMetaInfo.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.model +package com.github.nullptroma.wallenc.domain.vault.db.app.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageSyncGroup.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageSyncGroup.kt index 9a46876..1c6ad93 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageSyncGroup.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageSyncGroup.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.model +package com.github.nullptroma.wallenc.domain.vault.db.app.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbYandexAccount.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbYandexAccount.kt index c831503..ec5cc25 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbYandexAccount.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbYandexAccount.kt @@ -1,4 +1,4 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.model +package com.github.nullptroma.wallenc.domain.vault.db.app.model import androidx.room.Entity import androidx.room.Index diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageKeyMapRepository.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageKeyMapRepository.kt index f87b49e..d647315 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageKeyMapRepository.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageKeyMapRepository.kt @@ -1,9 +1,9 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.repository +package com.github.nullptroma.wallenc.domain.vault.db.app.repository -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageKeyMapDao -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageKeyMap -import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap -import com.github.nullptroma.wallenc.infrastructure.ports.StorageKeyMapStore +import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageKeyMapDao +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.model.StorageKeyMap +import com.github.nullptroma.wallenc.domain.vault.ports.StorageKeyMapStore import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageMetaInfoRepository.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageMetaInfoRepository.kt index 8c001c3..11a0093 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageMetaInfoRepository.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageMetaInfoRepository.kt @@ -1,9 +1,9 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.repository +package com.github.nullptroma.wallenc.domain.vault.db.app.repository import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageMetaInfoDao -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageMetaInfo -import com.github.nullptroma.wallenc.infrastructure.utils.IProvider +import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageMetaInfoDao +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageMetaInfo +import com.github.nullptroma.wallenc.domain.vault.utils.IProvider import com.github.nullptroma.wallenc.domain.common.impl.CommonStorageMetaInfo import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageSyncGroupRepository.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageSyncGroupRepository.kt index 40272ca..22490c4 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageSyncGroupRepository.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageSyncGroupRepository.kt @@ -1,11 +1,11 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.repository +package com.github.nullptroma.wallenc.domain.vault.db.app.repository import com.github.nullptroma.wallenc.domain.interfaces.IStorageSyncGroupStore import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroup import com.github.nullptroma.wallenc.domain.interfaces.StorageSyncGroupEncryptionKind -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.StorageSyncGroupDao -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageSyncGroup -import com.github.nullptroma.wallenc.infrastructure.utils.IProvider +import com.github.nullptroma.wallenc.domain.vault.db.app.dao.StorageSyncGroupDao +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbStorageSyncGroup +import com.github.nullptroma.wallenc.domain.vault.utils.IProvider import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.withContext import java.util.UUID diff --git a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/YandexAccountRepository.kt b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/YandexAccountRepository.kt index 61a927c..4f969da 100644 --- a/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/YandexAccountRepository.kt +++ b/infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/YandexAccountRepository.kt @@ -1,9 +1,9 @@ -package com.github.nullptroma.wallenc.infrastructure.db.app.repository +package com.github.nullptroma.wallenc.domain.vault.db.app.repository -import com.github.nullptroma.wallenc.infrastructure.db.app.dao.YandexAccountDao -import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbYandexAccount -import com.github.nullptroma.wallenc.infrastructure.model.YandexAccount -import com.github.nullptroma.wallenc.infrastructure.ports.YandexAccountStore +import com.github.nullptroma.wallenc.domain.vault.db.app.dao.YandexAccountDao +import com.github.nullptroma.wallenc.domain.vault.db.app.model.DbYandexAccount +import com.github.nullptroma.wallenc.domain.vault.model.YandexAccount +import com.github.nullptroma.wallenc.domain.vault.ports.YandexAccountStore import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map