Fix saving quickphrase with newline character

rocka · rocka · commit fbec531a868a · 2023-10-12T21:15:15.000+08:00
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/quickphrase/QuickPhraseData.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/quickphrase/QuickPhraseData.kt
@@ -3,22 +3,24 @@ package org.fcitx.fcitx5.android.data.quickphrase
 import org.fcitx.fcitx5.android.R
 import org.fcitx.fcitx5.android.utils.errorRuntime
 
-class QuickPhraseData(private val data: List<QuickPhraseEntry>) :
-    List<QuickPhraseEntry> by data {
+class QuickPhraseData(private val data: List<QuickPhraseEntry>) : List<QuickPhraseEntry> by data {
 
     fun serialize(): String = joinToString("\n") { it.serialize() }
 
     companion object {
-        fun fromLines(lines: List<String>): Result<QuickPhraseData> =
-            runCatching {
-                lines.filter { it.isNotBlank() }
-                    .map {
-                        val s = it.trim()
-                        val spaceIndex = s.indexOf(' ')
-                        if (spaceIndex < 0)
-                            errorRuntime(R.string.exception_quickphrase_parse, it)
-                        QuickPhraseEntry(s.substring(0, spaceIndex), s.substring(spaceIndex + 1))
-                    }
-            }.map { QuickPhraseData(it) }
+        fun fromLines(lines: List<String>): Result<QuickPhraseData> {
+            return runCatching {
+                val list = mutableListOf<QuickPhraseEntry>()
+                lines.forEach {
+                    if (it.isBlank()) return@forEach
+                    val s = it.trim()
+                    val sep = s.indexOf(' ')
+                    if (sep < 0)
+                        errorRuntime(R.string.exception_quickphrase_parse, it)
+                    list.add(QuickPhraseEntry(s.substring(0, sep), s.substring(sep + 1)))
+                }
+                QuickPhraseData(list)
+            }
+        }
     }
 }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/data/quickphrase/QuickPhraseEntry.kt b/app/src/main/java/org/fcitx/fcitx5/android/data/quickphrase/QuickPhraseEntry.kt
@@ -1,5 +1,5 @@
 package org.fcitx.fcitx5.android.data.quickphrase
 
 data class QuickPhraseEntry(val keyword: String, val phrase: String) {
-    fun serialize() = "$keyword $phrase"
+    fun serialize() = "$keyword ${phrase.replace("\n", "\\n")}"
 }
diff --git a/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/QuickPhraseEditFragment.kt b/app/src/main/java/org/fcitx/fcitx5/android/ui/main/settings/QuickPhraseEditFragment.kt
@@ -2,6 +2,7 @@ package org.fcitx.fcitx5.android.ui.main.settings
 
 import android.app.AlertDialog
 import android.view.View
+import android.view.inputmethod.EditorInfo
 import androidx.core.os.bundleOf
 import androidx.lifecycle.lifecycleScope
 import kotlinx.coroutines.Dispatchers
@@ -42,6 +43,10 @@ class QuickPhraseEditFragment : ProgressFragment(), OnItemChangedListener<QuickP
             Mode.FreeAdd("", converter = { QuickPhraseEntry("", "") }),
             initialEntries,
         ) {
+            override fun showEntry(x: QuickPhraseEntry): String = x.run {
+                "$keyword → ${phrase.replace("\n", "\\n")}"
+            }
+
             override fun showEditDialog(
                 title: String,
                 entry: QuickPhraseEntry?,
@@ -50,6 +55,10 @@ class QuickPhraseEditFragment : ProgressFragment(), OnItemChangedListener<QuickP
                 val (keywordLayout, keywordField) = materialTextInput {
                     setHint(R.string.quickphrase_keyword)
                 }
+                keywordField.apply {
+                    isSingleLine = true
+                    imeOptions = EditorInfo.IME_ACTION_NEXT
+                }
                 val (phraseLayout, phraseField) = materialTextInput {
                     setHint(R.string.quickphrase_phrase)
                 }
@@ -71,10 +80,6 @@ class QuickPhraseEditFragment : ProgressFragment(), OnItemChangedListener<QuickP
                     .setNegativeButton(android.R.string.cancel, null)
                     .show()
             }
-
-            override fun showEntry(x: QuickPhraseEntry): String = x.run {
-                "$keyword\u2003→\u2003$phrase"
-            }
         }
         ui.addOnItemChangedListener(this)
         ui.addTouchCallback()

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`package org.fcitx.fcitx5.android.data.quickphrase`
`2`	`2`
`3`	`3`	`data class QuickPhraseEntry(val keyword: String, val phrase: String) {`
`4`		`- fun serialize() = "$keyword $phrase"`
	`4`	`+ fun serialize() = "$keyword ${phrase.replace("\n", "\\n")}"`
`5`	`5`	`}`