Skip to content

Commit edd3f93

Browse files
committed
add "unknown" compression format for proper cases
1 parent f885aaa commit edd3f93

File tree

3 files changed

+169
-167
lines changed

3 files changed

+169
-167
lines changed

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/dialogs/CompressAsDialog.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,10 @@ class CompressAsDialog(
3939
setOnClickListener {
4040
activity.hideKeyboard(filenameValue)
4141
}
42-
val adapter = ArrayAdapter(activity, android.R.layout.simple_dropdown_item_1line, CompressionFormat.values().map { it.extension })
42+
val adapter = ArrayAdapter(
43+
activity,
44+
android.R.layout.simple_dropdown_item_1line,
45+
CompressionFormat.entries.take(CompressionFormat.entries.size - 1).map { it.extension })
4346
setAdapter(adapter)
4447
setText(adapter.getItem(0), false)
4548

app/src/main/kotlin/com/simplemobiletools/filemanager/pro/helpers/CompressionFormat.kt

+10-6
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,23 @@ enum class CompressionFormat(
1212
ZIP(".zip", "application/zip", "", true, true),
1313
SEVEN_ZIP(".7z", "application/x-7z-compressed", "", true, false),
1414
TAR_GZ(".tar.gz", "application/gzip", CompressorStreamFactory.GZIP, false, false),
15-
16-
// TAR_SZ(".tar.sz", "application/x-snappy-framed", CompressorStreamFactory.SNAPPY_FRAMED, false, false), // FIXME: ask for enabling it. it's not so common
17-
TAR_XZ(".tar.xz", "application/x-xz", CompressorStreamFactory.XZ, false, false);
15+
TAR_XZ(".tar.xz", "application/x-xz", CompressorStreamFactory.XZ, false, false),
16+
UNKNOWN("", "", "", false, false);
1817

1918
companion object {
2019
fun fromExtension(extension: String): CompressionFormat {
21-
return when (extension.lowercase()) {
20+
val normalizedExtension = if (extension.startsWith(".")) {
21+
extension
22+
} else {
23+
".$extension"
24+
}
25+
26+
return when (normalizedExtension.lowercase()) {
2227
ZIP.extension -> ZIP
2328
SEVEN_ZIP.extension -> SEVEN_ZIP
2429
TAR_GZ.extension -> TAR_GZ
25-
// TAR_SZ.extension -> TAR_SZ
2630
TAR_XZ.extension -> TAR_XZ
27-
else -> ZIP
31+
else -> UNKNOWN
2832
}
2933
}
3034
}

0 commit comments

Comments
 (0)