luckyimnotanigger/HeliBoard
1
0
Fork 0
mirror of https://github.com/Helium314/HeliBoard.git synced 2025-05-16 23:12:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

avoid loading uris from content resolver on main thread

Browse source 
because uris might point to network locations, which triggers an exception
main thread is still blocked by loading, this is purely to get around the crash (files are small, and usually stored locally)
This commit is contained in:
Helium314 2024-02-20 10:33:47 +01:00
parent 2dfc824319
commit 5e4361b119
6 changed files with 140 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/helium314/keyboard/latin/utils/CustomLayoutUtils.kt
View file

@ -18,6 +18,7 @@ import helium314.keyboard.keyboard.internal.keyboard_parser.POPUP_KEYS_NORMAL
import helium314.keyboard.keyboard.internal.keyboard_parser.SimpleKeyboardParser
import helium314.keyboard.keyboard.internal.keyboard_parser.addLocaleKeyTextsToParams
import helium314.keyboard.latin.R
import helium314.keyboard.latin.common.FileUtils
import helium314.keyboard.latin.settings.Settings
import java.io.File
import java.io.IOException
@ -28,8 +29,10 @@ fun loadCustomLayout(uri: Uri?, languageTag: String, context: Context, onAdded:
return infoDialog(context, context.getString(R.string.layout_error, "layout file not found"))
val layoutContent: String
try {
val i = context.contentResolver.openInputStream(uri)
layoutContent = i?.use { it.reader().readText() } ?: throw IOException()
val tmpFile = File(context.filesDir.absolutePath + File.separator + "tmpfile")
FileUtils.copyContentUriToNewFile(uri, context, tmpFile)
layoutContent = tmpFile.readText()
tmpFile.delete()
} catch (e: IOException) {
return infoDialog(context, context.getString(R.string.layout_error, "cannot read layout file"))
}