rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow Emoji #796

Browse Source
This commit is contained in:
J-Jamet
2021-01-26 12:14:24 +01:00
parent ea8acd0677
commit 2268b78bba
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/src/main/java/com/kunzisoft/keepass/database/file/output/DatabaseOutputKDBX.kt
View File

@@ -589,7 +589,7 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
xml.text(String(Base64.encode(encoded, BASE_64_FLAG))) xml.text(String(Base64.encode(encoded, BASE_64_FLAG)))
} }
} else { } else {
xml.text(safeXmlString(value.toString())) xml.text(value.toString())
} }
xml.endTag(null, DatabaseKDBXXML.ElemValue) xml.endTag(null, DatabaseKDBXXML.ElemValue)
@@ -718,17 +718,19 @@ class DatabaseOutputKDBX(private val mDatabaseKDBX: DatabaseKDBX,
if (text.isEmpty()) { if (text.isEmpty()) {
return text return text
} }
val stringBuilder = StringBuilder() val stringBuilder = StringBuilder()
var ch: Char var character: Char
for (element in text) { for (element in text) {
ch = element character = element
val hexChar = character.toInt()
if ( if (
ch.toInt() in 0x20..0xD7FF || hexChar in 0x20..0xD7FF ||
ch.toInt() == 0x9 || ch.toInt() == 0xA || ch.toInt() == 0xD || hexChar == 0x9 ||
ch.toInt() in 0xE000..0xFFFD hexChar == 0xA ||
hexChar == 0xD ||
hexChar in 0xE000..0xFFFD
) { ) {
stringBuilder.append(ch) stringBuilder.append(character)
} }
} }
return stringBuilder.toString() return stringBuilder.toString()