Skip to content

J
jadx
Commit 1f3aebf5 authored by Skylot's avatar Skylot
Browse files
Options

res: close tag before cdata (#231)

parent b39d79a0
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
View file @ 1f3aebf5
...@@ -194,10 +194,13 @@ public class BinaryXMLParser extends CommonBinaryParser { ...@@ -194,10 +194,13 @@ public class BinaryXMLParser extends CommonBinaryParser {
int strIndex = is.readInt32(); int strIndex = is.readInt32();
String str = getString(strIndex); String str = getString(strIndex);
if (!isLastEnd) {
writer.startLine().addIndent(); isLastEnd = true;
writer.add(">");
}
writer.attachSourceLine(lineNumber); writer.attachSourceLine(lineNumber);
writer.add(StringUtils.escapeXML(str.trim())); String escapedStr = StringUtils.escapeXML(str);
writer.add(escapedStr);
long size = is.readInt16(); long size = is.readInt16();
is.skip(size - 2); is.skip(size - 2);
...@@ -384,9 +387,9 @@ public class BinaryXMLParser extends CommonBinaryParser { ...@@ -384,9 +387,9 @@ public class BinaryXMLParser extends CommonBinaryParser {
} else { } else {
writer.startLine("</"); writer.startLine("</");
writer.attachSourceLine(endLineNumber); writer.attachSourceLine(endLineNumber);
if (elementNS != -1) { // if (elementNS != -1) {
writer.add(getString(elementNS)).add(':'); // writer.add(getString(elementNS)).add(':');
} // }
writer.add(getString(elementName)).add(">"); writer.add(getString(elementName)).add(">");
} }
isLastEnd = true; isLastEnd = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment