lun_admin/NeoLaunch_From_Kvaesitso
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

File search: improve handling of launcher theme and launcher backup file types

Browse Source
This commit is contained in:
MM20
2023-10-02 11:30:23 +02:00
parent 9d909e718c
commit e516848f4f
8 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/files/src/main/java/de/mm20/launcher2/files/FileSerialization.kt
+1 -1
View File
@@ -51,7 +51,7 @@ class LocalFileDeserializer(
if (!java.io.File(path).exists()) return null
val directory = java.io.File(path).isDirectory
val id = cursor.getLong(0)
val mimeType = cursor.getStringOrNull(3)
val mimeType = cursor.getStringOrNull(3).takeIf { it != "application/octet-stream" }
?: if (directory) "resource/folder" else LocalFile.getMimetypeByFileExtension(
path.substringAfterLast(
'.'
data/files/src/main/java/de/mm20/launcher2/files/providers/LocalFileProvider.kt
+1 -1
View File
@@ -44,7 +44,7 @@ internal class LocalFileProvider(
val path = cursor.getString(3)
if (!java.io.File(path).exists()) continue
val directory = java.io.File(path).isDirectory
val mimeType = (cursor.getStringOrNull(4)
val mimeType = (cursor.getStringOrNull(4).takeIf { it != "application/octet-stream" }
?: if (directory) "resource/folder" else LocalFile.getMimetypeByFileExtension(
path.substringAfterLast(
'.'
data/files/src/main/java/de/mm20/launcher2/search/data/File.kt
+9 -5
View File
@@ -49,6 +49,8 @@ interface File : SavableSearchable {
"application/vnd.android.package-archive" -> R.drawable.ic_file_android to R.color.lightgreen
"application/vnd.google-apps.form" -> R.drawable.ic_file_form to R.color.deeppurple
"application/vnd.google-apps.drawing" -> R.drawable.ic_file_picture to R.color.teal
"application/vnd.de.mm20.launcher2.backup" -> R.drawable.ic_file_backup to R.color.brown
"application/vnd.de.mm20.launcher2.theme" -> R.drawable.ic_file_theme to R.color.amber
else -> R.drawable.ic_file_generic to R.color.bluegrey
}
}
@@ -64,12 +66,18 @@ interface File : SavableSearchable {
fun getFileType(context: Context): String {
if (isDirectory) return context.getString(R.string.file_type_directory)
if (mimeType == "application/vendor.de.mm20.launcher2.backup") {
if (mimeType == "application/vnd.de.mm20.launcher2.backup") {
return context.getString(
R.string.file_type_launcherbackup,
context.getString(R.string.app_name)
)
}
if (mimeType == "application/vnd.de.mm20.launcher2.theme") {
return context.getString(
R.string.file_type_launchertheme,
context.getString(R.string.app_name)
)
}
val resource = when (mimeType) {
"application/zip",
"application/x-zip-compressed",
@@ -118,10 +126,6 @@ interface File : SavableSearchable {
}
if (resource == R.string.file_type_none && label.matches(Regex(".+\\..+"))) {
val extension = label.substringAfterLast(".").uppercase(Locale.getDefault())
if (extension == "kvaesitso") return context.getString(
R.string.file_type_launcherbackup,
context.getString(R.string.app_name)
)
return context.getString(R.string.file_type_generic, extension)
}
return context.getString(resource)
data/files/src/main/java/de/mm20/launcher2/search/data/LocalFile.kt
+2 -1
View File
@@ -223,7 +223,8 @@ data class LocalFile(
"ogg" -> "audio/ogg"
"wav" -> "audio/wav"
"mp4" -> "video/mp4"
"kvaesitso" -> "application/vendor.de.mm20.launcher2.backup"
"kvaesitso" -> "application/vnd.de.mm20.launcher2.backup"
"kvtheme" -> "application/vnd.de.mm20.launcher2.theme"
else -> "application/octet-stream"
}
}