luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-04-25 09:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

use fallback layout when custom layout file can't be opened

Browse source
This commit is contained in:
Helium314 2024-06-17 15:12:05 +02:00
parent 3961060710
commit 4ab7e8b78e
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/RawKeyboardParser.kt
View file

@ -21,6 +21,7 @@ import helium314.keyboard.keyboard.internal.keyboard_parser.floris.toTextKey
import helium314.keyboard.latin.common.splitOnWhitespace
import helium314.keyboard.latin.settings.Settings
import helium314.keyboard.latin.utils.CUSTOM_LAYOUT_PREFIX
import helium314.keyboard.latin.utils.Log
import helium314.keyboard.latin.utils.ScriptUtils
import helium314.keyboard.latin.utils.ScriptUtils.script
import helium314.keyboard.latin.utils.getCustomFunctionalLayoutName
@ -32,6 +33,7 @@ import kotlinx.serialization.modules.polymorphic
import java.io.File
object RawKeyboardParser {
private const val TAG = "RawKeyboardParser"
private val rawLayoutCache = hashMapOf<String, (KeyboardParams) -> MutableList<MutableList<KeyData>>>()
val symbolAndNumberLayouts = listOf(LAYOUT_SYMBOLS, LAYOUT_SYMBOLS_SHIFTED, LAYOUT_SYMBOLS_ARABIC,
@ -85,8 +87,15 @@ object RawKeyboardParser {
private fun createCacheLambda(layoutName: String, context: Context): (KeyboardParams) -> MutableList<MutableList<KeyData>> {
val layoutFileName = getLayoutFileName(layoutName, context)
val layoutText = if (layoutFileName.startsWith(CUSTOM_LAYOUT_PREFIX)) getCustomLayoutFile(layoutFileName, context).readText()
else context.assets.open("layouts${File.separator}$layoutFileName").reader().use { it.readText() }
val layoutText = if (layoutFileName.startsWith(CUSTOM_LAYOUT_PREFIX)) {
try {
getCustomLayoutFile(layoutFileName, context).readText()
} catch (e: Exception) { // fall back to defaults if for some reason file is broken
val name = if (layoutName.contains("functional")) "functional_keys.json" else "qwerty.txt"
Log.e(TAG, "cannot open layout $layoutName, falling back to $name", e)
context.assets.open("layouts${File.separator}$name").reader().use { it.readText() }
}
} else context.assets.open("layouts${File.separator}$layoutFileName").reader().use { it.readText() }
if (layoutFileName.endsWith(".json")) {
val florisKeyData = parseJsonString(layoutText)
return { params ->