jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix: preserve renames on mapping export (#1732)(PR #1893)

Browse Source
This commit is contained in:
Julian Burner
2023-06-03 15:20:06 +02:00
committed by GitHub
parent e9a7ccd00c
commit fa67f4fef7
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-plugins/jadx-rename-mappings/src/main/java/jadx/plugins/mappings/save/MappingExporter.java
+4 -6
View File
@@ -144,10 +144,12 @@ public class MappingExporter {
String srcNamespace = MappingUtil.NS_SOURCE_FALLBACK; String srcNamespace = MappingUtil.NS_SOURCE_FALLBACK;
String dstNamespace = MappingUtil.NS_TARGET_FALLBACK; String dstNamespace = MappingUtil.NS_TARGET_FALLBACK;
// Copy mappings from potentially imported mappings file
if (loadedMappingTree != null && loadedMappingTree.getDstNamespaces() != null) { if (loadedMappingTree != null && loadedMappingTree.getDstNamespaces() != null) {
srcNamespace = loadedMappingTree.getSrcNamespace(); loadedMappingTree.accept(mappingTree);
dstNamespace = loadedMappingTree.getDstNamespaces().get(0);
} }
mappingTree.visitHeader(); mappingTree.visitHeader();
mappingTree.visitNamespaces(srcNamespace, Collections.singletonList(dstNamespace)); mappingTree.visitNamespaces(srcNamespace, Collections.singletonList(dstNamespace));
mappingTree.visitContent(); 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 // Write file
MappingWriter writer = MappingWriter.create(path, mappingFormat); MappingWriter writer = MappingWriter.create(path, mappingFormat);
mappingTree.accept(writer); mappingTree.accept(writer);