diff options
| author | Harsh Shandilya <msfjarvis@gmail.com> | 2020-08-27 14:27:55 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-27 14:27:55 +0530 |
| commit | 1ce3ef4ea3c55d4a6c4a79f8a6cca58387b240df (patch) | |
| tree | 6e9fbf27c8528637857d358fa9f4b21e96132ef3 /app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt | |
| parent | 8ec3320df793b58d20f632038b0b2a37f37103e3 (diff) | |
| download | HardenedPass-1ce3ef4ea3c55d4a6c4a79f8a6cca58387b240df.tar.gz HardenedPass-1ce3ef4ea3c55d4a6c4a79f8a6cca58387b240df.zip | |
Expand show hidden folders to also cover files (#1059)
* PasswordItem: only strip .gpg suffixes
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Add preference key and migration for showing all hidden contents
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Allow showing both hidden files and directories
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Add tests for hidden folder setting migration
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Add changelog entry
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Slightly improve migration logic
Skip migration if old key is not found and always delete the previous key even if its set to false.
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Tweak wording
Suggested-by: Fabian Henneke <fabian@henneke.me>
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
* Assert previous key's removal in tests
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
Diffstat (limited to 'app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt')
| -rw-r--r-- | app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt b/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt index 0509a3dd..6da5de7a 100644 --- a/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt +++ b/app/src/main/java/com/zeapo/pwdstore/SearchableRepositoryViewModel.kt @@ -94,7 +94,7 @@ private fun PasswordItem.Companion.makeComparator( PasswordRepository.PasswordSortOrder.FOLDER_FIRST -> compareBy { it.type } // In order to let INDEPENDENT not distinguish between items based on their type, we simply // declare them all equal at this stage. - PasswordRepository.PasswordSortOrder.INDEPENDENT -> Comparator<PasswordItem> { _, _ -> 0 } + PasswordRepository.PasswordSortOrder.INDEPENDENT -> Comparator { _, _ -> 0 } PasswordRepository.PasswordSortOrder.FILE_FIRST -> compareByDescending { it.type } PasswordRepository.PasswordSortOrder.RECENTLY_USED -> PasswordRepository.PasswordSortOrder.RECENTLY_USED.comparator } @@ -140,8 +140,8 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel private val root get() = PasswordRepository.getRepositoryDirectory() private val settings by lazy { application.sharedPrefs } - private val showHiddenDirs - get() = settings.getBoolean(PreferenceKeys.SHOW_HIDDEN_FOLDERS, false) + private val showHiddenContents + get() = settings.getBoolean(PreferenceKeys.SHOW_HIDDEN_CONTENTS, false) private val defaultSearchMode get() = if (settings.getBoolean(PreferenceKeys.FILTER_RECURSIVELY, true)) { SearchMode.RecursivelyInSubdirectories @@ -254,8 +254,9 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel }.asLiveData(Dispatchers.IO) private fun shouldTake(file: File) = with(file) { + if (showHiddenContents) return true if (isDirectory) { - !isHidden || showHiddenDirs + !isHidden } else { !isHidden && file.extension == "gpg" } |