ReVanced/revanced-patcher
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-patcher.git synced 2026-01-10 05:16:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correctly save XML files in UTF-8 by using a bufferedWriter (#356)

Browse Source
This commit is contained in:
kitadai31
2025-07-19 04:31:51 +09:00
committed by GitHub
parent 68db95b99b
commit 33fadcbd0c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/kotlin/app/revanced/patcher/util/Document.kt
View File

@@ -4,7 +4,6 @@ import org.w3c.dom.Document
import java.io.Closeable import java.io.Closeable
import java.io.File import java.io.File
import java.io.InputStream import java.io.InputStream
import java.io.StringWriter
import javax.xml.parsers.DocumentBuilderFactory import javax.xml.parsers.DocumentBuilderFactory
import javax.xml.transform.OutputKeys import javax.xml.transform.OutputKeys
import javax.xml.transform.TransformerFactory import javax.xml.transform.TransformerFactory
@@ -36,20 +35,22 @@ class Document internal constructor(
readerCount.remove(it) readerCount.remove(it)
} }
it.outputStream().buffered().use { stream -> val transformer = TransformerFactory.newInstance().newTransformer()
val transformer = TransformerFactory.newInstance().newTransformer() // Set to UTF-16 to prevent surrogate pairs from being escaped to invalid numeric character references, but save as UTF-8.
// Set to UTF-16 but encode as UTF-8 to prevent surrogate pairs from being escaped to broken numeric character references. if (isAndroid) {
if (isAndroid) { transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-16")
transformer.setOutputProperty(OutputKeys.ENCODING, "UTF-16") transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes")
transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes") it.bufferedWriter(charset = Charsets.UTF_8).use { writer ->
transformer.transform(DOMSource(this), StreamResult(writer))
} }
transformer.transform(DOMSource(this), StreamResult(stream)) } else {
transformer.transform(DOMSource(this), StreamResult(it))
} }
} }
} }
private companion object { private companion object {
private val readerCount = mutableMapOf<File, Int>() private val readerCount = mutableMapOf<File, Int>()
private val isAndroid = System.getProperty("java.runtime.name").equals("Android Runtime") private val isAndroid = System.getProperty("java.runtime.name") == "Android Runtime"
} }
} }