From 3b45c4c2ce29f5986badd90f9bf4470145fe467b Mon Sep 17 00:00:00 2001 From: LeanBitLab Date: Sun, 15 Nov 2026 20:35:09 +0530 Subject: [PATCH] fix(download): send current app version as User-Agent and harden dictionary download Replace the hardcoded HeliboardL/3.8.9 User-Agent with Links.USER_AGENT built from BuildConfig.VERSION_NAME. In downloadDictionary, disconnect the connection in a finally block so a failure mid-download no longer leaks it, and stop deleting the existing dictionary before the rename so a failed rename keeps the old one. --- .../keyboard/emoji/EmojiPalettesView.kt | 2 +- .../keyboard/latin/common/Constants.kt | 1 + .../keyboard/latin/utils/DictionaryUtils.kt | 20 ++++++++++--------- .../preferences/LoadEmojiLibPreference.kt | 2 +- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.kt b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.kt index 145f3f888..f940ee34e 100644 --- a/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.kt +++ b/app/src/main/java/helium314/keyboard/keyboard/emoji/EmojiPalettesView.kt @@ -1614,7 +1614,7 @@ class EmojiPalettesView @JvmOverloads constructor( try { val url = URL(urlStr) val conn = url.openConnection() as HttpURLConnection - conn.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + conn.setRequestProperty("User-Agent", Links.USER_AGENT) conn.connectTimeout = 15000 conn.readTimeout = 15000 conn.instanceFollowRedirects = true diff --git a/app/src/main/java/helium314/keyboard/latin/common/Constants.kt b/app/src/main/java/helium314/keyboard/latin/common/Constants.kt index 717105d36..109a571f0 100644 --- a/app/src/main/java/helium314/keyboard/latin/common/Constants.kt +++ b/app/src/main/java/helium314/keyboard/latin/common/Constants.kt @@ -10,6 +10,7 @@ object Links { const val DICTIONARY_NORMAL_SUFFIX = "dictionaries/" const val DICTIONARY_EXPERIMENTAL_SUFFIX = "dictionaries_experimental/" const val DICTIONARY_EMOJI_CLDR_SUFFIX = "emoji_cldr_signal_dictionaries/" + val USER_AGENT = "HeliboardL/${BuildConfig.VERSION_NAME} (Android)" // LeanBitBoard fork repo const val GITHUB = "https://github.com/LeanBitLab/LeanType" const val LICENSE = "$GITHUB/blob/main/LICENSE" diff --git a/app/src/main/java/helium314/keyboard/latin/utils/DictionaryUtils.kt b/app/src/main/java/helium314/keyboard/latin/utils/DictionaryUtils.kt index 943a88ae4..3507d90de 100644 --- a/app/src/main/java/helium314/keyboard/latin/utils/DictionaryUtils.kt +++ b/app/src/main/java/helium314/keyboard/latin/utils/DictionaryUtils.kt @@ -270,19 +270,21 @@ fun downloadDictionary( val tempFile = File(cacheDir, "${type}.dict.download") CoroutineScope(Dispatchers.IO + kotlinx.coroutines.SupervisorJob()).launch { var success = false + var openConn: java.net.HttpURLConnection? = null try { if (tempFile.exists()) { tempFile.delete() } var url = java.net.URL(linkUrl) var connection = url.openConnection() as java.net.HttpURLConnection - connection.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + connection.setRequestProperty("User-Agent", Links.USER_AGENT) connection.connectTimeout = 15000 connection.readTimeout = 15000 connection.instanceFollowRedirects = true - var status = connection.responseCode var conn = connection + openConn = conn + var status = conn.responseCode var redirectCount = 0 while ((status == java.net.HttpURLConnection.HTTP_MOVED_TEMP || status == java.net.HttpURLConnection.HTTP_MOVED_PERM || @@ -291,7 +293,8 @@ fun downloadDictionary( conn.disconnect() val nextUrl = java.net.URL(newUrl) conn = nextUrl.openConnection() as java.net.HttpURLConnection - conn.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + openConn = conn + conn.setRequestProperty("User-Agent", Links.USER_AGENT) conn.connectTimeout = 15000 conn.readTimeout = 15000 conn.instanceFollowRedirects = true @@ -326,9 +329,7 @@ fun downloadDictionary( if (lastModified > 0L) { tempFile.setLastModified(lastModified) } - if (targetFile.exists()) { - targetFile.delete() - } + // rename replaces an existing target, so a failed rename keeps the old dictionary if (tempFile.renameTo(targetFile)) { success = true invalidateMissingDictCache() @@ -340,12 +341,13 @@ fun downloadDictionary( } else { Log.e("DictionaryUtils", "HTTP error downloading dictionary: $status") } - conn.disconnect() } catch (e: Exception) { Log.e("DictionaryUtils", "Failed to download dictionary", e) if (tempFile.exists()) { tempFile.delete() } + } finally { + openConn?.disconnect() } withContext(Dispatchers.Main) { onComplete(success) @@ -379,7 +381,7 @@ fun DownloadableDictionaryRow(locale: Locale, desc: String, link: String, refres val url = java.net.URL(link) val connection = url.openConnection() as java.net.HttpURLConnection connection.requestMethod = "HEAD" - connection.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + connection.setRequestProperty("User-Agent", Links.USER_AGENT) connection.connectTimeout = 5000 connection.readTimeout = 5000 connection.instanceFollowRedirects = true @@ -394,7 +396,7 @@ fun DownloadableDictionaryRow(locale: Locale, desc: String, link: String, refres val nextUrl = java.net.URL(newUrl) conn = nextUrl.openConnection() as java.net.HttpURLConnection conn.requestMethod = "HEAD" - conn.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + conn.setRequestProperty("User-Agent", Links.USER_AGENT) conn.connectTimeout = 5000 conn.readTimeout = 5000 conn.instanceFollowRedirects = true diff --git a/app/src/main/java/helium314/keyboard/settings/preferences/LoadEmojiLibPreference.kt b/app/src/main/java/helium314/keyboard/settings/preferences/LoadEmojiLibPreference.kt index e15d86165..4fadd3835 100644 --- a/app/src/main/java/helium314/keyboard/settings/preferences/LoadEmojiLibPreference.kt +++ b/app/src/main/java/helium314/keyboard/settings/preferences/LoadEmojiLibPreference.kt @@ -92,7 +92,7 @@ fun LoadEmojiLibPreference( val urlStr = "${Links.DICTIONARY_URL}${Links.DICTIONARY_DOWNLOAD_SUFFIX}${Links.DICTIONARY_EMOJI_CLDR_SUFFIX}$dictName" val url = URL(urlStr) val conn = url.openConnection() as HttpURLConnection - conn.setRequestProperty("User-Agent", "HeliboardL/3.8.9 (Android)") + conn.setRequestProperty("User-Agent", Links.USER_AGENT) conn.connectTimeout = 15000 conn.readTimeout = 15000 conn.instanceFollowRedirects = true