From 2fdb26146b09352405cbc01a2ae8a0e8d45981da Mon Sep 17 00:00:00 2001 From: YASME-Tim Date: Mon, 22 Dec 2014 00:14:46 +0100 Subject: [PATCH] Refactored attribute value printing. --- .../java/jadx/core/xmlgen/BinaryXMLParser.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java index 51cea2be0..c41890a2a 100644 --- a/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java +++ b/jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java @@ -204,16 +204,17 @@ public class BinaryXMLParser { System.out.println("ai["+i+"] d: " + attrValData); */ if(attributeNS != -1) writer.print(nsPrefix+":"); - //writer.print(strings[attributeName] + "=\""); - if(attrValDataType==0x3) writer.print(strings[attributeName] + "=\"" + strings[attrValData]+"\""); - else if(attrValDataType==0x10) writer.print(strings[attributeName] + "=\"" + attrValData+"\""); + writer.print(strings[attributeName] + "=\""); + if(attrValDataType==0x3) writer.print(strings[attrValData]); + else if(attrValDataType==0x10) writer.print(attrValData); else if(attrValDataType==0x12) { // TODO: data is always -1, FIXME - if(attrValData==0) writer.print(strings[attributeName] + "=\"false\""); - else if(attrValData==1 || attrValData==-1) writer.print(strings[attributeName] + "=\"true\""); - 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); + if(attrValData==0) writer.print("false"); + else if(attrValData==1 || attrValData==-1) writer.print("true"); + else writer.print("UNKNOWN_BOOLEAN_TYPE"); + } else if(attrValDataType==0x1) writer.print("0x" + Integer.toHexString(attrValData)); + else writer.print("UNKNOWN_DATA_TYPE_" + attrValDataType); + writer.print("\""); if((i+1)");