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-17 19:27:15 +03:00
parent 3820a60d2c
commit 7d5fd1b634
17 changed files with 114 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ import kotlinx.serialization.json.JsonPrimitive
import kotlinx.serialization.json.buildJsonArray
import kotlinx.serialization.json.buildJsonObject
import kotlinx.serialization.json.contentOrNull
import kotlinx.serialization.json.jsonArray
import kotlinx.serialization.json.jsonPrimitive
import java.util.UUID
@@ -33,10 +32,10 @@ class ManageTextSecretsUseCase {
storage.accessor.filesUpdates
.filter { page ->
page.data.any { file ->
domainFilePathEquals(file.metaInfo.path, StorageDomainDataFiles.TEXT_SECRETS_FILE)
domainFilePathEquals(file.metaInfo.path)
}
}
.map { Unit },
.map {},
).map {
mutex.withLock { readAll(storage) }
}.distinctUntilChanged()
@@ -155,6 +154,6 @@ class ManageTextSecretsUseCase {
}
}
private fun domainFilePathEquals(left: String, right: String): Boolean =
left.trimStart('/') == right.trimStart('/')
private fun domainFilePathEquals(path: String): Boolean =
path.trimStart('/') == StorageDomainDataFiles.TEXT_SECRETS_FILE.trimStart('/')
}

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

@@ -29,10 +29,10 @@ class ManageTwoFaTokensUseCase {
storage.accessor.filesUpdates
.filter { page ->
page.data.any { file ->
domainFilePathEquals(file.metaInfo.path, StorageDomainDataFiles.TWO_FA_TOKENS_FILE)
domainFilePathEquals(file.metaInfo.path)
}
}
.map { Unit },
.map {},
).map {
mutex.withLock { readAll(storage) }
}.distinctUntilChanged()
@@ -153,6 +153,6 @@ class ManageTwoFaTokensUseCase {
}
}
private fun domainFilePathEquals(left: String, right: String): Boolean =
left.trimStart('/') == right.trimStart('/')
private fun domainFilePathEquals(path: String): Boolean =
path.trimStart('/') == StorageDomainDataFiles.TWO_FA_TOKENS_FILE.trimStart('/')
}

2
usecases/src/test/java/com/github/nullptroma/wallenc/usecases/StorageDomainUseCasesTest.kt
View File

@@ -138,7 +138,7 @@ private class FakeStorage : IStorage {
private class FakeMetaInfo : IStorageMetaInfo {
override val encInfo: StorageEncryptionInfo? = null
override val name: String? = "Fake"
override val name: String = "Fake"
override val lastModified: Instant = Instant.now()
}