Merge pull request hsiafan#17 from soundmonster/master

Proper namespace handling
dolt131943 · Nov 19, 2014 · 9d6515f · 9d6515f
2 parents cfedd67 + f8cbeee
commit 9d6515f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -13,6 +13,7 @@ repositories {
 
 dependencies {
     compile 'org.apache.commons:commons-compress:1.6'
+    compile 'org.apache.commons:commons-lang3:3.3.2'
     testCompile 'junit:junit:4.+'
 }
 
@@ -72,4 +73,4 @@ uploadArchives {
             }
         }
     }
-}
+}
diff --git a/src/main/java/net/dongliu/apk/parser/parser/BinaryXmlParser.java b/src/main/java/net/dongliu/apk/parser/parser/BinaryXmlParser.java
@@ -71,9 +71,9 @@ public void parse() throws IOException {
             }
 
             while (chunkHeader != null) {
-                if (chunkHeader.chunkType == ChunkType.XML_END_NAMESPACE) {
+                /*if (chunkHeader.chunkType == ChunkType.XML_END_NAMESPACE) {
                     break;
-                }
+                }*/
                 long beginPos = in.tell();
                 switch (chunkHeader.chunkType) {
                     case ChunkType.XML_END_NAMESPACE:

diff --git a/src/main/java/net/dongliu/apk/parser/parser/XmlNamespaces.java b/src/main/java/net/dongliu/apk/parser/parser/XmlNamespaces.java
@@ -85,8 +85,10 @@ public boolean equals(Object o) {
 
             XmlNamespace namespace = (XmlNamespace) o;
 
-            if (!prefix.equals(namespace.prefix)) return false;
-            if (!uri.equals(namespace.uri)) return false;
+            if (prefix == null && namespace.prefix != null) return false;
+            if (uri == null && namespace.uri != null) return false;
+            if (prefix != null && !prefix.equals(namespace.prefix)) return false;
+            if (uri != null && !uri.equals(namespace.uri)) return false;
 
             return true;
         }

diff --git a/src/main/java/net/dongliu/apk/parser/parser/XmlTranslator.java b/src/main/java/net/dongliu/apk/parser/parser/XmlTranslator.java
@@ -7,6 +7,8 @@
 import java.util.List;
 import java.util.Locale;
 
+import org.apache.commons.lang3.StringEscapeUtils;
+
 /**
  * trans to xml text when parse binary xml file.
  *
@@ -87,8 +89,9 @@ public void onAttribute(Attribute attribute) {
         } catch (NumberFormatException e) {
             finalValue = value;
         }
+        String escapedFinalValue = StringEscapeUtils.escapeXml10(finalValue);
         sb.append(attribute.name).append('=').append('"')
-                .append(finalValue.replace("\"", "\\\"")).append('"');
+                .append(escapedFinalValue).append('"');
     }
 
     //trans int attr value to string