Changes ResourceFile

jadx-core/src/main/java/jadx/api/ResourceFile.java

@@ -35,7 +35,7 @@ public class ResourceFile {
 	private final String name;
 	private final ResourceType type;
 	private ZipRef zipRef;
-	private ResourceEntry alias;
+	private String deobfName;
 
 	public static ResourceFile createResourceFile(JadxDecompiler decompiler, String name, ResourceType type) {
 		if (!ZipSecurity.isValidZipEntryName(name)) {
@@ -53,26 +53,14 @@ public class ResourceFile {
 	public String getOriginalName() {
 		return name;
 	}
-	
+
 	public String getDeobfName() {
-		if(alias == null) {
-			return getOriginalName();
-		}
-		int index = name.lastIndexOf('.');
-		return String.format("%s%s/%s%s",
-				alias.getTypeName(),
-				alias.getConfig(),
-				alias.getKeyName(),
-				index == -1 ? "" : name.substring(index));
+		return deobfName != null ? deobfName : name;
 	}
 
 	public ResourceType getType() {
 		return type;
 	}
-	
-	public ResourceEntry getAlias() {
-		return alias;
-	}
 
 	public ResContainer loadContent() {
 		return ResourcesLoader.loadContent(decompiler, this);
@@ -81,9 +69,14 @@ public class ResourceFile {
 	void setZipRef(ZipRef zipRef) {
 		this.zipRef = zipRef;
 	}
-	
+
 	public void setAlias(ResourceEntry ri) {
-		this.alias = ri;
+		int index = name.lastIndexOf('.');
+		deobfName = String.format("%s%s/%s%s",
+				ri.getTypeName(),
+				ri.getConfig(),
+				ri.getKeyName(),
+				index == -1 ? "" : name.substring(index));
 	}
 
 	public ZipRef getZipRef() {

jadx-core/src/main/java/jadx/core/dex/nodes/RootNode.java

@@ -165,14 +165,14 @@ public class RootNode {
 			throw new JadxRuntimeException("Error loading jadx class set", e);
 		}
 	}
-	
+
 	private void updateObfuscatedFiles(ResTableParser parser, List<ResourceFile> resources) {
 		ResourceStorage resStorage = parser.getResStorage();
 		ValuesParser valuesParser = new ValuesParser(this, parser.getStrings(), resStorage.getResourcesNames());
-		for(int i = 0; i < resources.size(); i++) {
+		for (int i = 0; i < resources.size(); i++) {
 			ResourceFile resource = resources.get(i);
-			for(ResourceEntry ri : parser.getResStorage().getResources()) {
-				if(resource.getOriginalName().equals(valuesParser.getValueString(ri))) {
+			for (ResourceEntry ri : parser.getResStorage().getResources()) {
+				if (resource.getOriginalName().equals(valuesParser.getValueString(ri))) {
 					resource.setAlias(ri);
 					break;
 				}