merge: sync LeanBitLab v3.9.9

AGENTS.md

@@ -72,13 +72,14 @@ $env:JAVA_HOME = "C:\Program Files\Eclipse Adoptium\jdk-21.0.11.10-hotspot"
 - Docs: `docs/FEATURES.md`, `docs/TWO_THUMB_TYPING_INTERNALS.md`, `docs/IMPROVEMENT_PLAN.md`, `layouts.md`, `CONTRIBUTING.md`
 
 ## Runtime/Tooling Preferences
-- **Android:** `compileSdk`/`targetSdk` 35, `minSdk` 21; Java/Kotlin JVM target 17. Build with JDK 17 or 21.
+- **Android:** `compileSdk` 36, `targetSdk` 35, `minSdk` 21; Java/Kotlin JVM target 17. Build with JDK 17 or 21.
 - **Toolchain:** Gradle 8.13 (wrapper), Kotlin 2.2.21, Compose BOM 2025.11.01 (`material3`, `navigation-compose`). Package management is **Gradle only** (no npm/bun/yarn).
 - **Native:** ABIs `armeabi-v7a`, `arm64-v8a`; built via `ndkBuild` (`app/src/main/jni/Android.mk`).
-- **Flavors** (dimension `privacy`, appId base `com.leanbitlab.leantype`):
+- **Flavors** (dimension `privacy`, appId base `com.asafmah.leantypedual`):
   - `standard` — cloud AI (Gemini, `generativeai`), has `INTERNET`.
-  - `offline` — on-device ONNX (`onnxruntime-android`), **no** `INTERNET`; appId `+.offline`.
-  - `offlinelite` — no AI, smallest; appId `+.offlinelite`.
+  - `standardfull` — cloud AI plus handwriting, has `INTERNET`.
+  - `offline` — on-device llama.cpp / GGUF, **no** `INTERNET`; appId `+.offline`, minSdk 26.
+  - `offlinelite` — no AI, smallest; **no** `INTERNET`; appId `+.offlinelite`.
 - **Build types:** `debug` (no minify, `+.debug`), `release` (minify + shrink + signed via `keystore.properties`), `runTests` (CI variant that skips known-failing tests), `debugNoMinify` (fast IDE builds).
 - **CI:** `.github/workflows/build-test-auto.yml` runs `compileOfflineRunTestsKotlin` on PRs touching `app/src/main/java**`; `build-debug-apk.yml` runs `assembleDebug` on manual dispatch. Release chores live in `tools/release.py`.
 

CHANGELOG.md

