From 57ef8a205acd3fc7d73806970504b5639b60eedc Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <iBotPeaches@users.noreply.github.com>
Date: Sun, 30 Jul 2023 05:52:35 -0400
Subject: [PATCH] fix: support duplicated namespaces (#3233)

---
 .../org/xmlpull/renamed/MXSerializer.java     | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java b/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
index 62fed7e5c5..454c47b90a 100644
--- a/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
+++ b/brut.apktool/apktool-lib/src/main/java/org/xmlpull/renamed/MXSerializer.java
@@ -19,7 +19,9 @@
 import org.xmlpull.v1.XmlSerializer;
 
 import java.io.*;
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 /**
  * Implementation of XmlSerializer interface from XmlPull V1 API. This
@@ -646,14 +648,24 @@ protected void closeStartTag() throws IOException {
 	}
 
 	protected void writeNamespaceDeclarations() throws IOException {
+        Set<String> uniqueNamespaces = new HashSet<>();
 		for (int i = elNamespaceCount[depth - 1]; i < namespaceEnd; i++) {
-			if (doIndent && namespaceUri[i].length() > 40) {
+            String prefix = namespacePrefix[i];
+            String uri = namespaceUri[i];
+
+            // Some applications as seen in #2664 have duplicated namespaces.
+            // AOSP doesn't care, but the parser does. So we filter them out.
+            if (uniqueNamespaces.contains(prefix + uri)) {
+                continue;
+            }
+
+			if (doIndent && uri.length() > 40) {
 				writeIndent();
 				out.write(" ");
 			}
-			if (namespacePrefix[i] != "") {
+			if (prefix != "") {
 				out.write(" xmlns:");
-				out.write(namespacePrefix[i]);
+				out.write(prefix);
 				out.write('=');
 			} else {
 				out.write(" xmlns=");
@@ -661,8 +673,10 @@ protected void writeNamespaceDeclarations() throws IOException {
 			out.write(attributeUseApostrophe ? '\'' : '"');
 
 			// NOTE: escaping of namespace value the same way as attributes!!!!
-			writeAttributeValue(namespaceUri[i], out);
+			writeAttributeValue(uri, out);
 			out.write(attributeUseApostrophe ? '\'' : '"');
+
+            uniqueNamespaces.add(prefix + uri);
 		}
 	}