build: update config, proguard rules, and blacklist parsing

Author: LeanBitLab

app/build.gradle.kts

@@ -22,8 +22,8 @@ android {
         applicationId = "com.leanbitlab.leantype"
         minSdk = 21
         targetSdk = 35
-        versionCode = 3860
-        versionName = "3.8.6"
+        versionCode = 3870
+        versionName = "3.8.7"
 
         proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
 
@@ -38,9 +38,11 @@ android {
     productFlavors {
         create("standard") {
             dimension = "privacy"
+            minSdk = 23
         }
         create("standardOptimised") {
             dimension = "privacy"
+            minSdk = 23
         }
         create("offline") {
             dimension = "privacy"

app/proguard-rules.pro

@@ -36,3 +36,17 @@
 -dontwarn com.google.api.client.**
 -dontwarn java.lang.management.**
 -dontwarn org.joda.time.**
+
+# Keep handwriting plugin interface and listener to prevent parameter removal/signature optimization
+-keep interface helium314.keyboard.latin.handwriting.HandwritingRecognizer {
+    <methods>;
+}
+-keep interface helium314.keyboard.latin.handwriting.ModelDownloadListener {
+    <methods>;
+}
+
+# Keep ML Kit, GMS Tasks, and Firebase components for handwriting plugin dynamic linkage
+-keep class com.google.mlkit.** { *; }
+-keep class com.google.android.gms.tasks.** { *; }
+-keep class com.google.firebase.components.** { *; }
+

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

@@ -891,7 +891,11 @@ private class DictionaryGroup(
     private var compiledBlacklistPatterns: List<Regex> = emptyList()
 
     private fun rebuildCompiledPatterns() {
-        compiledBlacklistPatterns = blacklist.map { pattern ->
+        rebuildCompiledPatterns(blacklist)
+    }
+
+    private fun rebuildCompiledPatterns(patterns: Collection<String>) {
+        compiledBlacklistPatterns = patterns.map { pattern ->
             try {
                 Regex(pattern, RegexOption.IGNORE_CASE)
             } catch (e: Exception) {
@@ -918,7 +922,7 @@ private class DictionaryGroup(
                         }
                     }
                     addAll(loadedWords)
-                    rebuildCompiledPatterns()
+                    rebuildCompiledPatterns(this@apply)
                 } catch (e: IOException) {
                     Log.e(TAG, "Exception while trying to read blacklist from ${file.name}", e)
                 }