fix(res): don't rename resource entries when useRawResName = true (PR #…

…2306)
skylot · Oct 14, 2024 · 958ab24 · 958ab24
1 parent 8f3cc3e
commit 958ab24
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/jadx-core/src/main/java/jadx/core/xmlgen/ResTableBinaryParser.java b/jadx-core/src/main/java/jadx/core/xmlgen/ResTableBinaryParser.java
@@ -425,20 +425,26 @@ private ResourceEntry buildResourceEntry(PackageChunk pkg, String config, int re
 			return STUB_ENTRY;
 		}
 
-		String resName = getResName(typeName, resRef, origKeyName);
-		ResourceEntry newResEntry = new ResourceEntry(resRef, pkg.getName(), typeName, resName, config);
-		ResourceEntry prevResEntry = resStorage.searchEntryWithSameName(newResEntry);
-		if (prevResEntry != null) {
-			newResEntry = newResEntry.copyWithId();
-
-			// rename also previous entry for consistency
-			ResourceEntry replaceForPrevEntry = prevResEntry.copyWithId();
-			resStorage.replace(prevResEntry, replaceForPrevEntry);
-			resStorage.addRename(replaceForPrevEntry);
-		}
-		if (!Objects.equals(origKeyName, newResEntry.getKeyName())) {
-			resStorage.addRename(newResEntry);
+		ResourceEntry newResEntry;
+		if (useRawResName) {
+			newResEntry = new ResourceEntry(resRef, pkg.getName(), typeName, origKeyName, config);
+		} else {
+			String resName = getResName(typeName, resRef, origKeyName);
+			newResEntry = new ResourceEntry(resRef, pkg.getName(), typeName, resName, config);
+			ResourceEntry prevResEntry = resStorage.searchEntryWithSameName(newResEntry);
+			if (prevResEntry != null) {
+				newResEntry = newResEntry.copyWithId();
+
+				// rename also previous entry for consistency
+				ResourceEntry replaceForPrevEntry = prevResEntry.copyWithId();
+				resStorage.replace(prevResEntry, replaceForPrevEntry);
+				resStorage.addRename(replaceForPrevEntry);
+			}
+			if (!Objects.equals(origKeyName, newResEntry.getKeyName())) {
+				resStorage.addRename(newResEntry);
+			}
 		}
+
 		resStorage.add(newResEntry);
 		return newResEntry;
 	}