Merge pull request #1669 from kiwix/feature/macgills/1668-file-validator-crash

#1668 Crash Report 3.1.2 Custom Apps Parameter specified as non-null …
This commit is contained in:
Seán Mac Gillicuddy 2020-01-06 09:31:47 +00:00 committed by GitHub
commit 3d10365708
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -52,10 +52,10 @@ class CustomFileValidator @Inject constructor(private val context: Context) {
private fun zimFiles() =
scanDirs(ContextCompat.getExternalFilesDirs(context, null), "zim")
private fun scanDirs(dirs: Array<out File>, extensionToMatch: String): List<File> =
dirs.fold(listOf()) { acc, dir ->
private fun scanDirs(dirs: Array<out File?>?, extensionToMatch: String): List<File> =
dirs?.filterNotNull()?.fold(listOf()) { acc, dir ->
acc + dir.walk().filter { it.extension.startsWith(extensionToMatch) }.toList()
}
} ?: emptyList()
}
sealed class ValidationState {