Merge upstream LeanBitLab/LeanType v4.1.2

.github/FUNDING.yml

@@ -2,7 +2,7 @@
 
 github: LeanBitLab
 patreon: # [username]
-open_collective: # [username]
+open_collective: leanbitlab-org
 ko_fi: # [username]
 tidelift: # [platform-name/package-name]
 community_bridge: # [cloud-transport-project-name]

CHANGELOG.md

@@ -14,6 +14,17 @@ and this project uses [Semantic Versioning](https://semver.org/spec/v2.0.0.html)
 
 ## [Unreleased]
 
+### Upstream
+- Merged **LeanBitLab/LeanType v4.1.2** (pinned at `8720abeb`, covering v4.0.9–v4.1.2, 200 commits) — adds a clipboard edit mode, a personal-dictionary learning threshold, physical-keyboard and suggestion fixes, and Compose localization. LeanTypeDual retains its distinct `applicationId`, fork version, privacy tiers, Java fallback gesture engine, two-thumb typing, and persistent custom layout slots. (#137)
+
+### Fixed
+- **Whole-word backspace keeps working after the upstream merge.** Upstream's fix for single-click backspace bulk-deleting numeric sequences was auto-merged in a way that stopped the two-thumb whole-word delete from clearing the composing span, leaving partial words behind. Both behaviours now coexist. (#137)
+- **Custom layouts still restore after leaving symbol mode.** Upstream resets the remembered custom layout when switching back to the alphabet, which conflicted with this fork's persistent custom layout slots. (#137)
+
+### Reliability & testing
+- **Dropped both `runTests` skip guards for defects inherited from upstream** — subtype edit persistence and symbol-prefixed regex expansion are both fixed in upstream v4.1.2. Verified twice: on a pristine upstream checkout at the tag, and in the merged tree. Those two tests now actually execute on CI instead of returning early. (#137)
+- **Fixed a latent test-harness bug** where `setText` accepted a `requireIdle` parameter it never passed through, so `reset()` could not tolerate leftover delayed messages. Harmless until the merge shifted JUnit's hash-based test ordering, at which point it failed an unrelated backspace test. (#137)
+
 ## [0.2.0] - 2026-08-06
 
 ### Upstream

app/build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     kotlin("android")
     kotlin("plugin.serialization") version "2.2.21"
     kotlin("plugin.compose") version "2.2.21"
+    kotlin("plugin.parcelize")
 }
 
 // Load keystore properties
@@ -155,6 +156,7 @@ android {
         viewBinding = true
         buildConfig = true
         compose = true
+        aidl = true
     }
 
     externalNativeBuild {
@@ -225,7 +227,6 @@ android {
 }
 
 dependencies {
-
     // androidx
     implementation("androidx.core:core-ktx:1.16.0") // 1.17 requires SDK 36
     implementation("androidx.recyclerview:recyclerview:1.4.0")

app/proguard-rules.pro

@@ -39,7 +39,10 @@
 -dontwarn java.lang.management.**
 -dontwarn org.joda.time.**
 
-# Keep handwriting plugin interface and listener to prevent parameter removal/signature optimization
+# Keep offline voice plugin AIDL interface and parcelable classes
+-keep class com.leanbitlab.leantype.voice.** { *; }
+-keep interface com.leanbitlab.leantype.voice.** { *; }
+
 -keep interface helium314.keyboard.latin.handwriting.HandwritingRecognizer {
     <methods>;
 }

app/src/debug/AndroidManifest.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+    <application>
+        <service
+            android:name="helium314.keyboard.latin.voice.DebugVoiceEngineService"
+            android:exported="false" />
+    </application>
+</manifest>

app/src/debug/java/helium314/keyboard/latin/voice/DebugVoiceEngineService.kt

@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-3.0-only
+package helium314.keyboard.latin.voice
+
+import android.app.Service
+import android.content.Intent
+import android.os.IBinder
+import android.os.ParcelFileDescriptor
+import com.leanbitlab.leantype.voice.IVoiceCallback
+import com.leanbitlab.leantype.voice.IVoiceEngine
+import com.leanbitlab.leantype.voice.ModelImportRequest
+import com.leanbitlab.leantype.voice.ModelState
+import com.leanbitlab.leantype.voice.VoiceConstants
+import com.leanbitlab.leantype.voice.VoiceEngineInfo
+import com.leanbitlab.leantype.voice.VoiceSessionConfig
+import helium314.keyboard.latin.utils.Log
+import java.io.FileInputStream
+import java.util.concurrent.Executors
+import java.util.concurrent.atomic.AtomicBoolean
+
+class DebugVoiceEngineService : Service() {
+
+    private val executor = Executors.newSingleThreadExecutor()
+    private val isSessionActive = AtomicBoolean(false)
+
+    private val binder = object : IVoiceEngine.Stub() {
+        override fun getInfo(): VoiceEngineInfo {
+            return VoiceEngineInfo(
+                contractVersion = VoiceConstants.VOICE_CONTRACT_VERSION,
+                pluginId = "helium314.keyboard.latin.voice.debug",
+                displayName = "Debug Voice Stub Engine",
+                supportsVosk = true,
+                supportsWhisper = true,
+                supportsHybrid = true
+            )
+        }
+
+        override fun getModelState(engineType: String?): ModelState {
+            return ModelState(
+                engineType = engineType ?: VoiceConstants.ENGINE_VOSK,
+                state = ModelState.STATE_READY,
+                message = "Debug stub model ready"
+            )
+        }
+
+        override fun importModel(request: ModelImportRequest?) {
+            Log.i(TAG, "Debug stub received model import request for ${request?.engineType}")
+            try {
+                request?.file?.close()
+            } catch (_: Exception) {}
+        }
+
+        override fun unloadModel(engineType: String?) {
+            Log.i(TAG, "Debug stub unload model: $engineType")
+        }
+
+        override fun deleteModel(engineType: String?) {
+            Log.i(TAG, "Debug stub delete model: $engineType")
+        }
+
+        override fun startSession(
+            config: VoiceSessionConfig?,
+            audioInput: ParcelFileDescriptor?,
+            callback: IVoiceCallback?
+        ) {
+            Log.i(TAG, "Debug stub starting session: ${config?.sessionId}, mode: ${config?.mode}")
+            isSessionActive.set(true)
+
+            executor.execute {
+                try {
+                    callback?.onSessionStarted()
+
+                    // Read incoming audio pipe data in background thread
+                    if (audioInput != null) {
+                        val input = FileInputStream(audioInput.fileDescriptor)
+                        val buffer = ByteArray(960)
+                        var bytesRead = 0
+                        var totalRead = 0
+
+                        while (isSessionActive.get() && input.read(buffer).also { bytesRead = it } != -1) {
+                            totalRead += bytesRead
+                            if (totalRead > 30000 && isSessionActive.get()) {
+                                callback?.onPartial("test partial")
+                            }
+                        }
+                    }
+
+                    if (isSessionActive.get()) {
+                        Thread.sleep(300)
+                        callback?.onFinal("test final")
+                    }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Debug stub session error", e)
+                    callback?.onError(VoiceConstants.VOICE_ERROR_UNKNOWN, e.message)
+                } finally {
+                    try {
+                        audioInput?.close()
+                    } catch (_: Exception) {}
+                    callback?.onSessionEnded()
+                    isSessionActive.set(false)
+                }
+            }
+        }
+
+        override fun stopSession() {
+            Log.i(TAG, "Debug stub stopSession called")
+            isSessionActive.set(false)
+        }
+
+        override fun cancelSession() {
+            Log.i(TAG, "Debug stub cancelSession called")
+            isSessionActive.set(false)
+        }
+
+        override fun release() {
+            Log.i(TAG, "Debug stub release called")
+            isSessionActive.set(false)
+        }
+    }
+
+    override fun onBind(intent: Intent?): IBinder {
+        Log.i(TAG, "DebugVoiceEngineService bound")
+        return binder
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        executor.shutdownNow()
+    }
+
+    companion object {
+        private const val TAG = "DebugVoiceEngineService"
+    }
+}

app/src/main/AndroidManifest.xml

@@ -15,11 +15,22 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <!-- Optional: only requested at runtime when the user enables the "Auto-read OTP" feature. -->
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
     <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-feature android:name="android.hardware.microphone" android:required="false" />
+
+    <queries>
+        <package android:name="com.leanbitlab.leantype.voice.offline" />
+        <intent>
+            <action android:name="android.intent.action.SENDTO" />
+            <data android:scheme="sms" />
+        </intent>
+        <intent>
+            <action android:name="android.intent.action.SENDTO" />
+            <data android:scheme="smsto" />
+        </intent>
+    </queries>
 
     <application android:label="@string/english_ime_name"
             android:name="helium314.keyboard.latin.App"
@@ -48,6 +59,15 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
             <meta-data android:name="android.view.im" android:resource="@xml/method_dummy" />
         </service>
 
+        <service android:name=".OtpNotificationListenerService"
+                 android:label="@string/auto_read_otp"
+                 android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"
+                 android:exported="true">
+            <intent-filter>
+                <action android:name="android.service.notification.NotificationListenerService" />
+            </intent-filter>
+        </service>
+
         <service android:name=".spellcheck.AndroidSpellCheckerService"
                  android:label="@string/spell_checker_service_name"
                  android:permission="android.permission.BIND_TEXT_SERVICE"
@@ -128,6 +148,14 @@ SPDX-License-Identifier: Apache-2.0 AND GPL-3.0-only
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <receiver
+            android:name="helium314.keyboard.latin.voice.DownloadCompleteReceiver"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.DOWNLOAD_COMPLETE" />
+            </intent-filter>
+        </receiver>
+
         <!-- Disable WorkManager auto-initializer; App implements Configuration.Provider instead.
              Required for ML Kit Digital Ink plugin loaded via DexClassLoader. -->
         <provider

app/src/main/aidl/com/leanbitlab/leantype/voice/IVoiceCallback.aidl

@@ -0,0 +1,9 @@
+package com.leanbitlab.leantype.voice;
+
+oneway interface IVoiceCallback {
+    void onSessionStarted();
+    void onPartial(String text);
+    void onFinal(String text);
+    void onError(int code, String message);
+    void onSessionEnded();
+}

app/src/main/aidl/com/leanbitlab/leantype/voice/IVoiceEngine.aidl

@@ -0,0 +1,24 @@
+package com.leanbitlab.leantype.voice;
+
+import com.leanbitlab.leantype.voice.IVoiceCallback;
+import com.leanbitlab.leantype.voice.VoiceEngineInfo;
+import com.leanbitlab.leantype.voice.ModelState;
+import com.leanbitlab.leantype.voice.ModelImportRequest;
+import com.leanbitlab.leantype.voice.VoiceSessionConfig;
+import android.os.ParcelFileDescriptor;
+
+interface IVoiceEngine {
+    VoiceEngineInfo getInfo();
+    ModelState getModelState(String engineType);
+    oneway void importModel(in ModelImportRequest request);
+    void unloadModel(String engineType);
+    void deleteModel(String engineType);
+    void startSession(
+        in VoiceSessionConfig config,
+        in ParcelFileDescriptor audioInput,
+        IVoiceCallback callback
+    );
+    void stopSession();
+    void cancelSession();
+    void release();
+}

app/src/main/aidl/com/leanbitlab/leantype/voice/ModelImportRequest.aidl

@@ -0,0 +1,3 @@
+package com.leanbitlab.leantype.voice;
+
+parcelable ModelImportRequest;

app/src/main/aidl/com/leanbitlab/leantype/voice/ModelState.aidl

@@ -0,0 +1,3 @@
+package com.leanbitlab.leantype.voice;
+
+parcelable ModelState;

app/src/main/aidl/com/leanbitlab/leantype/voice/VoiceEngineInfo.aidl

@@ -0,0 +1,3 @@
+package com.leanbitlab.leantype.voice;
+
+parcelable VoiceEngineInfo;

app/src/main/aidl/com/leanbitlab/leantype/voice/VoiceSessionConfig.aidl

@@ -0,0 +1,3 @@
+package com.leanbitlab.leantype.voice;
+
+parcelable VoiceSessionConfig;