Большая реструктуризация проекта

app/build.gradle.kts

@@ -75,7 +75,10 @@ dependencies {
     androidTestImplementation(libs.androidx.espresso.core)
 
     implementation(project(":domain"))
-    implementation(project(":data"))
-    implementation(project(":presentation"))
-    implementation(project(":vault-api"))
+    implementation(project(":usecases"))
+    implementation(project(":domain-storage"))
+    implementation(project(":infrastructure-android"))
+    implementation(project(":task-runtime"))
+    implementation(project(":ui"))
+    implementation(project(":vault-contracts"))
 }

app/src/main/java/com/github/nullptroma/wallenc/app/MainActivity.kt

@@ -10,7 +10,7 @@ import androidx.activity.enableEdgeToEdge
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import com.github.nullptroma.wallenc.app.auth.YandexSignInService
-import com.github.nullptroma.wallenc.presentation.WallencUi
+import com.github.nullptroma.wallenc.ui.WallencUi
 import dagger.hilt.android.AndroidEntryPoint
 import timber.log.Timber
 import javax.inject.Inject

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

@@ -3,10 +3,10 @@ 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.data.vaults.yandex.YandexRegistration
-import com.github.nullptroma.wallenc.vaultapi.CloudBrand
-import com.github.nullptroma.wallenc.vaultapi.RemoteVaultAuthenticator
-import com.github.nullptroma.wallenc.vaultapi.VaultLinkOutcome
+import com.github.nullptroma.wallenc.infrastructure.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
 import com.yandex.authsdk.YandexAuthLoginOptions
 import com.yandex.authsdk.YandexAuthOptions
 import com.yandex.authsdk.YandexAuthResult

app/src/main/java/com/github/nullptroma/wallenc/app/di/modules/auth/YandexAuthModule.kt

@@ -1,7 +1,7 @@
 package com.github.nullptroma.wallenc.app.di.modules.auth
 
 import com.github.nullptroma.wallenc.app.auth.YandexSignInService
-import com.github.nullptroma.wallenc.vaultapi.RemoteVaultAuthenticator
+import com.github.nullptroma.wallenc.vault.contract.RemoteVaultAuthenticator
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn

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

@@ -1,11 +1,11 @@
 package com.github.nullptroma.wallenc.app.di.modules.data
 
 import android.content.Context
-import com.github.nullptroma.wallenc.data.db.RoomFactory
-import com.github.nullptroma.wallenc.data.db.app.IAppDb
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageKeyMapDao
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageMetaInfoDao
-import com.github.nullptroma.wallenc.data.db.app.dao.YandexAccountDao
+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.YandexAccountDao
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

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

@@ -2,23 +2,28 @@ 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.data.db.app.dao.StorageKeyMapDao
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageMetaInfoDao
-import com.github.nullptroma.wallenc.data.db.app.dao.YandexAccountDao
-import com.github.nullptroma.wallenc.data.db.app.repository.StorageKeyMapRepository
-import com.github.nullptroma.wallenc.data.db.app.repository.StorageMetaInfoRepository
-import com.github.nullptroma.wallenc.data.db.app.repository.YandexAccountRepository
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskApiFactory
-import com.github.nullptroma.wallenc.data.network.yandexdisk.repository.YandexDiskRepositoryFactory
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.YandexUserInfoApi
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.YandexUserInfoApiFactory
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.repository.YandexUserInfoRepository
-import com.github.nullptroma.wallenc.data.tasks.TaskOrchestrator
-import com.github.nullptroma.wallenc.data.vaults.VaultsManager
+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.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.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.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.infrastructure.vaults.local.LocalVaultIdStore
 import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
