nicolabs/Android-Password-Store
1
0
Fork 0
mirror of https://github.com/android-password-store/Android-Password-Store.git synced 2026-05-03 20:15:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: part 1 of NIO bugfixing

Browse source
This commit is contained in:
Harsh Shandilya 2024-06-17 12:48:51 +05:30
parent 0f7405a91a
commit 9de25f751c
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/app/passwordstore/data/password/PasswordItem.kt
View file

@ -11,6 +11,7 @@ import app.passwordstore.ui.crypto.BasePGPActivity
import app.passwordstore.ui.main.LaunchActivity
import java.nio.file.Path
import kotlin.io.path.absolutePathString
import kotlin.io.path.name
import kotlin.io.path.nameWithoutExtension
import kotlin.io.path.pathString
import kotlin.io.path.relativeTo
@ -24,7 +25,7 @@ data class PasswordItem(
val name = file.nameWithoutExtension
val fullPathToParent = file.relativeTo(rootDir).parent.pathString
val fullPathToParent = file.absolutePathString().replace(rootDir.absolutePathString(), "").replace(file.name, "")
val longName =
BasePGPActivity.getLongName(fullPathToParent, rootDir.absolutePathString(), toString())

4
app/src/main/java/app/passwordstore/ui/crypto/BasePGPActivity.kt
View file

@ -161,8 +161,10 @@ open class BasePGPActivity : AppCompatActivity() {
*/
fun getPGPIdentifiers(subDir: String): List<PGPIdentifier>? {
val repoRoot = PasswordRepository.getRepositoryDirectory()
// This should ideally be `repoRoot.resolve(subDir)` but for some reason doing that returns `/subDir` as the path
// which doesn't work inside `findTillRoot`, so we're doing this manual dance.
val gpgIdentifierFile =
repoRoot.resolve(subDir).findTillRoot(".gpg-id", repoRoot)
Paths.get(repoRoot.absolutePathString(), subDir).findTillRoot(".gpg-id", repoRoot)
?: repoRoot.resolve(".gpg-id").createFile()
val gpgIdentifiers =
gpgIdentifierFile