@@ -18,7 +18,7 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 - **Fallback gesture suggestions no longer leak dictionary capitalization** when Shift is off; the Java gesture engine now emits canonical lowercase candidates before the existing suggestion presentation-casing layer. (#118)
 
 ### Upstream
-- Merged **LeanBitLab/LeanType v3.9.5** (pinned at `8cfe7f1fc`, including v3.9.3/v3.9.4) — adds direct switching to a configured IME, persistent custom-layout state, multi-word suggestion controls, and the v3.9.5 release notes. Fork identity (`LeanTypeDual`, distinct `applicationId`, privacy tiers, and fork-specific features) is preserved.
+- Merged **LeanBitLab/LeanType v3.9.9** (pinned at `adb7c3755`, including v3.9.6–v3.9.8) — adds system-emoji and app-language settings, multi-row number rows, toolbar swipe-to-dismiss, translation and spellcheck improvements, asynchronous fallback-gesture indexing, dictionary upgrade preservation, and native dictionary crash/ANR fixes. Fork identity (`LeanTypeDual`, distinct `applicationId`, privacy tiers, and fork-specific features) is preserved. (#121)
 
 ## [3.10.0] - 2026-06-20
 

app/build.gradle.kts

@@ -226,6 +226,7 @@ dependencies {
     implementation("androidx.recyclerview:recyclerview:1.4.0")
     implementation("androidx.autofill:autofill:1.3.0")
     implementation("androidx.viewpager2:viewpager2:1.1.0")
+    implementation("androidx.emoji2:emoji2:1.4.0")
 
     // kotlin
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")

app/src/main/AndroidManifest.xml

@@ -137,17 +137,8 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
                 android:name="androidx.work.WorkManagerInitializer"
                 android:value="androidx.startup"
                 tools:node="remove" />
-        </provider>
-
-        <!-- Disable WorkManager auto-initializer; App implements Configuration.Provider instead.
-             Required for ML Kit Digital Ink plugin loaded via DexClassLoader. -->
-        <provider
-            android:name="androidx.startup.InitializationProvider"
-            android:authorities="${applicationId}.androidx-startup"
-            android:exported="false"
-            tools:node="merge">
             <meta-data
-                android:name="androidx.work.WorkManagerInitializer"
+                android:name="androidx.emoji2.text.EmojiCompatInitializer"
                 android:value="androidx.startup"
                 tools:node="remove" />
         </provider>

app/src/main/java/helium314/keyboard/compat/ImeCompat.kt

@@ -14,7 +14,7 @@ object ImeCompat {
     fun InputMethodService.switchInputMethod(): Boolean {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) return switchToNextInputMethod(false)
         val window = window.window ?: return false
-        val token = window.attributes.token
+        val token = window.attributes.token ?: return false
         return RichInputMethodManager.getInstance().inputMethodManager.switchToNextInputMethod(token, false)
     }
 
@@ -26,13 +26,40 @@ object ImeCompat {
         return RichInputMethodManager.getInstance().inputMethodManager.shouldOfferSwitchingToNextInputMethod(token)
     }
 
-    fun InputMethodService.switchInputMethodAndSubtype(imi: InputMethodInfo, subtype: InputMethodSubtype) {
+    fun InputMethodService.switchInputMethodCompat(imiId: String) {
+        val window = window.window
+        val token = window?.attributes?.token
+        if (token != null) {
+            try {
+                RichInputMethodManager.getInstance().inputMethodManager.setInputMethod(token, imiId)
+                return
+            } catch (e: Throwable) {
+                // fallback
+            }
+        }
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            switchInputMethod(imiId)
+        }
+    }
+
+    fun InputMethodService.switchInputMethodAndSubtypeCompat(imi: InputMethodInfo, subtype: InputMethodSubtype) {
+        val window = window.window
+        val token = window?.attributes?.token
+        if (token != null) {
+            try {
+                RichInputMethodManager.getInstance().inputMethodManager.setInputMethodAndSubtype(token, imi.id, subtype)
+                return
+            } catch (e: Throwable) {
+                // fallback
+            }
+        }
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
             switchInputMethod(imi.id, subtype)
         } else {
-            val window = window.window ?: return
-            val token = window.attributes.token
-            RichInputMethodManager.getInstance().inputMethodManager.setInputMethodAndSubtype(token, imi.id, subtype)
+            val fallbackToken = token ?: return
+            try {
+                RichInputMethodManager.getInstance().inputMethodManager.setInputMethod(fallbackToken, imi.id)
+            } catch (e: Throwable) {}
         }
     }
 }

app/src/main/java/helium314/keyboard/keyboard/internal/keyboard_parser/KeyboardParser.kt

@@ -101,15 +101,18 @@ class KeyboardParser(private val params: KeyboardParams, private val context: Co
             params.mBaseWidth = params.mOccupiedWidth - params.mLeftPadding - params.mRightPadding
         }
 
-        val numberRow = getNumberRow()
+        val numberRows = getNumberRows()
+        val numberRow = numberRows.first()
         addNumberRowOrPopupKeys(baseKeys, numberRow)
         if (params.mId.isAlphabetKeyboard)
             addSymbolPopupKeys(baseKeys)
         if (params.mId.isAlphaOrSymbolKeyboard && (params.mId.mNumberRowEnabled
                 || (!params.mId.isAlphabetKeyboard && params.mId.mNumberRowInSymbols && !params.mId.mCompactNumberRowInSymbols))) {
             val newLabelFlags = defaultLabelFlags or
                     if (Settings.getValues().mShowNumberRowHints) 0 else Key.LABEL_FLAGS_DISABLE_HINT_LABEL
-            baseKeys.add(0, numberRow.mapTo(mutableListOf()) { it.copy(newLabelFlags = newLabelFlags) })
+            numberRows.forEachIndexed { rowIndex, row ->
+                baseKeys.add(rowIndex, row.mapTo(mutableListOf()) { it.copy(newLabelFlags = newLabelFlags) })
+            }
         }
         if (!params.mAllowRedundantPopupKeys)
             params.baseKeys = baseKeys.flatMap { row -> row.map { it.toKeyParams(params) } }
@@ -317,38 +320,49 @@ class KeyboardParser(private val params: KeyboardParams, private val context: Co
         }
     }
 
