From fa67f4fef7a2cbffaafb52b2f0600eb569dda5b3 Mon Sep 17 00:00:00 2001
From: Julian Burner <48808497+NebelNidas@users.noreply.github.com>
Date: Sat, 3 Jun 2023 15:20:06 +0200
Subject: [PATCH] fix: preserve renames on mapping export (#1732)(PR #1893)

---
 .../jadx/plugins/mappings/save/MappingExporter.java    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java
index 953e6daf1..462d203a4 100644
--- a/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java
+++ b/jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java
@@ -144,10 +144,12 @@ public class MappingExporter {
 
 			String srcNamespace = MappingUtil.NS_SOURCE_FALLBACK;
 			String dstNamespace = MappingUtil.NS_TARGET_FALLBACK;
+
+			// Copy mappings from potentially imported mappings file
 			if (loadedMappingTree != null && loadedMappingTree.getDstNamespaces() != null) {
-				srcNamespace = loadedMappingTree.getSrcNamespace();
-				dstNamespace = loadedMappingTree.getDstNamespaces().get(0);
+				loadedMappingTree.accept(mappingTree);
 			}
+
 			mappingTree.visitHeader();
 			mappingTree.visitNamespaces(srcNamespace, Collections.singletonList(dstNamespace));
 			mappingTree.visitContent();
@@ -243,10 +245,6 @@ public class MappingExporter {
 					}
 				}
 			}
-			// Copy mappings from potentially imported mappings file
-			if (loadedMappingTree != null && loadedMappingTree.getDstNamespaces() != null) {
-				loadedMappingTree.accept(mappingTree);
-			}
 			// Write file
 			MappingWriter writer = MappingWriter.create(path, mappingFormat);
 			mappingTree.accept(writer);