Skip to content

Commit 3818a28

Browse files
authored
Merge pull request #106 from MohamedRejeb/0.5.x
Fix issue in windows picker when selecting FilePickerFileType.All
2 parents 68fc21a + 1c1477e commit 3818a28

File tree

1 file changed

+21
-15
lines changed
  • calf-file-picker/src/desktopMain/kotlin/com/mohamedrejeb/calf/picker/platform/windows

1 file changed

+21
-15
lines changed

calf-file-picker/src/desktopMain/kotlin/com/mohamedrejeb/calf/picker/platform/windows/WindowsFilePicker.kt

+21-15
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import kotlinx.coroutines.withContext
1010
import java.awt.Window
1111
import java.io.File
1212

13-
internal class WindowsFilePicker: PlatformFilePicker {
13+
internal class WindowsFilePicker : PlatformFilePicker {
1414
override suspend fun launchFilePicker(
1515
initialDirectory: String?,
1616
type: FilePickerFileType,
@@ -35,27 +35,33 @@ internal class WindowsFilePicker: PlatformFilePicker {
3535

3636
// Set initial directory, title and file extensions
3737
val fileExtensions =
38-
if (type is FilePickerFileType.Extension)
39-
type.extensions
40-
else
41-
type.value
42-
.map {
43-
MimeTypes.findExtensionsByMimeTypes(it, it.contains('*'))
44-
}
45-
.flatten()
46-
.distinct()
38+
when (type) {
39+
is FilePickerFileType.All ->
40+
emptyList()
41+
42+
is FilePickerFileType.Extension ->
43+
type.extensions
44+
45+
else ->
46+
type.value
47+
.map {
48+
MimeTypes.findExtensionsByMimeTypes(it, it.contains('*'))
49+
}
50+
.flatten()
51+
.distinct()
52+
}
4753
setup(initialDirectory, fileExtensions, title)
4854
}
4955

5056
// Show file chooser
5157
fileChooser.showOpenDialog(parentWindow)
5258

5359
// Return selected files
54-
val result =
55-
if (selectionMode == FilePickerSelectionMode.Single)
56-
listOfNotNull(fileChooser.selectedFile)
57-
else
58-
fileChooser.selectedFiles.mapNotNull { it }
60+
val result =
61+
if (selectionMode == FilePickerSelectionMode.Single)
62+
listOfNotNull(fileChooser.selectedFile)
63+
else
64+
fileChooser.selectedFiles.mapNotNull { it }
5965
onResult(result)
6066
}
6167

0 commit comments

Comments
 (0)