Skip to content

J
jadx
Commit b87d1a7f authored by YASME-Tim's avatar YASME-Tim
Browse files
Options

Fixed XML oneLiners. Added another attribute value data type

parent c242a62b
Show whitespace changes
Inline Side-by-side
Showing with 31 additions and 12 deletions
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
View file @ b87d1a7f
...@@ -16,7 +16,10 @@ public class BinaryXMLParser { ...@@ -16,7 +16,10 @@ public class BinaryXMLParser {
private String[] strings; private String[] strings;
private int count; private int count;
private String nsPrefix="ERROR"; private String nsPrefix="ERROR";
private String nsURI="ERROR";
private String currentTag="ERROR";
private int numtabs=-1; private int numtabs=-1;
private boolean wasOneLiner=false;
PrintWriter writer; PrintWriter writer;
public BinaryXMLParser(String xmlfilepath, String xmloutfilepath) { public BinaryXMLParser(String xmlfilepath, String xmloutfilepath) {
//System.out.println(xmlfilepath); //System.out.println(xmlfilepath);
...@@ -126,6 +129,7 @@ public class BinaryXMLParser { ...@@ -126,6 +129,7 @@ public class BinaryXMLParser {
nsPrefix = strings[beginPrefix]; nsPrefix = strings[beginPrefix];
int beginURI = cInt32(bytes, count); int beginURI = cInt32(bytes, count);
//System.out.println("URI: " + strings[beginURI]); //System.out.println("URI: " + strings[beginURI]);
nsURI=strings[beginURI];
//System.out.println("COUNT: "+Integer.toHexString(count)); //System.out.println("COUNT: "+Integer.toHexString(count));
} }
...@@ -141,6 +145,7 @@ public class BinaryXMLParser { ...@@ -141,6 +145,7 @@ public class BinaryXMLParser {
//System.out.println("Prefix: " + strings[endPrefix]); //System.out.println("Prefix: " + strings[endPrefix]);
nsPrefix = strings[endPrefix]; nsPrefix = strings[endPrefix];
int endURI = cInt32(bytes, count); int endURI = cInt32(bytes, count);
nsURI=strings[endURI];
//System.out.println("URI: " + strings[endURI]); //System.out.println("URI: " + strings[endURI]);
} }
...@@ -149,15 +154,20 @@ public class BinaryXMLParser { ...@@ -149,15 +154,20 @@ public class BinaryXMLParser {
if(cInt16(bytes, count) != 0x0010) die("ELEMENT HEADER SIZE is not 0x10"); if(cInt16(bytes, count) != 0x0010) die("ELEMENT HEADER SIZE is not 0x10");
//if(cInt32(bytes, count) != 0x0060) die("ELEMENT CHUNK SIZE is not 0x60"); //if(cInt32(bytes, count) != 0x0060) die("ELEMENT CHUNK SIZE is not 0x60");
count+=4; count+=4;
int elementLineNumber = cInt32(bytes, count); int elementBegLineNumber = cInt32(bytes, count);
//System.out.println("elementLineNumber: " + elementLineNumber); //System.out.println("ELEMENT BEG Line: " + elementBegLineNumber + " of " + strings[startNSName]);
int comment = cInt32(bytes, count); int comment = cInt32(bytes, count);
//System.out.println("Comment: 0x" + Integer.toHexString(comment)); //System.out.println("Comment: 0x" + Integer.toHexString(comment));
//System.out.println("COUNT: "+Integer.toHexString(count)); //System.out.println("COUNT: "+Integer.toHexString(count));
int startNS = cInt32(bytes, count); int startNS = cInt32(bytes, count);
//System.out.println("Namespace: 0x" + Integer.toHexString(startNS)); //System.out.println("Namespace: 0x" + Integer.toHexString(startNS));
int startNSName = cInt32(bytes, count); // what to do with this id? int startNSName = cInt32(bytes, count); // actually is elementName...
//System.out.println("Namespace name: " + strings[startNSName]); //System.out.println("Namespace name: " + strings[startNSName]);
if(!wasOneLiner && !"ERROR".equals(currentTag) && !currentTag.equals(strings[startNSName])) {
writer.println(">");
}
wasOneLiner=false;
currentTag=strings[startNSName];
for(int i=0; i<numtabs; i++) writer.print("\t"); for(int i=0; i<numtabs; i++) writer.print("\t");
writer.print("<" + strings[startNSName]); writer.print("<" + strings[startNSName]);
int attributeStart = cInt16(bytes, count); int attributeStart = cInt16(bytes, count);
...@@ -172,6 +182,7 @@ public class BinaryXMLParser { ...@@ -172,6 +182,7 @@ public class BinaryXMLParser {
//System.out.println("startNS: classIndex: " + classIndex); //System.out.println("startNS: classIndex: " + classIndex);
int styleIndex = cInt16(bytes, count); int styleIndex = cInt16(bytes, count);
//System.out.println("startNS: styleIndex: " + styleIndex); //System.out.println("startNS: styleIndex: " + styleIndex);
if("manifest".equals(strings[startNSName])) writer.print(" xmlns:\""+nsURI+"\"");
if(attributeCount>0) writer.print(" "); if(attributeCount>0) writer.print(" ");
for(int i=0; i<attributeCount; i++) { for(int i=0; i<attributeCount; i++) {
int attributeNS = cInt32(bytes, count); int attributeNS = cInt32(bytes, count);
...@@ -183,7 +194,7 @@ public class BinaryXMLParser { ...@@ -183,7 +194,7 @@ public class BinaryXMLParser {
if(cInt8(bytes, count) != 0) die("res0 is not 0"); if(cInt8(bytes, count) != 0) die("res0 is not 0");
int attrValDataType = cInt8(bytes, count); int attrValDataType = cInt8(bytes, count);
int attrValData = cInt32(bytes, count); int attrValData = cInt32(bytes, count);
/* /*(
System.out.println("ai["+i+"] ns: " + attributeNS); System.out.println("ai["+i+"] ns: " + attributeNS);
//if(attributeNS!=-1) System.out.println("ai["+i+"] Sns: " + strings[attributeNS]); //if(attributeNS!=-1) System.out.println("ai["+i+"] Sns: " + strings[attributeNS]);
System.out.println("ai["+i+"] name: " + attributeName); System.out.println("ai["+i+"] name: " + attributeName);
...@@ -193,6 +204,7 @@ public class BinaryXMLParser { ...@@ -193,6 +204,7 @@ public class BinaryXMLParser {
System.out.println("ai["+i+"] d: " + attrValData); System.out.println("ai["+i+"] d: " + attrValData);
*/ */
if(attributeNS != -1) writer.print(nsPrefix+":"); if(attributeNS != -1) writer.print(nsPrefix+":");
//writer.print(strings[attributeName] + "=\"");
if(attrValDataType==0x3) writer.print(strings[attributeName] + "=\"" + strings[attrValData]+"\""); if(attrValDataType==0x3) writer.print(strings[attributeName] + "=\"" + strings[attrValData]+"\"");
else if(attrValDataType==0x10) writer.print(strings[attributeName] + "=\"" + attrValData+"\""); else if(attrValDataType==0x10) writer.print(strings[attributeName] + "=\"" + attrValData+"\"");
else if(attrValDataType==0x12) { else if(attrValDataType==0x12) {
...@@ -200,11 +212,12 @@ public class BinaryXMLParser { ...@@ -200,11 +212,12 @@ public class BinaryXMLParser {
if(attrValData==0) writer.print(strings[attributeName] + "=\"false\""); if(attrValData==0) writer.print(strings[attributeName] + "=\"false\"");
else if(attrValData==1 || attrValData==-1) writer.print(strings[attributeName] + "=\"true\""); else if(attrValData==1 || attrValData==-1) writer.print(strings[attributeName] + "=\"true\"");
else writer.print(strings[attributeName] + "=\"UNKNOWN\""); else writer.print(strings[attributeName] + "=\"UNKNOWN\"");
} } else if(attrValDataType==0x1) writer.print(strings[attributeName] + "=\"0x" + Integer.toHexString(attrValData) + "\"");
else writer.print(strings[attributeName] + " = UNKNOWN DATA TYPE: " + attrValDataType); else writer.print(strings[attributeName] + " = UNKNOWN DATA TYPE: " + attrValDataType);
writer.print(" "); if((i+1)<attributeCount) writer.print(" ");
} }
writer.println(">"); //writer.println(">");
//System.out.println("ELEMENT BEG Line: " + elementBegLineNumber + " of " + strings[startNSName]);
} }
private void parseElementEnd() { private void parseElementEnd() {
...@@ -212,16 +225,22 @@ public class BinaryXMLParser { ...@@ -212,16 +225,22 @@ public class BinaryXMLParser {
if(cInt32(bytes, count) != 0x18) die("ELEMENT END header chunk is not 0x18 big"); if(cInt32(bytes, count) != 0x18) die("ELEMENT END header chunk is not 0x18 big");
int endLineNumber = cInt32(bytes, count); int endLineNumber = cInt32(bytes, count);
//if(endLineNumber!=2) die("NAMESPACE beginning line number != 2 not supported yet"); //if(endLineNumber!=2) die("NAMESPACE beginning line number != 2 not supported yet");
//System.out.println("ELEMENT END Line:" + endLineNumber);
int comment = cInt32(bytes, count); int comment = cInt32(bytes, count);
//System.out.println("Comment: 0x" + Integer.toHexString(comment)); //System.out.println("Comment: 0x" + Integer.toHexString(comment));
int elementNS = cInt32(bytes, count); int elementNS = cInt32(bytes, count);
int elementName = cInt32(bytes, count); int elementName = cInt32(bytes, count);
if(currentTag==strings[elementName]) {
writer.println("/>");
wasOneLiner=true;
} else {
for(int i=0; i<numtabs; i++) writer.print("\t"); for(int i=0; i<numtabs; i++) writer.print("\t");
writer.print("</"); writer.print("</");
if(elementNS != -1) writer.print(strings[elementNS]+":"); if(elementNS != -1) writer.print(strings[elementNS]+":");
writer.println(strings[elementName]+">"); writer.println(strings[elementName]+">");
}
numtabs-=1; numtabs-=1;
//System.out.println("ELEMENT END Line: " + endLineNumber + " of " + strings[elementName]);
// TODO: Mind linenumbers for real original file ;)
} }
private int cInt8(byte[] bytes, int offset) { private int cInt8(byte[] bytes, int offset) {
......
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