Check res id using String.isJavaIdentifier{Start,Part}

rocka · rocka · commit 88525b9eff3a · 2024-01-22T23:47:48.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/core/data/DataManager.kt b/app/src/main/java/org/fcitx/fcitx5/android/core/data/DataManager.kt
@@ -15,7 +15,7 @@ import org.fcitx.fcitx5.android.BuildConfig
 import org.fcitx.fcitx5.android.core.data.DataManager.dataDir
 import org.fcitx.fcitx5.android.utils.FileUtil
 import org.fcitx.fcitx5.android.utils.appContext
-import org.fcitx.fcitx5.android.utils.javaIdRegex
+import org.fcitx.fcitx5.android.utils.isJavaIdentifier
 import org.xmlpull.v1.XmlPullParser
 import timber.log.Timber
 import java.io.File
@@ -149,14 +149,13 @@ object DataManager {
             }
             parser.close()
 
-            // Replace @string/ with string resource
-            description = description?.let { d ->
-                d.removePrefix("@string/").let { s ->
-                    if (s.matches(javaIdRegex)) {
-                        @SuppressLint("DiscouragedApi")
-                        val id = res.getIdentifier(s, "string", packageName)
-                        if (id != 0) res.getString(id) else d
-                    } else d
+            if (description?.startsWith("@string/") == true) {
+                // Replace "@string/" with string resource
+                val s = description.substring(8)
+                if (s.isJavaIdentifier()) {
+                    @SuppressLint("DiscouragedApi")
+                    val id = res.getIdentifier(s, "string", packageName)
+                    if (id != 0) description = res.getString(id)
                 }
             }
 
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/utils/IsJavaIdentifier.kt b/app/src/main/java/org/fcitx/fcitx5/android/utils/IsJavaIdentifier.kt
@@ -0,0 +1,15 @@
+/*
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ * SPDX-FileCopyrightText: Copyright 2024 Fcitx5 for Android Contributors
+ */
+
+package org.fcitx.fcitx5.android.utils
+
+fun String.isJavaIdentifier(): Boolean {
+    if (this.isEmpty()) return false
+    if (!this[0].isJavaIdentifierStart()) return false
+    for (i in 1..<this.length) {
+        if (!this[i].isJavaIdentifierPart()) return false
+    }
+    return true
+}
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/utils/Utils.kt b/app/src/main/java/org/fcitx/fcitx5/android/utils/Utils.kt
@@ -242,8 +242,6 @@ inline fun <T> withTempDir(block: (File) -> T): T {
 @Suppress("FunctionName")
 fun <T> WeakHashSet(): MutableSet<T> = Collections.newSetFromMap(WeakHashMap<T, Boolean>())
 
-val javaIdRegex = Regex("(?:\\b[_a-zA-Z]|\\B\\$)\\w*+")
-
 fun InputConnection.withBatchEdit(block: InputConnection.() -> Unit) {
     beginBatchEdit()
     block.invoke(this)