+import com.github.nullptroma.wallenc.domain.interfaces.IVault
 import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistrar
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistrar
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
@@ -43,10 +48,10 @@ class SingletonModule {
     @Provides
     @Singleton
     fun provideYandexDiskApiFactory(
-        yandexAccountRepository: YandexAccountRepository,
+        yandexAccountStore: YandexAccountStore,
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
     ): YandexDiskApiFactory = YandexDiskApiFactory(
-        accountRepository = yandexAccountRepository,
+        accountRepository = yandexAccountStore,
         ioDispatcher = ioDispatcher,
     )
 
@@ -64,22 +69,33 @@ class SingletonModule {
     @Singleton
     fun provideVaultsManager(
         @IoDispatcher ioDispatcher: CoroutineDispatcher,
-        @ApplicationContext context: Context,
-        keyRepo: StorageKeyMapRepository,
-        yandexAccountRepository: YandexAccountRepository,
+        localVault: IVault,
+        keyRepo: StorageKeyMapStore,
+        yandexAccountStore: YandexAccountStore,
         yandexUserInfoRepository: YandexUserInfoRepository,
         yandexDiskRepositoryFactory: YandexDiskRepositoryFactory,
     ): VaultsManager {
         return VaultsManager(
             ioDispatcher = ioDispatcher,
-            context = context,
+            localVault = localVault,
             keyRepo = keyRepo,
-            yandexAccountRepository = yandexAccountRepository,
+            yandexAccountStore = yandexAccountStore,
             yandexUserInfoRepository = yandexUserInfoRepository,
             yandexDiskRepositoryFactory = yandexDiskRepositoryFactory,
         )
     }
 
+    @Provides
+    @Singleton
+    fun provideLocalVault(
+        @IoDispatcher ioDispatcher: CoroutineDispatcher,
+        @ApplicationContext context: Context,
+    ): IVault = LocalVault(
+        ioDispatcher = ioDispatcher,
+        context = context,
+        idStore = LocalVaultIdStore(context),
+    )
+
     @Provides
     @Singleton
     fun provideIVaultsManager(impl: VaultsManager): IVaultsManager = impl
@@ -104,6 +120,12 @@ class SingletonModule {
         return StorageKeyMapRepository(dao, ioDispatcher)
     }
 
+    @Provides
+    @Singleton
+    fun provideStorageKeyMapStore(
+        impl: StorageKeyMapRepository,
+    ): StorageKeyMapStore = impl
+
     @Provides
     @Singleton
     fun provideStorageMetaInfoRepository(
@@ -122,6 +144,12 @@ class SingletonModule {
         return YandexAccountRepository(dao, ioDispatcher)
     }
 
+    @Provides
+    @Singleton
+    fun provideYandexAccountStore(
+        impl: YandexAccountRepository,
+    ): YandexAccountStore = impl
+
     @Provides
     @Singleton
     fun provideYandexUserInfoRepository(

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

@@ -2,12 +2,12 @@ package com.github.nullptroma.wallenc.app.di.modules.domain
 
 import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
 import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
-import com.github.nullptroma.wallenc.domain.usecases.GetOpenedStoragesUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageStoragesEncryptionUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageVaultUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RemoveStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RenameStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.StorageFileManagementUseCase
+import com.github.nullptroma.wallenc.usecases.GetOpenedStoragesUseCase
+import com.github.nullptroma.wallenc.usecases.ManageStoragesEncryptionUseCase
+import com.github.nullptroma.wallenc.usecases.ManageVaultUseCase
+import com.github.nullptroma.wallenc.usecases.RemoveStorageUseCase
+import com.github.nullptroma.wallenc.usecases.RenameStorageUseCase
+import com.github.nullptroma.wallenc.usecases.StorageFileManagementUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

data/src/main/java/com/github/nullptroma/wallenc/data/db/app/repository/StorageKeyMapRepository.kt

@@ -1,23 +0,0 @@
-package com.github.nullptroma.wallenc.data.db.app.repository
-
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageKeyMapDao
-import com.github.nullptroma.wallenc.data.db.app.model.DbStorageKeyMap
-import com.github.nullptroma.wallenc.data.model.StorageKeyMap
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.withContext
-
-class StorageKeyMapRepository(
-    private val dao: StorageKeyMapDao,
-    private val ioDispatcher: CoroutineDispatcher
-) {
-    suspend fun getAll() = withContext(ioDispatcher) { dao.getAll().map { it.toModel() } }
-    suspend fun add(vararg keymaps: StorageKeyMap) = withContext(ioDispatcher)  {
-        val dbModels = keymaps.map { DbStorageKeyMap.fromModel(it) }
-        dao.add(*dbModels.toTypedArray())
-    }
-
-    suspend fun delete(vararg keymaps: StorageKeyMap) = withContext(ioDispatcher)  {
-        val dbModels = keymaps.map { DbStorageKeyMap.fromModel(it) }
-        dao.delete(*dbModels.toTypedArray())
-    }
-}

data/src/main/java/com/github/nullptroma/wallenc/data/db/app/repository/YandexAccountRepository.kt

@@ -1,35 +0,0 @@
-package com.github.nullptroma.wallenc.data.db.app.repository
-
-import com.github.nullptroma.wallenc.data.db.app.dao.YandexAccountDao
-import com.github.nullptroma.wallenc.data.db.app.model.DbYandexAccount
-import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.withContext
-
-class YandexAccountRepository(
-    private val dao: YandexAccountDao,
-    private val ioDispatcher: CoroutineDispatcher
-) {
-    fun observeAll(): Flow<List<DbYandexAccount>> = dao.observeAll()
-
-    suspend fun getByYandexUserId(id: String): DbYandexAccount? = withContext(ioDispatcher) {
-        dao.getByYandexUserId(id)
-    }
-
-    suspend fun getByVaultUuid(vaultUuid: String): DbYandexAccount? = withContext(ioDispatcher) {
-        dao.getByVaultUuid(vaultUuid)
-    }
-
-    suspend fun insert(account: DbYandexAccount) = withContext(ioDispatcher) {
-        dao.insert(account)
-    }
-
-    suspend fun updateCredentials(vaultUuid: String, email: String, token: String) =
-        withContext(ioDispatcher) {
-            dao.updateCredentials(vaultUuid, email, token)
-        }
-
-    suspend fun deleteByVaultUuid(vaultUuid: String) = withContext(ioDispatcher) {
-        dao.deleteByVaultUuid(vaultUuid)
-    }
-}

domain-storage/build.gradle.kts

@@ -0,0 +1,27 @@
+plugins {
+    id("java-library")
+    alias(libs.plugins.jetbrains.kotlin.jvm)
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+dependencies {
+    // jackson
+    implementation(libs.jackson.module.kotlin)
+    implementation(libs.jackson.datatype.jsr310)
+
+    // Retrofit
+    implementation(libs.retrofit)
+    implementation(libs.retrofit.converter.scalars)
+    implementation(libs.retrofit.converter.jackson)
+
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation(libs.kotlinx.coroutines.core)
+
+    testImplementation(libs.junit)
+
+    implementation(project(":domain"))
+    implementation(project(":vault-contracts"))
+}

domain-storage/src/androidTest/java/com/github/nullptroma/wallenc/infrastructure/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation
+package com.github.nullptroma.wallenc.infrastructure
 
 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.presentation.test", appContext.packageName)
+        assertEquals("com.github.nullptroma.wallenc.infrastructure.test", appContext.packageName)
     }
 }

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/auth/YandexOAuthScopes.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.auth
+package com.github.nullptroma.wallenc.infrastructure.auth
 
 /**
  * Scope-ы Яндекс.OAuth, которые нам нужны: только app_folder + disk.info.

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/StorageKeyMap.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.model
+package com.github.nullptroma.wallenc.infrastructure.model
 
 import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
 import java.util.UUID

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/model/YandexAccount.kt

@@ -0,0 +1,8 @@
+package com.github.nullptroma.wallenc.infrastructure.model
+
+data class YandexAccount(
+    val vaultUuid: String,
+    val yandexUserId: String,
+    val email: String,
+    val oauthToken: String,
+)

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApi.kt

@@ -1,10 +1,10 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk
 
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.CustomPropertiesPatchDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.DiskInfoDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.LinkDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.OperationStatusDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.ResourceDto
+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 okhttp3.ResponseBody
 import retrofit2.Response
 import retrofit2.http.Body

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskApiFactory.kt

@@ -1,7 +1,7 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.nullptroma.wallenc.data.db.app.repository.YandexAccountRepository
+import com.github.nullptroma.wallenc.infrastructure.ports.YandexAccountStore
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.runBlocking
 import okhttp3.OkHttpClient
@@ -14,7 +14,7 @@ import java.util.UUID
  * плюс «голый» клиент для PUT/GET по одноразовым upload/download URL.
  */
 class YandexDiskApiFactory(
-    private val accountRepository: YandexAccountRepository,
+    private val accountRepository: YandexAccountStore,
     private val ioDispatcher: CoroutineDispatcher,
 ) {
 

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/YandexDiskExceptions.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk
 
 import java.io.IOException
 

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/dto/YandexDiskDto.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk.dto
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.dto
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepository.kt

@@ -1,16 +1,15 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk.repository
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository
 
-import android.util.Log
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import com.fasterxml.jackson.module.kotlin.readValue
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskApi
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskAuthException
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.CustomPropertiesPatchDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.DiskInfoDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.EmbeddedResourceListDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.LinkDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.OperationStatusDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.ResourceDto
+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 kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.withContext
@@ -181,14 +180,10 @@ class YandexDiskRepository(
         } catch (e: HttpException) {
             when (e.code()) {
                 401 -> {
-                    Log.w(TAG, "Disk API 401: ${e.message()}")
                     throw YandexDiskAuthException(e.message())
                 }
                 404 -> throw e
-                else -> {
-                    Log.w(TAG, "Disk API HTTP ${e.code()}: ${e.message()}")
-                    throw e
-                }
+                else -> throw e
             }
         }
     }
@@ -202,7 +197,6 @@ class YandexDiskRepository(
         jackson.readValue(body.string())
 
     companion object {
-        private const val TAG = "YandexDiskRepo"
         private val jackson = jacksonObjectMapper().apply { findAndRegisterModules() }
         private val OCTET_STREAM = "application/octet-stream".toMediaType()
         private const val OPERATION_POLL_DELAY_MS = 300L

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexdisk/repository/YandexDiskRepositoryFactory.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.data.network.yandexdisk.repository
+package com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.repository
 
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskApiFactory
+import com.github.nullptroma.wallenc.infrastructure.network.yandexdisk.YandexDiskApiFactory
 import kotlinx.coroutines.CoroutineDispatcher
 import java.util.UUID
 

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApi.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.network.yandexuserinfo
+package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo
 
 import retrofit2.http.GET
 import retrofit2.http.Header

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoApiFactory.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.network.yandexuserinfo
+package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
 import retrofit2.Retrofit

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/YandexUserInfoDto.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.network.yandexuserinfo
+package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/network/yandexuserinfo/repository/YandexUserInfoRepository.kt

@@ -1,7 +1,7 @@
-package com.github.nullptroma.wallenc.data.network.yandexuserinfo.repository
+package com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.repository
 
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.YandexUserInfoApi
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.YandexUserInfoDto
+import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoApi
+import com.github.nullptroma.wallenc.infrastructure.network.yandexuserinfo.YandexUserInfoDto
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/StorageKeyMapStore.kt

@@ -0,0 +1,9 @@
+package com.github.nullptroma.wallenc.infrastructure.ports
+
+import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap
+
+interface StorageKeyMapStore {
+    suspend fun add(value: StorageKeyMap)
+    suspend fun getAll(): List<StorageKeyMap>
+    suspend fun delete(vararg values: StorageKeyMap)
+}

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/ports/YandexAccountStore.kt

@@ -0,0 +1,13 @@
+package com.github.nullptroma.wallenc.infrastructure.ports
+
+import com.github.nullptroma.wallenc.infrastructure.model.YandexAccount
+import kotlinx.coroutines.flow.Flow
+
+interface YandexAccountStore {
+    fun observeAll(): Flow<List<YandexAccount>>
+    suspend fun getByYandexUserId(id: String): YandexAccount?
+    suspend fun getByVaultUuid(vaultUuid: String): YandexAccount?
+    suspend fun insert(account: YandexAccount)
+    suspend fun updateCredentials(vaultUuid: String, email: String, token: String)
+    suspend fun deleteByVaultUuid(vaultUuid: String)
+}

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/UnlockManager.kt

@@ -1,8 +1,8 @@
-package com.github.nullptroma.wallenc.data.storages
+package com.github.nullptroma.wallenc.infrastructure.storages
 
-import com.github.nullptroma.wallenc.data.db.app.repository.StorageKeyMapRepository
-import com.github.nullptroma.wallenc.data.model.StorageKeyMap
-import com.github.nullptroma.wallenc.data.storages.encrypt.EncryptedStorage
+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.datatypes.EncryptKey
 import com.github.nullptroma.wallenc.domain.encrypt.Encryptor
 import com.github.nullptroma.wallenc.domain.interfaces.IStorage
@@ -21,7 +21,7 @@ import java.security.MessageDigest
 import java.util.UUID
 
 class UnlockManager(
-    private val keymapRepository: StorageKeyMapRepository,
+    private val keymapRepository: StorageKeyMapStore,
     private val ioDispatcher: CoroutineDispatcher,
     vaultsManager: IVaultsManager
 ) : IUnlockManager {

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/common/BaseStorage.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.storages.common
+package com.github.nullptroma.wallenc.infrastructure.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.data.storages.encrypt.EncryptedStorage]
+     * именами файлов (например, [com.github.nullptroma.wallenc.infrastructure.storages.encrypt.EncryptedStorage]
      * раньше использовал первые 8 символов).
      */
     protected open fun metaInfoUuidPart(): String = uuid.toString()

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorage.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.data.storages.encrypt
+package com.github.nullptroma.wallenc.infrastructure.storages.encrypt
 
-import com.github.nullptroma.wallenc.data.storages.common.BaseStorage
+import com.github.nullptroma.wallenc.infrastructure.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

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/encrypt/EncryptedStorageAccessor.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.data.storages.encrypt
+package com.github.nullptroma.wallenc.infrastructure.storages.encrypt
 
-import com.github.nullptroma.wallenc.data.utils.CloseHandledStreamExtension.Companion.onClosing
+import com.github.nullptroma.wallenc.infrastructure.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

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorage.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.data.storages.local
+package com.github.nullptroma.wallenc.infrastructure.storages.local
 
-import com.github.nullptroma.wallenc.data.storages.common.BaseStorage
+import com.github.nullptroma.wallenc.infrastructure.storages.common.BaseStorage
 import com.github.nullptroma.wallenc.domain.interfaces.IStorageAccessor
 import kotlinx.coroutines.CoroutineDispatcher
 import java.util.UUID

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/local/LocalStorageAccessor.kt

@@ -1,9 +1,9 @@
-package com.github.nullptroma.wallenc.data.storages.local
+package com.github.nullptroma.wallenc.infrastructure.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.data.utils.CloseHandledStreamExtension.Companion.onClosed
+import com.github.nullptroma.wallenc.infrastructure.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

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorage.kt

@@ -1,8 +1,8 @@
-package com.github.nullptroma.wallenc.data.storages.yandex
+package com.github.nullptroma.wallenc.infrastructure.storages.yandex
 
-import com.github.nullptroma.wallenc.data.network.yandexdisk.repository.YandexDiskRepository
-import com.github.nullptroma.wallenc.data.storages.common.BaseStorage
-import com.github.nullptroma.wallenc.data.storages.local.LocalStorage
+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.interfaces.IStorageAccessor
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/storages/yandex/YandexStorageAccessor.kt

@@ -1,9 +1,9 @@
-package com.github.nullptroma.wallenc.data.storages.yandex
+package com.github.nullptroma.wallenc.infrastructure.storages.yandex
 
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskAuthException
-import com.github.nullptroma.wallenc.data.network.yandexdisk.dto.ResourceDto
-import com.github.nullptroma.wallenc.data.network.yandexdisk.repository.YandexDiskRepository
-import com.github.nullptroma.wallenc.data.utils.CloseHandledStreamExtension.Companion.onClosed
+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.repository.YandexDiskRepository
+import com.github.nullptroma.wallenc.infrastructure.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
@@ -23,7 +23,6 @@ import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.stateIn
-import android.util.Log
 import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withContext
 import java.io.ByteArrayOutputStream
@@ -73,15 +72,12 @@ class YandexStorageAccessor(
         try {
             scanSizeAndNumOfFiles()
             _storageReady.value = true
-            Log.d(TAG, "init ok storageUuid=$storageUuid")
         } catch (e: YandexDiskAuthException) {
             reportAuthFailure()
             _storageReady.value = false
-            Log.w(TAG, "init auth failed storageUuid=$storageUuid", e)
             throw e
         } catch (e: Exception) {
             _storageReady.value = false
-            Log.w(TAG, "init failed storageUuid=$storageUuid", e)
             throw Exception("Yandex storage init failed", e)
         }
     }
@@ -436,7 +432,6 @@ class YandexStorageAccessor(
     }
 
     companion object {
-        private const val TAG = "YandexStorageAcc"
         private const val SYSTEM_HIDDEN_DIRNAME = "wallenc-yandex-system"
         private const val DATA_PAGE_LENGTH = 10
         private const val API_LIST_LIMIT = 200

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/CloseHandledStream.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.utils
+package com.github.nullptroma.wallenc.infrastructure.utils
 
 import java.io.InputStream
 import java.io.OutputStream

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/utils/IProvider.kt

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

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/VaultsManager.kt

@@ -1,22 +1,19 @@
-package com.github.nullptroma.wallenc.data.vaults
+package com.github.nullptroma.wallenc.infrastructure.vaults
 
-import android.content.Context
-import com.github.nullptroma.wallenc.data.db.app.model.DbYandexAccount
-import com.github.nullptroma.wallenc.data.db.app.repository.StorageKeyMapRepository
-import com.github.nullptroma.wallenc.data.db.app.repository.YandexAccountRepository
-import com.github.nullptroma.wallenc.data.network.yandexdisk.repository.YandexDiskRepositoryFactory
-import com.github.nullptroma.wallenc.data.network.yandexuserinfo.repository.YandexUserInfoRepository
-import com.github.nullptroma.wallenc.data.storages.UnlockManager
-import com.github.nullptroma.wallenc.data.vaults.local.LocalVault
-import com.github.nullptroma.wallenc.data.vaults.local.LocalVaultIdStore
-import com.github.nullptroma.wallenc.data.vaults.yandex.YandexRegistration
-import com.github.nullptroma.wallenc.data.vaults.yandex.YandexVault
+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.interfaces.IStorage
 import com.github.nullptroma.wallenc.domain.interfaces.IUnlockManager
 import com.github.nullptroma.wallenc.domain.interfaces.IVault
 import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistrar
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistration
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistrar
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistration
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -34,22 +31,18 @@ import java.util.UUID
 @OptIn(ExperimentalCoroutinesApi::class)
 class VaultsManager(
     private val ioDispatcher: CoroutineDispatcher,
-    context: Context,
-    keyRepo: StorageKeyMapRepository,
-    private val yandexAccountRepository: YandexAccountRepository,
+    localVault: IVault,
+    keyRepo: StorageKeyMapStore,
+    private val yandexAccountStore: YandexAccountStore,
     private val yandexUserInfoRepository: YandexUserInfoRepository,
     private val yandexDiskRepositoryFactory: YandexDiskRepositoryFactory,
 ) : IVaultsManager, VaultRegistrar {
 
     private val scope = CoroutineScope(SupervisorJob() + ioDispatcher)
 
-    private val localVault: IVault = LocalVault(
-        ioDispatcher = ioDispatcher,
-        context = context,
-        idStore = LocalVaultIdStore(context),
-    )
+    private val localVault: IVault = localVault
 
-    private val yandexVaults: StateFlow<List<IVault>> = yandexAccountRepository.observeAll()
+    private val yandexVaults: StateFlow<List<IVault>> = yandexAccountStore.observeAll()
         .map { rows ->
             rows.map { row ->
                 val vaultUuid = UUID.fromString(row.vaultUuid)
@@ -91,7 +84,7 @@ class VaultsManager(
     }
 
     override suspend fun unregister(vaultUuid: UUID): Unit = withContext(ioDispatcher) {
-        yandexAccountRepository.deleteByVaultUuid(vaultUuid.toString())
+        yandexAccountStore.deleteByVaultUuid(vaultUuid.toString())
     }
 
     private suspend fun registerYandex(registration: YandexRegistration) {
@@ -99,13 +92,13 @@ class VaultsManager(
         val info = yandexUserInfoRepository.userInfo(token)
         val email = info.defaultEmail?.takeIf { it.isNotBlank() }
             ?: "${info.login}@yandex.ru"
-        val existing = yandexAccountRepository.getByYandexUserId(info.id)
+        val existing = yandexAccountStore.getByYandexUserId(info.id)
         val vaultUuid = existing?.vaultUuid ?: UUID.randomUUID().toString()
         if (existing != null) {
-            yandexAccountRepository.updateCredentials(vaultUuid, email, token)
+            yandexAccountStore.updateCredentials(vaultUuid, email, token)
         } else {
-            yandexAccountRepository.insert(
-                DbYandexAccount(
+            yandexAccountStore.insert(
+                YandexAccount(
                     vaultUuid = vaultUuid,
                     yandexUserId = info.id,
                     email = email,

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexRegistration.kt

@@ -1,7 +1,7 @@
-package com.github.nullptroma.wallenc.data.vaults.yandex
+package com.github.nullptroma.wallenc.infrastructure.vaults.yandex
 
-import com.github.nullptroma.wallenc.vaultapi.CloudBrand
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistration
+import com.github.nullptroma.wallenc.vault.contract.CloudBrand
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistration
 
 /**
  * Регистрация удалённого vault'а Яндекс.Диска по результату OAuth.

domain-storage/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/yandex/YandexVault.kt

@@ -1,18 +1,17 @@
-package com.github.nullptroma.wallenc.data.vaults.yandex
+package com.github.nullptroma.wallenc.infrastructure.vaults.yandex
 
-import com.github.nullptroma.wallenc.data.network.yandexdisk.YandexDiskAuthException
-import com.github.nullptroma.wallenc.data.network.yandexdisk.repository.YandexDiskRepository
-import com.github.nullptroma.wallenc.data.storages.yandex.YandexStorage
+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.datatypes.StorageEncryptionInfo
 import com.github.nullptroma.wallenc.domain.interfaces.IStorage
-import com.github.nullptroma.wallenc.vaultapi.CloudBrand
-import com.github.nullptroma.wallenc.vaultapi.DescribedVault
-import com.github.nullptroma.wallenc.vaultapi.VaultDescriptor
+import com.github.nullptroma.wallenc.vault.contract.CloudBrand
+import com.github.nullptroma.wallenc.vault.contract.DescribedVault
+import com.github.nullptroma.wallenc.vault.contract.VaultDescriptor
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
-import android.util.Log
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import java.util.UUID
@@ -65,15 +64,12 @@ class YandexVault(
             _availableSpace.value = (total - used).coerceAtLeast(0L)
             _vaultReachable.value = true
             _storages.value = loadStoragesList()
-            Log.d(TAG, "refresh ok uuid=$uuid storages=${_storages.value.size}")
         } catch (e: YandexDiskAuthException) {
             _vaultReachable.value = false
             _storages.value = emptyList()
-            Log.w(TAG, "refresh auth failed uuid=$uuid: ${e.message}")
         } catch (e: Exception) {
             _vaultReachable.value = false
             _storages.value = emptyList()
-            Log.w(TAG, "refresh failed uuid=$uuid", e)
         }
     }
 
@@ -100,9 +96,7 @@ class YandexVault(
                 try {
                     storage.init()
                     out.add(storage)
-                } catch (e: Exception) {
-                    Log.w(TAG, "skip broken storage uuid=$storageUuid: ${e.message}")
-                }
+                } catch (_: Exception) { }
             }
             if (items.size < APP_LIST_LIMIT) break
             offset += items.size
@@ -112,7 +106,6 @@ class YandexVault(
 
     override suspend fun createStorage(): IStorage = withContext(ioDispatcher) {
         val id = UUID.randomUUID()
-        Log.d(TAG, "createStorage start vault=$uuid storage=$id")
         repo.createFolder("app:/$id")
         val storage = YandexStorage(
             uuid = id,
@@ -126,7 +119,6 @@ class YandexVault(
         )
         storage.init()
         _storages.value = _storages.value + storage
-        Log.d(TAG, "createStorage done storage=$id")
         storage
     }
 
@@ -138,13 +130,11 @@ class YandexVault(
 
     override suspend fun remove(storage: IStorage) = withContext(ioDispatcher) {
         if (storage !is YandexStorage) return@withContext
-        Log.d(TAG, "remove storage=${storage.uuid}")
         repo.delete("app:/${storage.uuid}", permanently = true)
         _storages.value = _storages.value.filter { it.uuid != storage.uuid }
     }
 
     private companion object {
-        private const val TAG = "YandexVault"
         private const val APP_LIST_LIMIT = 200
     }
 }

domain-storage/src/test/java/com/github/nullptroma/wallenc/infrastructure/ExampleUnitTest.kt

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

domain/build.gradle.kts

@@ -9,6 +9,10 @@ java {
     }
 }
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     implementation(libs.kotlinx.coroutines.core)
     testImplementation(libs.junit)

infrastructure-android/build.gradle.kts

@@ -4,13 +4,11 @@ plugins {
 }
 
 android {
-    namespace = "com.github.nullptroma.wallenc.data"
+    namespace = "com.github.nullptroma.wallenc.infrastructure.android"
     compileSdk = 37
 
     defaultConfig {
         minSdk = 26
-
-        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles("consumer-rules.pro")
     }
 
@@ -23,38 +21,27 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-}
 
-kotlin {
-    jvmToolchain(17)
 }
 
 dependencies {
-    // jackson
+    implementation(project(":domain"))
+    implementation(project(":domain-storage"))
+    implementation(project(":vault-contracts"))
+
     implementation(libs.jackson.module.kotlin)
     implementation(libs.jackson.datatype.jsr310)
+    implementation(libs.kotlinx.coroutines.core)
 
-    // Room
     implementation(libs.room.ktx)
     implementation(libs.room.runtime)
     ksp(libs.room.compiler)
 
-    // Retrofit
-    implementation(libs.retrofit)
-    implementation(libs.retrofit.converter.scalars)
-    implementation(libs.retrofit.converter.jackson)
-
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-
     implementation(libs.androidx.core.ktx)
     testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-
-    implementation(project(":domain"))
-    implementation(project(":vault-api"))
 }

infrastructure-android/src/main/AndroidManifest.xml

@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest />

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

@@ -1,8 +1,8 @@
-package com.github.nullptroma.wallenc.data.db
+package com.github.nullptroma.wallenc.infrastructure.db
 
 import android.content.Context
 import androidx.room.Room
-import com.github.nullptroma.wallenc.data.db.app.AppDb
+import com.github.nullptroma.wallenc.infrastructure.db.app.AppDb
 
 class RoomFactory(private val context: Context) {
     fun buildAppDb(): AppDb {

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

@@ -1,13 +1,13 @@
-package com.github.nullptroma.wallenc.data.db.app
+package com.github.nullptroma.wallenc.infrastructure.db.app
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageKeyMapDao
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageMetaInfoDao
-import com.github.nullptroma.wallenc.data.db.app.dao.YandexAccountDao
-import com.github.nullptroma.wallenc.data.db.app.model.DbStorageKeyMap
-import com.github.nullptroma.wallenc.data.db.app.model.DbStorageMetaInfo
-import com.github.nullptroma.wallenc.data.db.app.model.DbYandexAccount
+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.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.DbYandexAccount
 
 interface IAppDb {
     val storageKeyMapDao: StorageKeyMapDao
@@ -18,7 +18,7 @@ interface IAppDb {
 @Database(
     entities = [DbStorageKeyMap::class, DbStorageMetaInfo::class, DbYandexAccount::class],
     version = 4,
-    exportSchema = false,
+    exportSchema = false
 )
 abstract class AppDb : IAppDb, RoomDatabase() {
     abstract override val storageKeyMapDao: StorageKeyMapDao

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

@@ -1,11 +1,11 @@
-package com.github.nullptroma.wallenc.data.db.app.dao
+package com.github.nullptroma.wallenc.infrastructure.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.data.db.app.model.DbStorageKeyMap
+import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageKeyMap
 
 @Dao
 interface StorageKeyMapDao {

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

@@ -1,11 +1,11 @@
-package com.github.nullptroma.wallenc.data.db.app.dao
+package com.github.nullptroma.wallenc.infrastructure.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.data.db.app.model.DbStorageMetaInfo
+import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbStorageMetaInfo
 import kotlinx.coroutines.flow.Flow
 import java.util.UUID
 

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

@@ -1,9 +1,9 @@
-package com.github.nullptroma.wallenc.data.db.app.dao
+package com.github.nullptroma.wallenc.infrastructure.db.app.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.Query
-import com.github.nullptroma.wallenc.data.db.app.model.DbYandexAccount
+import com.github.nullptroma.wallenc.infrastructure.db.app.model.DbYandexAccount
 import kotlinx.coroutines.flow.Flow
 
 @Dao

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

@@ -1,8 +1,8 @@
-package com.github.nullptroma.wallenc.data.db.app.model
+package com.github.nullptroma.wallenc.infrastructure.db.app.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
-import com.github.nullptroma.wallenc.data.model.StorageKeyMap
+import com.github.nullptroma.wallenc.infrastructure.model.StorageKeyMap
 import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
 import java.util.UUID
 

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

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.db.app.model
+package com.github.nullptroma.wallenc.infrastructure.db.app.model
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity

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

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.db.app.model
+package com.github.nullptroma.wallenc.infrastructure.db.app.model
 
 import androidx.room.Entity
 import androidx.room.Index

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

@@ -0,0 +1,29 @@
+package com.github.nullptroma.wallenc.infrastructure.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 kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.withContext
+
+class StorageKeyMapRepository(
+    private val dao: StorageKeyMapDao,
+    private val ioDispatcher: CoroutineDispatcher
+) : StorageKeyMapStore {
+    override suspend fun getAll() = withContext(ioDispatcher) { dao.getAll().map { it.toModel() } }
+    override suspend fun add(value: StorageKeyMap) = withContext(ioDispatcher) {
+        val dbModel = DbStorageKeyMap.fromModel(value)
+        dao.add(dbModel)
+    }
+
+    suspend fun add(vararg keymaps: StorageKeyMap) = withContext(ioDispatcher) {
+        val dbModels = keymaps.map { DbStorageKeyMap.fromModel(it) }
+        dao.add(*dbModels.toTypedArray())
+    }
+
+    override suspend fun delete(vararg keymaps: StorageKeyMap) = withContext(ioDispatcher) {
+        val dbModels = keymaps.map { DbStorageKeyMap.fromModel(it) }
+        dao.delete(*dbModels.toTypedArray())
+    }
+}

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

@@ -1,9 +1,9 @@
-package com.github.nullptroma.wallenc.data.db.app.repository
+package com.github.nullptroma.wallenc.infrastructure.db.app.repository
 
 import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
-import com.github.nullptroma.wallenc.data.db.app.dao.StorageMetaInfoDao
-import com.github.nullptroma.wallenc.data.db.app.model.DbStorageMetaInfo
-import com.github.nullptroma.wallenc.data.utils.IProvider
+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.common.impl.CommonStorageMetaInfo
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.Flow

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

@@ -0,0 +1,56 @@
+package com.github.nullptroma.wallenc.infrastructure.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 kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.withContext
+
+class YandexAccountRepository(
+    private val dao: YandexAccountDao,
+    private val ioDispatcher: CoroutineDispatcher
+) : YandexAccountStore {
+    override fun observeAll(): Flow<List<YandexAccount>> = dao.observeAll().map { rows ->
+        rows.map { it.toModel() }
+    }
+
+    override suspend fun getByYandexUserId(id: String): YandexAccount? = withContext(ioDispatcher) {
+        dao.getByYandexUserId(id)?.toModel()
+    }
+
+    override suspend fun getByVaultUuid(vaultUuid: String): YandexAccount? = withContext(ioDispatcher) {
+        dao.getByVaultUuid(vaultUuid)?.toModel()
+    }
+
+    override suspend fun insert(account: YandexAccount) = withContext(ioDispatcher) {
+        dao.insert(fromModel(account))
+    }
+
+    override suspend fun updateCredentials(vaultUuid: String, email: String, token: String) =
+        withContext(ioDispatcher) {
+            dao.updateCredentials(vaultUuid, email, token)
+        }
+
+    override suspend fun deleteByVaultUuid(vaultUuid: String) = withContext(ioDispatcher) {
+        dao.deleteByVaultUuid(vaultUuid)
+    }
+
+    private fun DbYandexAccount.toModel(): YandexAccount =
+        YandexAccount(
+            vaultUuid = vaultUuid,
+            yandexUserId = yandexUserId,
+            email = email,
+            oauthToken = oauthToken,
+        )
+
+    private fun fromModel(model: YandexAccount): DbYandexAccount =
+        DbYandexAccount(
+            vaultUuid = model.vaultUuid,
+            yandexUserId = model.yandexUserId,
+            email = model.email,
+            oauthToken = model.oauthToken,
+        )
+}

infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVault.kt

@@ -1,11 +1,11 @@
-package com.github.nullptroma.wallenc.data.vaults.local
+package com.github.nullptroma.wallenc.infrastructure.vaults.local
 
 import android.content.Context
-import com.github.nullptroma.wallenc.data.storages.local.LocalStorage
+import com.github.nullptroma.wallenc.infrastructure.storages.local.LocalStorage
 import com.github.nullptroma.wallenc.domain.datatypes.StorageEncryptionInfo
 import com.github.nullptroma.wallenc.domain.interfaces.IStorage
-import com.github.nullptroma.wallenc.vaultapi.DescribedVault
-import com.github.nullptroma.wallenc.vaultapi.VaultDescriptor
+import com.github.nullptroma.wallenc.vault.contract.DescribedVault
+import com.github.nullptroma.wallenc.vault.contract.VaultDescriptor
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow

infrastructure-android/src/main/java/com/github/nullptroma/wallenc/infrastructure/vaults/local/LocalVaultIdStore.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.vaults.local
+package com.github.nullptroma.wallenc.infrastructure.vaults.local
 
 import android.content.Context
 import java.util.UUID

presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/MainScreenState.kt

@@ -1,3 +0,0 @@
-package com.github.nullptroma.wallenc.presentation.screens.main
-
-class MainScreenState

presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/remotes/RemoteVaultsRoute.kt

@@ -1,9 +0,0 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes
-
-import com.github.nullptroma.wallenc.presentation.screens.main.MainRoute
-import kotlinx.parcelize.Parcelize
-import kotlinx.serialization.Serializable
-
-@Serializable
-@Parcelize
-class RemoteVaultsRoute : MainRoute()

presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/tasks/TaskPipelineRoute.kt

@@ -1,9 +0,0 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks
-
-import com.github.nullptroma.wallenc.presentation.screens.ScreenRoute
-import kotlinx.parcelize.Parcelize
-import kotlinx.serialization.Serializable
-
-@Serializable
-@Parcelize
-class TaskPipelineRoute : ScreenRoute()

presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/main/screens/vault/LocalVaultRoute.kt

@@ -1,9 +0,0 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.vault
-
-import com.github.nullptroma.wallenc.presentation.screens.main.MainRoute
-import kotlinx.parcelize.Parcelize
-import kotlinx.serialization.Serializable
-
-@Serializable
-@Parcelize
-class LocalVaultRoute : MainRoute()

presentation/src/main/java/com/github/nullptroma/wallenc/presentation/screens/settings/SettingsScreenState.kt

@@ -1,3 +0,0 @@
-package com.github.nullptroma.wallenc.presentation.screens.settings
-
-class SettingsScreenState

settings.gradle.kts

@@ -24,7 +24,10 @@ dependencyResolutionManagement {
 
 rootProject.name = "Wallenc"
 include(":app")
-include(":data")
 include(":domain")
-include(":presentation")
-include(":vault-api")
+include(":usecases")
+include(":ui")
+include(":domain-storage")
+include(":infrastructure-android")
+include(":vault-contracts")
+include(":task-runtime")

task-runtime/build.gradle.kts

@@ -0,0 +1,20 @@
+plugins {
+    id("java-library")
+    alias(libs.plugins.jetbrains.kotlin.jvm)
+}
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
+
+kotlin {
+    jvmToolchain(17)
+}
+
+dependencies {
+    implementation(project(":domain"))
+    implementation(libs.kotlinx.coroutines.core)
+    testImplementation(libs.junit)
+}

task-runtime/src/main/java/com/github/nullptroma/wallenc/task/runtime/TaskOrchestrator.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data.tasks
+package com.github.nullptroma.wallenc.task.runtime
 
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
 import com.github.nullptroma.wallenc.domain.tasks.PipelineState
@@ -12,11 +12,11 @@ import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
 import com.github.nullptroma.wallenc.domain.tasks.TaskLogLine
 import com.github.nullptroma.wallenc.domain.tasks.TaskProgress
 import com.github.nullptroma.wallenc.domain.tasks.TaskRunState
+import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.SupervisorJob
-import kotlinx.coroutines.CancellationException
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

ui/build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
 }
 
 android {
-    namespace = "com.github.nullptroma.wallenc.presentation"
+    namespace = "com.github.nullptroma.wallenc.ui"
     compileSdk = 37
 
     defaultConfig {
@@ -79,5 +79,6 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
 
     implementation(project(":domain"))
-    implementation(project(":vault-api"))
+    implementation(project(":usecases"))
+    implementation(project(":vault-contracts"))
 }

ui/src/androidTest/java/com/github/nullptroma/wallenc/ui/ExampleInstrumentedTest.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.data
+package com.github.nullptroma.wallenc.ui
 
 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.data.test", appContext.packageName)
+        assertEquals("com.github.nullptroma.wallenc.ui.test", appContext.packageName)
     }
 }

ui/src/main/java/com/github/nullptroma/wallenc/ui/ViewModelBase.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation
+package com.github.nullptroma.wallenc.ui
 
 
 import androidx.lifecycle.ViewModel

ui/src/main/java/com/github/nullptroma/wallenc/ui/WallencUi.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation
+package com.github.nullptroma.wallenc.ui
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -25,17 +25,17 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
-import com.github.nullptroma.wallenc.presentation.navigation.NavBarItemData
-import com.github.nullptroma.wallenc.presentation.navigation.rememberNavigationState
-import com.github.nullptroma.wallenc.presentation.screens.main.MainRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.MainScreen
-import com.github.nullptroma.wallenc.presentation.screens.main.MainViewModel
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks.TaskPipelineRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks.TaskPipelineScreen
-import com.github.nullptroma.wallenc.presentation.screens.settings.SettingsRoute
-import com.github.nullptroma.wallenc.presentation.screens.settings.SettingsScreen
-import com.github.nullptroma.wallenc.presentation.screens.settings.SettingsViewModel
-import com.github.nullptroma.wallenc.presentation.theme.WallencTheme
+import com.github.nullptroma.wallenc.ui.navigation.NavBarItemData
+import com.github.nullptroma.wallenc.ui.navigation.rememberNavigationState
+import com.github.nullptroma.wallenc.ui.screens.main.MainRoute
+import com.github.nullptroma.wallenc.ui.screens.main.MainScreen
+import com.github.nullptroma.wallenc.ui.screens.main.MainViewModel
+import com.github.nullptroma.wallenc.ui.screens.main.screens.tasks.TaskPipelineRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.tasks.TaskPipelineScreen
+import com.github.nullptroma.wallenc.ui.screens.settings.SettingsRoute
+import com.github.nullptroma.wallenc.ui.screens.settings.SettingsScreen
+import com.github.nullptroma.wallenc.ui.screens.settings.SettingsViewModel
+import com.github.nullptroma.wallenc.ui.theme.WallencTheme
 
 
 @Composable

ui/src/main/java/com/github/nullptroma/wallenc/ui/WallencViewModel.kt

@@ -1,13 +1,13 @@
-package com.github.nullptroma.wallenc.presentation
+package com.github.nullptroma.wallenc.ui
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
-import com.github.nullptroma.wallenc.presentation.screens.ScreenRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.MainRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks.TaskPipelineRoute
-import com.github.nullptroma.wallenc.presentation.screens.settings.SettingsRoute
+import com.github.nullptroma.wallenc.ui.screens.ScreenRoute
+import com.github.nullptroma.wallenc.ui.screens.main.MainRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.tasks.TaskPipelineRoute
+import com.github.nullptroma.wallenc.ui.screens.settings.SettingsRoute
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlin.collections.set
 

ui/src/main/java/com/github/nullptroma/wallenc/ui/elements/Dialogs.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.elements
+package com.github.nullptroma.wallenc.ui.elements
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column

ui/src/main/java/com/github/nullptroma/wallenc/ui/elements/StorageTree.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.elements
+package com.github.nullptroma.wallenc.ui.elements
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
@@ -47,8 +47,8 @@ import androidx.compose.ui.zIndex
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.github.nullptroma.wallenc.domain.datatypes.Tree
 import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
-import com.github.nullptroma.wallenc.presentation.R
-import com.github.nullptroma.wallenc.presentation.utils.debouncedLambda
+import com.github.nullptroma.wallenc.ui.R
+import com.github.nullptroma.wallenc.ui.utils.debouncedLambda
 
 @Composable
 fun StorageTree(

ui/src/main/java/com/github/nullptroma/wallenc/ui/elements/indication/ScaleIndication.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.elements.indication
+package com.github.nullptroma.wallenc.ui.elements.indication
 
 import androidx.compose.animation.core.Animatable
 import androidx.compose.animation.core.spring

ui/src/main/java/com/github/nullptroma/wallenc/ui/extensions/Modifier.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.extensions
+package com.github.nullptroma.wallenc.ui.extensions
 
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.pointer.PointerEventPass

ui/src/main/java/com/github/nullptroma/wallenc/ui/extensions/StorageInfo.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.extensions
+package com.github.nullptroma.wallenc.ui.extensions
 
 import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
 

ui/src/main/java/com/github/nullptroma/wallenc/ui/navigation/NavBarItemData.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.navigation
+package com.github.nullptroma.wallenc.ui.navigation
 
 import androidx.compose.ui.graphics.vector.ImageVector
 

ui/src/main/java/com/github/nullptroma/wallenc/ui/navigation/NavigationState.kt

@@ -1,11 +1,11 @@
-package com.github.nullptroma.wallenc.presentation.navigation
+package com.github.nullptroma.wallenc.ui.navigation
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
-import com.github.nullptroma.wallenc.presentation.screens.ScreenRoute
+import com.github.nullptroma.wallenc.ui.screens.ScreenRoute
 
 
 class NavigationState(

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/ScreenRoute.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens
+package com.github.nullptroma.wallenc.ui.screens
 
 import android.os.Parcelable
 import kotlinx.serialization.Serializable

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainRoute.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.presentation.screens.main
+package com.github.nullptroma.wallenc.ui.screens.main
 
-import com.github.nullptroma.wallenc.presentation.screens.ScreenRoute
+import com.github.nullptroma.wallenc.ui.screens.ScreenRoute
 import kotlinx.parcelize.Parcelize
 import kotlinx.serialization.Serializable
 

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main
+package com.github.nullptroma.wallenc.ui.screens.main
 
 import androidx.compose.animation.core.tween
 import androidx.compose.animation.fadeIn
@@ -23,21 +23,21 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.toRoute
-import com.github.nullptroma.wallenc.presentation.R
-import com.github.nullptroma.wallenc.presentation.navigation.NavBarItemData
-import com.github.nullptroma.wallenc.presentation.navigation.NavigationState
-import com.github.nullptroma.wallenc.presentation.navigation.rememberNavigationState
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes.RemoteVaultsRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes.RemoteVaultsScreen
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes.RemoteVaultsViewModel
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.LocalVaultRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.LocalVaultScreen
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.LocalVaultViewModel
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.RemoteVaultViewModel
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.VaultBrowserRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.VaultBrowserScreen
-import com.github.nullptroma.wallenc.presentation.screens.shared.TextEditRoute
-import com.github.nullptroma.wallenc.presentation.screens.shared.TextEditScreen
+import com.github.nullptroma.wallenc.ui.R
+import com.github.nullptroma.wallenc.ui.navigation.NavBarItemData
+import com.github.nullptroma.wallenc.ui.navigation.NavigationState
+import com.github.nullptroma.wallenc.ui.navigation.rememberNavigationState
+import com.github.nullptroma.wallenc.ui.screens.main.screens.remotes.RemoteVaultsRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.remotes.RemoteVaultsScreen
+import com.github.nullptroma.wallenc.ui.screens.main.screens.remotes.RemoteVaultsViewModel
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.LocalVaultRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.LocalVaultScreen
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.LocalVaultViewModel
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.RemoteVaultViewModel
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.VaultBrowserRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.VaultBrowserScreen
+import com.github.nullptroma.wallenc.ui.screens.shared.TextEditRoute
+import com.github.nullptroma.wallenc.ui.screens.shared.TextEditScreen
 
 
 @OptIn(ExperimentalMaterial3Api::class)

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainScreenState.kt

@@ -0,0 +1,3 @@
+package com.github.nullptroma.wallenc.ui.screens.main
+
+class MainScreenState

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/MainViewModel.kt

@@ -1,13 +1,13 @@
-package com.github.nullptroma.wallenc.presentation.screens.main
+package com.github.nullptroma.wallenc.ui.screens.main
 
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
-import com.github.nullptroma.wallenc.presentation.screens.ScreenRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes.RemoteVaultsRoute
-import com.github.nullptroma.wallenc.presentation.screens.main.screens.vault.LocalVaultRoute
-import com.github.nullptroma.wallenc.presentation.ViewModelBase
+import com.github.nullptroma.wallenc.ui.screens.ScreenRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.remotes.RemoteVaultsRoute
+import com.github.nullptroma.wallenc.ui.screens.main.screens.vault.LocalVaultRoute
+import com.github.nullptroma.wallenc.ui.ViewModelBase
 import dagger.hilt.android.lifecycle.HiltViewModel
 
 @HiltViewModel

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/remotes/RemoteVaultsRoute.kt

@@ -0,0 +1,9 @@
+package com.github.nullptroma.wallenc.ui.screens.main.screens.remotes
+
+import com.github.nullptroma.wallenc.ui.screens.main.MainRoute
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+class RemoteVaultsRoute : MainRoute()

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/remotes/RemoteVaultsScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes
+package com.github.nullptroma.wallenc.ui.screens.main.screens.remotes
 
 import android.widget.Toast
 import androidx.compose.foundation.clickable
@@ -44,9 +44,9 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.github.nullptroma.wallenc.presentation.R
-import com.github.nullptroma.wallenc.vaultapi.CloudBrand
-import com.github.nullptroma.wallenc.vaultapi.VaultLinkOutcome
+import com.github.nullptroma.wallenc.ui.R
+import com.github.nullptroma.wallenc.vault.contract.CloudBrand
+import com.github.nullptroma.wallenc.vault.contract.VaultLinkOutcome
 
 @Composable
 fun RemoteVaultsScreen(

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/remotes/RemoteVaultsScreenState.kt

@@ -1,6 +1,6 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes
+package com.github.nullptroma.wallenc.ui.screens.main.screens.remotes
 
-import com.github.nullptroma.wallenc.vaultapi.CloudBrand
+import com.github.nullptroma.wallenc.vault.contract.CloudBrand
 import java.util.UUID
 
 data class RemoteVaultListItem(

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/remotes/RemoteVaultsViewModel.kt

@@ -1,16 +1,16 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.remotes
+package com.github.nullptroma.wallenc.ui.screens.main.screens.remotes
 
 import androidx.lifecycle.viewModelScope
 import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
 import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
-import com.github.nullptroma.wallenc.presentation.ViewModelBase
-import com.github.nullptroma.wallenc.vaultapi.RemoteVaultAuthenticator
-import com.github.nullptroma.wallenc.vaultapi.VaultDescriptor
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistrar
-import com.github.nullptroma.wallenc.vaultapi.VaultRegistration
-import com.github.nullptroma.wallenc.vaultapi.described
-import com.github.nullptroma.wallenc.vaultapi.remotes
+import com.github.nullptroma.wallenc.ui.ViewModelBase
+import com.github.nullptroma.wallenc.vault.contract.RemoteVaultAuthenticator
+import com.github.nullptroma.wallenc.vault.contract.VaultDescriptor
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistrar
+import com.github.nullptroma.wallenc.vault.contract.VaultRegistration
+import com.github.nullptroma.wallenc.vault.contract.described
+import com.github.nullptroma.wallenc.vault.contract.remotes
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.SharingStarted

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/tasks/TaskPipelineRoute.kt

@@ -0,0 +1,9 @@
+package com.github.nullptroma.wallenc.ui.screens.main.screens.tasks
+
+import com.github.nullptroma.wallenc.ui.screens.ScreenRoute
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+class TaskPipelineRoute : ScreenRoute()

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/tasks/TaskPipelineScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks
+package com.github.nullptroma.wallenc.ui.screens.main.screens.tasks
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -35,7 +35,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.github.nullptroma.wallenc.domain.tasks.PipelineTask
 import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
 import com.github.nullptroma.wallenc.domain.tasks.TaskRunState
-import com.github.nullptroma.wallenc.presentation.R
+import com.github.nullptroma.wallenc.ui.R
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/tasks/TaskPipelineViewModel.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.tasks
+package com.github.nullptroma.wallenc.ui.screens.main.screens.tasks
 
 import androidx.lifecycle.ViewModel
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/vault/AbstractVaultBrowserViewModel.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.vault
+package com.github.nullptroma.wallenc.ui.screens.main.screens.vault
 
 import androidx.lifecycle.viewModelScope
 import com.github.nullptroma.wallenc.domain.datatypes.EncryptKey
@@ -10,14 +10,14 @@ import com.github.nullptroma.wallenc.domain.interfaces.IStorage
 import com.github.nullptroma.wallenc.domain.interfaces.IStorageInfo
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
 import com.github.nullptroma.wallenc.domain.tasks.TaskLogLevel
-import com.github.nullptroma.wallenc.domain.usecases.GetOpenedStoragesUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageStoragesEncryptionUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageVaultUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RemoveStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RenameStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.StorageFileManagementUseCase
-import com.github.nullptroma.wallenc.presentation.ViewModelBase
-import com.github.nullptroma.wallenc.presentation.extensions.toPrintable
+import com.github.nullptroma.wallenc.usecases.GetOpenedStoragesUseCase
+import com.github.nullptroma.wallenc.usecases.ManageStoragesEncryptionUseCase
+import com.github.nullptroma.wallenc.usecases.ManageVaultUseCase
+import com.github.nullptroma.wallenc.usecases.RemoveStorageUseCase
+import com.github.nullptroma.wallenc.usecases.RenameStorageUseCase
+import com.github.nullptroma.wallenc.usecases.StorageFileManagementUseCase
+import com.github.nullptroma.wallenc.ui.ViewModelBase
+import com.github.nullptroma.wallenc.ui.extensions.toPrintable
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableSharedFlow

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/vault/LocalVaultRoute.kt

@@ -0,0 +1,9 @@
+package com.github.nullptroma.wallenc.ui.screens.main.screens.vault
+
+import com.github.nullptroma.wallenc.ui.screens.main.MainRoute
+import kotlinx.parcelize.Parcelize
+import kotlinx.serialization.Serializable
+
+@Serializable
+@Parcelize
+class LocalVaultRoute : MainRoute()

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/vault/LocalVaultScreen.kt

@@ -1,4 +1,4 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.vault
+package com.github.nullptroma.wallenc.ui.screens.main.screens.vault
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier

ui/src/main/java/com/github/nullptroma/wallenc/ui/screens/main/screens/vault/LocalVaultViewModel.kt

@@ -1,16 +1,16 @@
-package com.github.nullptroma.wallenc.presentation.screens.main.screens.vault
+package com.github.nullptroma.wallenc.ui.screens.main.screens.vault
 
 import com.github.nullptroma.wallenc.domain.interfaces.ILogger
 import com.github.nullptroma.wallenc.domain.interfaces.IVaultsManager
 import com.github.nullptroma.wallenc.domain.tasks.ITaskOrchestrator
-import com.github.nullptroma.wallenc.domain.usecases.GetOpenedStoragesUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageStoragesEncryptionUseCase
-import com.github.nullptroma.wallenc.domain.usecases.ManageVaultUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RemoveStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.RenameStorageUseCase
-import com.github.nullptroma.wallenc.domain.usecases.StorageFileManagementUseCase
-import com.github.nullptroma.wallenc.vaultapi.described
-import com.github.nullptroma.wallenc.vaultapi.locals
+import com.github.nullptroma.wallenc.usecases.GetOpenedStoragesUseCase
+import com.github.nullptroma.wallenc.usecases.ManageStoragesEncryptionUseCase
+import com.github.nullptroma.wallenc.usecases.ManageVaultUseCase
+import com.github.nullptroma.wallenc.usecases.RemoveStorageUseCase
+import com.github.nullptroma.wallenc.usecases.RenameStorageUseCase
+import com.github.nullptroma.wallenc.usecases.StorageFileManagementUseCase
+import com.github.nullptroma.wallenc.vault.contract.described
+import com.github.nullptroma.wallenc.vault.contract.locals
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.flatMapLatest