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

Prevent Git files from turning up in search and listing (#1582)

Browse source 
* Prevent Git files from turning up in search and listing

* Update changelog
This commit is contained in:
Harsh Shandilya 2021-12-09 08:11:44 +05:30 committed by GitHub
parent 17f640bf46
commit 933558caf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -34,6 +34,7 @@ All notable changes to this project will be documented in this file.
- Changing password generator parameters now automatically updates the password without needing to press the 'Generate' button again - Changing password generator parameters now automatically updates the password without needing to press the 'Generate' button again
- The app UI was reskinned to match Google's Material You guidelines - The app UI was reskinned to match Google's Material You guidelines
- Using HTTPS without authentication is now fully supported, and no longer asks for a username - Using HTTPS without authentication is now fully supported, and no longer asks for a username
- Enabling 'Show hidden files and folders' no longer shows Git-related files and folders
## [1.13.5] - 2021-07-28 ## [1.13.5] - 2021-07-28

8
app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt
View file

@ -242,7 +242,9 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
private fun shouldTake(file: File) = private fun shouldTake(file: File) =
with(file) { with(file) {
if (showHiddenContents) return true if (showHiddenContents) {
return !file.name.startsWith(".git")
}
if (isDirectory) { if (isDirectory) {
!isHidden !isHidden
} else { } else {
@ -251,7 +253,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
} }
private fun listFiles(dir: File): Flow<File> { private fun listFiles(dir: File): Flow<File> {
return dir.listFiles { file -> shouldTake(file) }?.asFlow() ?: emptyFlow() return dir.listFiles(::shouldTake)?.asFlow() ?: emptyFlow()
} }
private fun listFilesRecursively(dir: File): Flow<File> { private fun listFilesRecursively(dir: File): Flow<File> {
@ -266,7 +268,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel
yield() yield()
it it
} }
.filter { file -> shouldTake(file) } .filter(::shouldTake)
} }
private val _currentDir = MutableLiveData(root) private val _currentDir = MutableLiveData(root)