merge: stack LeanBitLab v4.0.2

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,36 +1,24 @@
 ---
 name: Bug report
-about: Create a report to help us improve
+about: Report a bug to help us improve
 labels: bug
 ---
 
-Please see the appropriate readme section for issue reporting guidelines: https://github.com/LeanBitLab/HeliboardL?tab=readme-ov-file#reporting-issues
-tl;dr:
-* search for duplicates, also in closed issues
-* a single issue per topic
-* reduce screenshot size
-
-<!--
-issue template below, please remove above text before submitting (and the template too if you think it's a good idea)
-Please choose a meaningful title for your issue, and consider that if you want help you should provide enough information that people can actually help
--->
-
 **Describe the bug**
+A clear and concise description of the bug.
 
 **To Reproduce**
-If possible, provide all the necessary steps to reproduce your problem, including the involved apps or settings if relevant.
-In case you cannot reproduce the bug, say so and provide information about when the bug may occur for you. Settings and the app you're writing in are usually important, please don't omit them.
+Steps to reproduce the behavior (e.g. apps involved, settings).
 
 **Expected behavior**
-If it's not obvious (e.g. not crash), describe how you think the app should behave.
+A clear and concise description of what you expected to happen.
 
 **Screenshots**
-ONLY add screenshots when they add real value.
-If you add screenshots, reduce the size or use thumbnails to keep the issue nicely readable.
+Add screenshots only if they help explain the problem (keep file size small).
 
-**App version**
-Please provide the explicit version (not just "latest"), or if you build the app yourself specify the latest commit.
+**App version & Flavor**
+Specify the version (e.g. v3.9.9) or build commit, and the flavor (e.g. standardfull, standard, offline, offlinelite).
 
-**Device:**
- - Model: [e.g. Samsung Galaxy S9]
- - OS: [e.g. Android 10] (please also mention whether you are using the manufacturer's OS or a custom ROM)
+**Device Info**
+- Model:
+- OS version:

.github/ISSUE_TEMPLATE/feature_request.md

@@ -4,29 +4,17 @@ about: Suggest an idea for this project
 labels: enhancement
 ---
 
-Please see the appropriate readme section for issue reporting guidelines: https://github.com/Helium314/HeliBoard?tab=readme-ov-file#reporting-issues
-tl;dr:
-* search for duplicates, also in closed issues
-* check FAQ / hidden features
-* a single issue per topic
-* ONLY add screenshots when necessary, and reduce their size
-
-<!--
-issue template below, please remove above text before submitting (and the template too if you think it's a good idea)
-Please choose a meaningful title for your issue
--->
-
-<!-- Please check FAQ and hidden features whether what you want is already implemented -->
-
-**Is your feature request related to a problem? Please describe.**
+**Is your feature request related to a problem?**
+Describe the problem you are trying to solve.
 
 **Describe the solution you'd like**
-Please provide a description of what you would like to have. The clearer it is described, the better it can be implemented the way you want it.
+A clear description of the feature or behavior you want.
 
 **Use case**
-Provide a clear and concise description of *your use case* and what you thus think is missing, and why.
+Explain how you would use this feature and why it is useful.
 
-**Describe alternatives you've considered (if any)**
+**Alternatives considered**
+Any alternative solutions or workarounds you've considered.
 
-**App version**
-Please provide the explicit version, you're using.
+**App version & Flavor**
+Specify the version and the flavor you are using (e.g. standardfull, standard, offline, offlinelite).

.github/ISSUE_TEMPLATE/other.md

@@ -1,12 +1,7 @@
 ---
 name: Other
-about: Anything that does not fit into the other categories. Please don't use this for questions, discussions, or anything that fits into one of the other issue categories.
+about: Anything that does not fit into the other categories
 ---
 
-Please see the appropriate readme section for issue reporting guidelines: https://github.com/Helium314/HeliBoard?tab=readme-ov-file#reporting-issues
-tl;dr:
-* search for duplicates, also in closed issues
-* a single issue per topic
-* ONLY add screenshots when necessary, and reduce their size
-
-<!-- please remove above text before submitting, and choose a meaningful title for your issue -->
+**Describe your query or suggestion**
+A clear and concise description of your topic.

.github/workflows/build-release-apk.yml

@@ -56,6 +56,7 @@ jobs:
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/v')
         with:
+          prerelease: ${{ contains(github.ref_name, 'beta') || contains(github.ref_name, 'alpha') || contains(github.ref_name, 'rc') }}
           body_path: docs/releasenote/release_notes_temp.md
           files: |
             app/build/outputs/apk/standard/release/*.apk

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.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)
+- Merged **LeanBitLab/LeanType v4.0.2** (pinned at `0477ef83`, including v4.0.0/v4.0.1) — adds JNI and lifecycle hardening, first-word and next-word controls, background-service controls, immediate autospace, translation-history improvements, and pointer/input-connection stability fixes. LeanTypeDual retains its Java fallback gesture engine, distinct `applicationId`, privacy tiers, two-thumb behavior, and fork-owned release metadata. (#123)
 
 ## [3.10.0] - 2026-06-20
 

app/src/main/AndroidManifest.xml

@@ -24,11 +24,13 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
     <application android:label="@string/english_ime_name"
             android:name="helium314.keyboard.latin.App"
             android:icon="@mipmap/ic_launcher"
+            android:largeHeap="true"
             android:roundIcon="@mipmap/ic_launcher_round"
             android:supportsRtl="true"
             android:allowBackup="false"
             android:defaultToDeviceProtectedStorage="true"
             android:directBootAware="true"
+            android:enableOnBackInvokedCallback="true"
             android:networkSecurityConfig="@xml/network_security_config"
             android:usesCleartextTraffic="true"
             tools:remove="android:appComponentFactory"

app/src/main/assets/dictionaries_in_dict_repo.csv

@@ -14,10 +14,8 @@ emoji,as,cldr
 main,as,
 emoji,ast,cldr
 emoji,az,cldr
-main,bn_BD,exp
 emoji,bn,cldr
 main,bn,
-main,bn,exp
 emoji,eu,cldr
 main,eu,
 emoji,be,cldr

app/src/main/java/com/android/inputmethod/latin/BinaryDictionary.java

@@ -332,7 +332,13 @@ public boolean isValidDictionary() {
     }
 
     public int getFormatVersion() {
-        return getFormatVersionNative(mNativeDict);
+        if (!isValidDictionary()) return 0;
+        try {
+            return getFormatVersionNative(mNativeDict);
+        } catch (final Throwable e) {
+            Log.e(TAG, "getFormatVersion failed", e);
+            return 0;
+        }
     }
 
     @Override
@@ -342,67 +348,87 @@ public boolean isInDictionary(final String word) {
 
     @Override
     public int getFrequency(final String word) {
-        if (TextUtils.isEmpty(word)) {
+        if (TextUtils.isEmpty(word) || !isValidDictionary()) {
+            return NOT_A_PROBABILITY;
+        }
+        try {
+            final int[] codePoints = StringUtils.toCodePointArray(word);
+            return getProbabilityNative(mNativeDict, codePoints);
+        } catch (final Throwable e) {
+            Log.e(TAG, "getFrequency failed", e);
             return NOT_A_PROBABILITY;
         }
-        final int[] codePoints = StringUtils.toCodePointArray(word);
-        return getProbabilityNative(mNativeDict, codePoints);
     }
 
     @Override
     public int getMaxFrequencyOfExactMatches(final String word) {
-        if (TextUtils.isEmpty(word)) {
+        if (TextUtils.isEmpty(word) || !isValidDictionary()) {
+            return NOT_A_PROBABILITY;
+        }
+        try {
+            final int[] codePoints = StringUtils.toCodePointArray(word);
+            return getMaxProbabilityOfExactMatchesNative(mNativeDict, codePoints);
+        } catch (final Throwable e) {
+            Log.e(TAG, "getMaxFrequencyOfExactMatches failed", e);
             return NOT_A_PROBABILITY;
         }
-        final int[] codePoints = StringUtils.toCodePointArray(word);
-        return getMaxProbabilityOfExactMatchesNative(mNativeDict, codePoints);
     }
 
     public boolean isValidNgram(final NgramContext ngramContext, final String word) {
         return getNgramProbability(ngramContext, word) != NOT_A_PROBABILITY;
     }
 
     public int getNgramProbability(final NgramContext ngramContext, final String word) {
-        if (!ngramContext.isValid() || TextUtils.isEmpty(word)) {
+        if (!ngramContext.isValid() || TextUtils.isEmpty(word) || !isValidDictionary()) {
+            return NOT_A_PROBABILITY;
+        }
+        try {
+            final int[][] prevWordCodePointArrays = new int[ngramContext.getPrevWordCount()][];
+            final boolean[] isBeginningOfSentenceArray = new boolean[ngramContext.getPrevWordCount()];
+            ngramContext.outputToArray(prevWordCodePointArrays, isBeginningOfSentenceArray);
+            final int[] wordCodePoints = StringUtils.toCodePointArray(word);
+            return getNgramProbabilityNative(mNativeDict, prevWordCodePointArrays,
+                    isBeginningOfSentenceArray, wordCodePoints);
+        } catch (final Throwable e) {
+            Log.e(TAG, "getNgramProbability failed", e);
             return NOT_A_PROBABILITY;
         }
-        final int[][] prevWordCodePointArrays = new int[ngramContext.getPrevWordCount()][];
-        final boolean[] isBeginningOfSentenceArray = new boolean[ngramContext.getPrevWordCount()];
-        ngramContext.outputToArray(prevWordCodePointArrays, isBeginningOfSentenceArray);
-        final int[] wordCodePoints = StringUtils.toCodePointArray(word);
-        return getNgramProbabilityNative(mNativeDict, prevWordCodePointArrays,
-                isBeginningOfSentenceArray, wordCodePoints);
     }
 
     public WordProperty getWordProperty(final String word, final boolean isBeginningOfSentence) {
-        if (word == null) {
+        if (word == null || !isValidDictionary()) {
             return null;
         }
-        final int[] codePoints = StringUtils.toCodePointArray(word);
-        final int[] outCodePoints = new int[DICTIONARY_MAX_WORD_LENGTH];
-        final boolean[] outFlags = new boolean[FORMAT_WORD_PROPERTY_OUTPUT_FLAG_COUNT];
-        final int[] outProbabilityInfo =
-                new int[FORMAT_WORD_PROPERTY_OUTPUT_PROBABILITY_INFO_COUNT];
-        final ArrayList<int[][]> outNgramPrevWordsArray = new ArrayList<>();
-        final ArrayList<boolean[]> outNgramPrevWordIsBeginningOfSentenceArray =
-                new ArrayList<>();
-        final ArrayList<int[]> outNgramTargets = new ArrayList<>();
-        final ArrayList<int[]> outNgramProbabilityInfo = new ArrayList<>();
-        final ArrayList<int[]> outShortcutTargets = new ArrayList<>();
-        final ArrayList<Integer> outShortcutProbabilities = new ArrayList<>();
-        getWordPropertyNative(mNativeDict, codePoints, isBeginningOfSentence, outCodePoints,
-                outFlags, outProbabilityInfo, outNgramPrevWordsArray,
-                outNgramPrevWordIsBeginningOfSentenceArray, outNgramTargets,
-                outNgramProbabilityInfo, outShortcutTargets, outShortcutProbabilities);
-        return new WordProperty(codePoints,
-                outFlags[FORMAT_WORD_PROPERTY_IS_NOT_A_WORD_INDEX],
-                outFlags[FORMAT_WORD_PROPERTY_IS_POSSIBLY_OFFENSIVE_INDEX],
-                outFlags[FORMAT_WORD_PROPERTY_HAS_NGRAMS_INDEX],
+        try {
+            final int[] codePoints = StringUtils.toCodePointArray(word);
+            final int[] outCodePoints = new int[DICTIONARY_MAX_WORD_LENGTH];
+            final boolean[] outFlags = new boolean[FORMAT_WORD_PROPERTY_OUTPUT_FLAG_COUNT];
+            final int[] outProbabilityInfo =
+                    new int[FORMAT_WORD_PROPERTY_OUTPUT_PROBABILITY_INFO_COUNT];
+            final ArrayList<int[][]> outNgramPrevWordsArray = new ArrayList<>();
+            final ArrayList<boolean[]> outNgramPrevWordIsBeginningOfSentenceArray =
+                    new ArrayList<>();
+            final ArrayList<int[]> outNgramTargets = new ArrayList<>();
+            final ArrayList<int[]> outNgramProbabilityInfo = new ArrayList<>();
+            final ArrayList<int[]> outShortcutTargets = new ArrayList<>();
+            final ArrayList<Integer> outShortcutProbabilities = new ArrayList<>();
+            getWordPropertyNative(mNativeDict, codePoints, isBeginningOfSentence, outCodePoints,
+                    outFlags, outProbabilityInfo, outNgramPrevWordsArray,
+                    outNgramPrevWordIsBeginningOfSentenceArray, outNgramTargets,
+                    outNgramProbabilityInfo, outShortcutTargets, outShortcutProbabilities);
+            return new WordProperty(codePoints,
+                    outFlags[FORMAT_WORD_PROPERTY_IS_NOT_A_WORD_INDEX],
+                    outFlags[FORMAT_WORD_PROPERTY_IS_POSSIBLY_OFFENSIVE_INDEX],
+                    outFlags[FORMAT_WORD_PROPERTY_HAS_NGRAMS_INDEX],
                 outFlags[FORMAT_WORD_PROPERTY_HAS_SHORTCUTS_INDEX],
                 outFlags[FORMAT_WORD_PROPERTY_IS_BEGINNING_OF_SENTENCE_INDEX], outProbabilityInfo,
                 outNgramPrevWordsArray, outNgramPrevWordIsBeginningOfSentenceArray,
                 outNgramTargets, outNgramProbabilityInfo, outShortcutTargets,
                 outShortcutProbabilities);
+        } catch (final Throwable e) {
+            Log.e(TAG, "getWordProperty failed", e);
+            return null;
+        }
     }
 
     public static class GetNextWordPropertyResult {

app/src/main/java/helium314/keyboard/accessibility/AccessibilityUtils.kt

@@ -46,7 +46,7 @@ class AccessibilityUtils private constructor() {
      * @return `true` if accessibility is enabled.
      */
     val isAccessibilityEnabled: Boolean
-        get() = ENABLE_ACCESSIBILITY && mAccessibilityManager.isEnabled
+        get() = ENABLE_ACCESSIBILITY && this::mAccessibilityManager.isInitialized && mAccessibilityManager.isEnabled
 
     /**
      * Returns `true` if touch exploration is enabled. Currently, this

app/src/main/java/helium314/keyboard/keyboard/KeyboardSwitcher.java

@@ -380,6 +380,7 @@ private void setMainKeyboardFrame(
         // @see
         // LatinIME#onComputeInset(android.inputmethodservice.InputMethodService.Insets)
         mMainKeyboardFrame.setVisibility(visibility);
+        mKeyboardViewWrapper.setVisibility(Settings.getInstance().readShowToolbarOnly() ? View.GONE : View.VISIBLE);
         mEmojiPalettesView.setVisibility(View.GONE);
         mEmojiPalettesView.stopEmojiPalettes();
         mEmojiTabStripView.setVisibility(View.GONE);
@@ -917,10 +918,18 @@ public void trimMemory() {
         if (mEmojiPalettesView != null) {
             mEmojiPalettesView.clearKeyboardCache();
         }
+        if (mClipboardHistoryView != null) {
+            mClipboardHistoryView.stopClipboardHistory();
+        }
+        PointerTracker.clearOldViewData();
+        KeyboardLayoutSet.onSystemLocaleChanged();
     }
 
     @SuppressLint("InflateParams")
     public View onCreateInputView(@NonNull Context displayContext, final boolean isHardwareAcceleratedDrawingEnabled) {
+        if (mCurrentInputView != null) {
+            mCurrentInputView.removeAllViews();
+        }
         if (mKeyboardView != null) {
             mKeyboardView.closing();
         }

app/src/main/java/helium314/keyboard/keyboard/KeyboardTheme.kt

@@ -146,7 +146,9 @@ private constructor(val themeId: Int, @JvmField val mStyleId: Int) {
                 prefs.getString(Settings.PREF_THEME_COLORS, Defaults.PREF_THEME_COLORS)
             val themeStyle = prefs.getString(Settings.PREF_THEME_STYLE, Defaults.PREF_THEME_STYLE)
 
-            return getThemeColors(themeName!!, themeStyle!!, context, prefs, isNight)
+            val safeThemeName = themeName ?: Defaults.PREF_THEME_COLORS
+            val safeThemeStyle = themeStyle ?: Defaults.PREF_THEME_STYLE
+            return getThemeColors(safeThemeName, safeThemeStyle, context, prefs, isNight)
         }
 
         private fun getThemeColors(themeName: String, themeStyle: String, context: Context, prefs: SharedPreferences, isNight: Boolean): Colors {