aboutsummaryrefslogtreecommitdiffstats
path: root/app/src
diff options
context:
space:
mode:
Diffstat (limited to 'app/src')
-rw-r--r--app/src/main/java/app/passwordstore/util/extensions/Extensions.kt5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt b/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt
index 55a6276e..597a286f 100644
--- a/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt
+++ b/app/src/main/java/app/passwordstore/util/extensions/Extensions.kt
@@ -33,10 +33,11 @@ fun File.contains(other: File): Boolean {
/**
* Checks if this [File] is in the password repository directory as given by
- * [PasswordRepository.getRepositoryDirectory]
+ * [PasswordRepository.getRepositoryDirectory]. Compares whole path components, so a sibling such as
+ * `store-evil` is not inside `store`.
*/
fun File.isInsideRepository(): Boolean {
- return canonicalPath.contains(PasswordRepository.getRepositoryDirectory().canonicalPath)
+ return canonicalFile.startsWith(PasswordRepository.getRepositoryDirectory().canonicalFile)
}
/** Recursively lists the files in this [File], skipping any directories it encounters. */