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

Переименован пакет

Browse Source
This commit is contained in:
Роман Пытков
2026-05-18 11:14:43 +03:00
parent a138da2a40
commit c7a08342b2
50 changed files with 153 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/nullptroma/wallenc/app/auth/YandexSignInService.kt
View File

@@ -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

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

@@ -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

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

@@ -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

4
domain-vault/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt
View File

@@ -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)
}
}

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/auth/YandexOAuthScopes.kt
View File

@@ -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.

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/StorageKeyMap.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/model/YandexAccount.kt
View File

@@ -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,

12
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApi.kt
View File

@@ -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

6
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskApiFactory.kt
View File

@@ -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()

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/YandexDiskExceptions.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexDiskDto.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexVaultPersistedStats.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/dto/YandexVaultPersistedStats.kt
View File

@@ -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

18
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepository.kt
View File

@@ -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

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApi.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoApiFactory.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/YandexUserInfoDto.kt
View File

@@ -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

6
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/network/yandexuserinfo/repository/YandexUserInfoRepository.kt
View File

@@ -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

5
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/StorageKeyMapStore.kt
View File

@@ -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)

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/ports/YandexAccountStore.kt
View File

@@ -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 {

8
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/UnlockManager.kt
View File

@@ -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

10
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/common/BaseStorage.kt
View File

@@ -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()

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorage.kt
View File

@@ -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

6
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/encrypt/EncryptedStorageAccessor.kt
View File

@@ -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

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorage.kt
View File

@@ -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

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/local/LocalStorageAccessor.kt
View File

@@ -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

8
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorage.kt
View File

@@ -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

12
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/storages/yandex/YandexStorageAccessor.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/CloseHandledStream.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/utils/IProvider.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.infrastructure.utils
package com.github.nullptroma.wallenc.domain.vault.utils
interface IProvider<T> {
suspend fun get(): T?

18
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/VaultsManager.kt
View File

@@ -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

4
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/local/LocalVault.kt
View File

@@ -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

2
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexRegistration.kt
View File

@@ -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

8
domain-vault/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt → domain-vault/src/main/java/com/github/nullptroma/wallenc/domain/vault/vaults/yandex/YandexVault.kt
View File

@@ -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

2
domain-vault/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt
View File

@@ -1,4 +1,4 @@
package com.github.nullptroma.wallenc.infrastructure
package com.github.nullptroma.wallenc.domain.vault
import org.junit.Test

2
infrastructure-android/build.gradle.kts
View File

@@ -4,7 +4,7 @@ plugins {
}
android {
namespace = "com.github.nullptroma.wallenc.infrastructure.android"
namespace = "com.github.nullptroma.wallenc.domain.vault.android"
compileSdk = 37
defaultConfig {

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/RoomFactory.kt
View File

@@ -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 {

18
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/AppDb.kt
View File

@@ -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

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageKeyMapDao.kt
View File

@@ -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 {

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageMetaInfoDao.kt
View File

@@ -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

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/StorageSyncGroupDao.kt
View File

@@ -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 {

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/dao/YandexAccountDao.kt
View File

@@ -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

4
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageKeyMap.kt
View File

@@ -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

2
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageMetaInfo.kt
View File

@@ -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

2
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbStorageSyncGroup.kt
View File

@@ -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

2
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/model/DbYandexAccount.kt
View File

@@ -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

10
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageKeyMapRepository.kt
View File

@@ -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

8
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageMetaInfoRepository.kt
View File

@@ -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

8
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/StorageSyncGroupRepository.kt
View File

@@ -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

10
infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/db/app/repository/YandexAccountRepository.kt
View File

@@ -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