From 933558caf8266677dc26497d7c7b930254f4fb07 Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Thu, 9 Dec 2021 08:11:44 +0530 Subject: Prevent Git files from turning up in search and listing (#1582) * Prevent Git files from turning up in search and listing * Update changelog --- .../msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'app/src/main/java/dev/msfjarvis/aps') diff --git a/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt b/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt index 1c1b6aee..a8af961a 100644 --- a/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt +++ b/app/src/main/java/dev/msfjarvis/aps/util/viewmodel/SearchableRepositoryViewModel.kt @@ -242,7 +242,9 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel private fun shouldTake(file: File) = with(file) { - if (showHiddenContents) return true + if (showHiddenContents) { + return !file.name.startsWith(".git") + } if (isDirectory) { !isHidden } else { @@ -251,7 +253,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel } private fun listFiles(dir: File): Flow { - return dir.listFiles { file -> shouldTake(file) }?.asFlow() ?: emptyFlow() + return dir.listFiles(::shouldTake)?.asFlow() ?: emptyFlow() } private fun listFilesRecursively(dir: File): Flow { @@ -266,7 +268,7 @@ class SearchableRepositoryViewModel(application: Application) : AndroidViewModel yield() it } - .filter { file -> shouldTake(file) } + .filter(::shouldTake) } private val _currentDir = MutableLiveData(root) -- cgit v1.2.3