-    private fun getNumberRow(): MutableList<KeyData> {
-        val row = LayoutParser.parseLayout(LayoutType.NUMBER_ROW, params, context).first()
+    private fun getNumberRows(): MutableList<MutableList<KeyData>> {
+        val rows = LayoutParser.parseLayout(LayoutType.NUMBER_ROW, params, context)
+        if (rows.isEmpty()) {
+            rows.add(mutableListOf())
+        }
         val localizedNumbers = params.mLocaleKeyboardInfos.localizedNumberKeys
         if (localizedNumbers?.size == 10) {
-            if (Settings.getValues().mLocalizedNumberRow) {
-                // replace 0-9 with localized numbers, and move latin number into popup
-                for (i in row.indices) {
-                    val key = row[i]
-                    val number = key.label.toIntOrNull() ?: continue
-                    when (number) {
-                        0 -> row[i] = key.copy(newLabel = localizedNumbers[9], newCode = KeyCode.UNSPECIFIED, newPopup = SimplePopups(listOf(key.label)).merge(key.popup))
-                        in 1..9 -> row[i] = key.copy(newLabel = localizedNumbers[number - 1], newCode = KeyCode.UNSPECIFIED, newPopup = SimplePopups(listOf(key.label)).merge(key.popup))
+            for (row in rows) {
+                if (Settings.getValues().mLocalizedNumberRow) {
+                    // replace 0-9 with localized numbers, and move latin number into popup
+                    for (i in row.indices) {
+                        val key = row[i]
+                        val number = key.label.toIntOrNull() ?: continue
+                        when (number) {
+                            0 -> row[i] = key.copy(newLabel = localizedNumbers[9], newCode = KeyCode.UNSPECIFIED, newPopup = SimplePopups(listOf(key.label)).merge(key.popup))
+                            in 1..9 -> row[i] = key.copy(newLabel = localizedNumbers[number - 1], newCode = KeyCode.UNSPECIFIED, newPopup = SimplePopups(listOf(key.label)).merge(key.popup))
+                        }
                     }
-                }
-            } else {
-                // add localized numbers to popups on 0-9
-                for (i in row.indices) {
-                    val key = row[i]
-                    val number = key.label.toIntOrNull() ?: continue
-                    when (number) {
-                        0 -> row[i] = key.copy(newPopup = SimplePopups(listOf(localizedNumbers[9])).merge(key.popup))
-                        in 1..9 -> row[i] = key.copy(newPopup = SimplePopups(listOf(localizedNumbers[number - 1])).merge(key.popup))
+                } else {
+                    // add localized numbers to popups on 0-9
+                    for (i in row.indices) {
+                        val key = row[i]
+                        val number = key.label.toIntOrNull() ?: continue
+                        when (number) {
+                            0 -> row[i] = key.copy(newPopup = SimplePopups(listOf(localizedNumbers[9])).merge(key.popup))
+                            in 1..9 -> row[i] = key.copy(newPopup = SimplePopups(listOf(localizedNumbers[number - 1])).merge(key.popup))
+                        }
                     }
                 }
             }
         }
         if (params.mId.mElementId == KeyboardId.ELEMENT_SYMBOLS_SHIFTED) {
-            for (i in row.indices) {
-                row[i] = shiftKeyData(row[i])
+            for (row in rows) {
+                for (i in row.indices) {
+                    row[i] = shiftKeyData(row[i])
+                }
             }
         }
-        return row
+        return rows
+    }
+
+    private fun getNumberRow(): MutableList<KeyData> {
+        return getNumberRows().first()
     }
 
     private fun shiftKeyData(key: KeyData): KeyData {

app/src/main/java/helium314/keyboard/latin/App.kt

@@ -2,6 +2,8 @@
 package helium314.keyboard.latin
 
 import android.app.Application
+import androidx.emoji2.text.EmojiCompat
+import androidx.emoji2.text.DefaultEmojiCompatConfig
 import androidx.work.Configuration
 import helium314.keyboard.keyboard.emoji.SupportedEmojis
 import helium314.keyboard.latin.define.DebugFlags
@@ -23,6 +25,13 @@ class App : Application(), Configuration.Provider {
         super.onCreate()
         DebugFlags.init(this)
         Settings.init(this)
+        val useSystemEmoji = Settings.getInstance().useSystemEmoji()
+        if (!useSystemEmoji) {
+            val config = DefaultEmojiCompatConfig.create(this)
+            if (config != null) {
+                EmojiCompat.init(config)
+            }
+        }
         SubtypeSettings.init(this)
         RichInputMethodManager.init(this)
 

app/src/main/java/helium314/keyboard/latin/AppUpgrade.kt

@@ -11,6 +11,7 @@ import helium314.keyboard.keyboard.internal.keyboard_parser.floris.KeyCode.check
 import helium314.keyboard.latin.common.ColorType
 import helium314.keyboard.latin.common.Constants.Separators
 import helium314.keyboard.latin.common.Constants.Subtype.ExtraValue
+import helium314.keyboard.latin.common.LocaleUtils
 import helium314.keyboard.latin.common.LocaleUtils.constructLocale
 import helium314.keyboard.latin.common.encodeBase36
 import helium314.keyboard.latin.database.ClipboardDao
@@ -57,10 +58,53 @@ object AppUpgrade {
         if (oldVersion == BuildConfig.VERSION_CODE)
             return
         // clear extracted dictionaries, in case updated version contains newer ones
-        DictionaryInfoUtils.getCacheDirectories(context).forEach {
-            for (file in it.listFiles()!!) {
-                if (!file.name.endsWith(USER_DICTIONARY_SUFFIX))
+        val assetsList = DictionaryInfoUtils.getAssetsDictionaryList(context)
+        DictionaryInfoUtils.getCacheDirectories(context).forEach { dir ->
+            val locale = DictionaryInfoUtils.getWordListIdFromFileName(dir.name).constructLocale()
+            for (file in dir.listFiles().orEmpty()) {
+                if (file.name.endsWith(USER_DICTIONARY_SUFFIX)) continue
+
+                val type = file.name.substringBefore("_").substringBefore(".dict")
+
+                // Check if this dictionary type has a corresponding bundled asset for this locale
+                val hasAsset = if (assetsList != null) {
+                    val matchingAssets = assetsList.filter { it.startsWith("${type}_") }
+                    LocaleUtils.getBestMatch(locale, matchingAssets) { asset ->
+                        DictionaryInfoUtils.extractLocaleFromAssetsDictionaryFile(asset)
+                    } != null
+                } else {
+                    false
+                }
+
+                // Check if there is a download preference for this dictionary
+                val hasDownloadPref = prefs.contains("pref_dict_download_link_${type}_${locale}")
+                        || prefs.contains("pref_dict_download_link_${type}_${locale.toLanguageTag()}")
+
+                var isExtractedAsset = prefs.getBoolean("pref_extracted_asset_${type}_${locale.toLanguageTag()}", false)
+                        || prefs.getBoolean("pref_extracted_asset_${type}_${locale}", false)
+
+                // For backward compatibility, check if the file size matches the current asset
+                if (!isExtractedAsset && hasAsset && assetsList != null) {
+                    val matchingAssets = assetsList.filter { it.startsWith("${type}_") }
+                    val bestAsset = LocaleUtils.getBestMatch(locale, matchingAssets) { asset ->
+                        DictionaryInfoUtils.extractLocaleFromAssetsDictionaryFile(asset)
+                    }
+                    if (bestAsset != null) {
+                        runCatching {
+                            context.assets.open("${DictionaryInfoUtils.ASSETS_DICTIONARY_FOLDER}/$bestAsset").use { input ->
+                                if (file.length() == input.available().toLong()) {
+                                    isExtractedAsset = true
+                                    prefs.edit().putBoolean("pref_extracted_asset_${type}_${locale.toLanguageTag()}", true).apply()
+                                }
+                            }
+                        }
+                    }
+                }
+
+                // Only delete if it is an asset-backed dictionary, was marked as extracted, and wasn't downloaded by the user
+                if (hasAsset && isExtractedAsset && !hasDownloadPref) {
                     file.delete()
+                }
             }
         }
         if (oldVersion <= 1000) { // upgrade old custom layouts name

app/src/main/java/helium314/keyboard/latin/ClipboardHistoryManager.kt

@@ -39,7 +39,17 @@ class ClipboardHistoryManager(
     // allocating a fresh Handler on every postDelayed().
     private val mainHandler = Handler(Looper.getMainLooper())
     private var clipboardSuggestionView: View? = null
-    private var clipboardDao: ClipboardDao? = null
+    private var _clipboardDao: ClipboardDao? = null
+    private var clipboardDao: ClipboardDao?
+        get() {
+            if (_clipboardDao == null || _clipboardDao?.isClosed == true) {
+                _clipboardDao = ClipboardDao.getInstance(latinIME)
+            }
+            return _clipboardDao
+        }
+        set(value) {
+            _clipboardDao = value
+        }
     private var dontShowCurrentSuggestion: Boolean = false
     private var mediaStoreObserver: ContentObserver? = null
     // ponytail: track last clip state to avoid resetting dismiss state on duplicate events