diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 340cff7..c110c24 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -76,7 +76,7 @@ dependencies { implementation(project(":domain")) implementation(project(":usecases")) - implementation(project(":domain-storage")) + implementation(project(":domain-vault")) implementation(project(":infrastructure-android")) implementation(project(":task-runtime")) implementation(project(":ui")) diff --git a/domain-storage/.gitignore b/domain-vault/.gitignore similarity index 100% rename from domain-storage/.gitignore rename to domain-vault/.gitignore diff --git a/domain-storage/build.gradle.kts b/domain-vault/build.gradle.kts similarity index 100% rename from domain-storage/build.gradle.kts rename to domain-vault/build.gradle.kts diff --git a/domain-storage/consumer-rules.pro b/domain-vault/consumer-rules.pro similarity index 100% rename from domain-storage/consumer-rules.pro rename to domain-vault/consumer-rules.pro diff --git a/domain-storage/proguard-rules.pro b/domain-vault/proguard-rules.pro similarity index 100% rename from domain-storage/proguard-rules.pro rename to domain-vault/proguard-rules.pro diff --git a/domain-storage/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt b/domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt similarity index 100% rename from domain-storage/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt rename to domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt diff --git a/domain-storage/src/main/AndroidManifest.xml b/domain-vault/src/main/AndroidManifest.xml similarity index 100% rename from domain-storage/src/main/AndroidManifest.xml rename to domain-vault/src/main/AndroidManifest.xml diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt diff --git a/domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt b/domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt similarity index 100% rename from domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt rename to domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt diff --git a/domain-storage/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt b/domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt similarity index 100% rename from domain-storage/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt rename to domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt diff --git a/infrastructure-android/build.gradle.kts b/infrastructure-android/build.gradle.kts index 8f280c4..a2f7ed1 100644 --- a/infrastructure-android/build.gradle.kts +++ b/infrastructure-android/build.gradle.kts @@ -31,7 +31,7 @@ android { dependencies { implementation(project(":domain")) - implementation(project(":domain-storage")) + implementation(project(":domain-vault")) implementation(project(":vault-contracts")) implementation(libs.jackson.module.kotlin) diff --git a/settings.gradle.kts b/settings.gradle.kts index 1015b62..0068f4a 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,7 +27,7 @@ include(":app") include(":domain") include(":usecases") include(":ui") -include(":domain-storage") +include(":domain-vault") include(":infrastructure-android") include(":vault-contracts") include(":task-runtime")