kumi/Android-Password-Store
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Ensure that we have a single /

Browse source
This commit is contained in:
Mohamed Zenadi 2017-08-02 00:48:45 +01:00 committed by Mohamed Zenadi
parent f80d13a5b3
commit 09480d9390
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
app/src/androidTest/java/com/zeapo/pwdstore/DecryptTest.kt
View file

@ -56,12 +56,19 @@ class DecryptTest {
@Test
fun pathShouldDecompose() {
init()
val pathOne = "/fake/path/cat1/n1.gpg".replace("//", "/")
val pathTwo = "/fake/path/n2.gpg".replace("//", "/")
assertEquals("/category/sub.gpg", PgpActivity.getRelativePath(path, repoPath))
assertEquals("/category/", PgpActivity.getParentPath(path, repoPath))
assertEquals("sub", PgpActivity.getName(path, repoPath))
assertEquals("sub", PgpActivity.getName(path, "$repoPath/"))
assertEquals("/cat1/n1.gpg", PgpActivity.getRelativePath(pathOne, "/fake/path"))
assertEquals("/cat1/", PgpActivity.getParentPath(pathOne, "/fake/path"))
assertEquals("n1", PgpActivity.getName(pathOne, "/fake/path"))
// test that even if we append a `/` it still works
assertEquals("n1", PgpActivity.getName(pathOne, "/fake/path/"))
assertEquals("/n2.gpg", PgpActivity.getRelativePath(pathTwo, "/fake/path"))
assertEquals("/", PgpActivity.getParentPath(pathTwo, "/fake/path"))
assertEquals("n2", PgpActivity.getName(pathTwo, "/fake/path"))
assertEquals("n2", PgpActivity.getName(pathTwo, "/fake/path/"))
}
@Test

4
app/src/main/java/com/zeapo/pwdstore/crypto/PgpActivity.kt
View file

@ -570,7 +570,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
* Gets the relative path to the repository
*/
fun getRelativePath(fullPath: String, repositoryPath: String): String =
fullPath.replace(repositoryPath, "").replace("//", "/")
fullPath.replace(repositoryPath, "").replace("/+".toRegex(), "/")
/**
* Gets the Parent path, relative to the repository
@ -578,7 +578,7 @@ class PgpActivity : AppCompatActivity(), OpenPgpServiceConnection.OnBound {
fun getParentPath(fullPath: String, repositoryPath: String) : String {
val relativePath = getRelativePath(fullPath, repositoryPath)
val index = relativePath.lastIndexOf("/")
return "/${relativePath.substring(startIndex = 0, endIndex = index + 1)}/".replace("//", "/")
return "/${relativePath.substring(startIndex = 0, endIndex = index + 1)}/".replace("/+".toRegex(), "/")
}
/**