fix: change resource fields generations in R class (#308)

jadx-core/src/main/java/jadx/core/codegen/ClassGen.java

@@ -34,6 +34,7 @@
 import jadx.core.dex.nodes.MethodNode;
 import jadx.core.dex.nodes.parser.FieldInitAttr;
 import jadx.core.dex.nodes.parser.FieldInitAttr.InitType;
+import jadx.core.utils.CodegenUtils;
 import jadx.core.utils.ErrorsCounter;
 import jadx.core.utils.Utils;
 import jadx.core.utils.exceptions.CodegenException;
@@ -105,9 +106,8 @@ public void addClassCode(CodeWriter code) throws CodegenException {
 		if (cls.contains(AFlag.DONT_GENERATE)) {
 			return;
 		}
-		if (cls.contains(AFlag.INCONSISTENT_CODE)) {
-			code.startLine("// jadx: inconsistent code");
-		}
+		CodegenUtils.addComments(code, cls);
+		insertDecompilationProblems(code, cls);
 		addClassDeclaration(code);
 		addClassBody(code);
 	}
@@ -296,6 +296,7 @@ private void addMethod(CodeWriter code, MethodNode mth) throws CodegenException
 			}
 			code.add(';');
 		} else {
+			CodegenUtils.addComments(code, mth);
 			insertDecompilationProblems(code, mth);
 			boolean badCode = mth.contains(AFlag.INCONSISTENT_CODE);
 			if (badCode && showInconsistentCode) {
@@ -325,9 +326,9 @@ private void addMethod(CodeWriter code, MethodNode mth) throws CodegenException
 		}
 	}
 
-	private void insertDecompilationProblems(CodeWriter code, MethodNode mth) {
-		List<JadxError> errors = mth.getAll(AType.JADX_ERROR);
-		List<JadxWarn> warns = mth.getAll(AType.JADX_WARN);
+	private void insertDecompilationProblems(CodeWriter code, AttrNode node) {
+		List<JadxError> errors = node.getAll(AType.JADX_ERROR);
+		List<JadxWarn> warns = node.getAll(AType.JADX_WARN);
 		if (!errors.isEmpty()) {
 			errors.forEach(err -> {
 				code.startLine("/*  JADX ERROR: ").add(err.getError());
@@ -351,6 +352,7 @@ private void addFields(CodeWriter code) throws CodegenException {
 			if (f.contains(AFlag.DONT_GENERATE)) {
 				continue;
 			}
+			CodegenUtils.addComments(code, f);
 			annotationGen.addForField(code, f);
 
 			if (f.getFieldInfo().isRenamed()) {

jadx-core/src/main/java/jadx/core/dex/attributes/AType.java

@@ -36,6 +36,7 @@ public class AType<T extends IAttribute> {
 
 	public static final AType<AttrList<JadxError>> JADX_ERROR = new AType<>();
 	public static final AType<AttrList<JadxWarn>> JADX_WARN = new AType<>();
+	public static final AType<AttrList<String>> COMMENTS = new AType<>();
 
 	public static final AType<ExcHandlerAttr> EXC_HANDLER = new AType<>();
 	public static final AType<CatchAttr> CATCH_BLOCK = new AType<>();

jadx-core/src/main/java/jadx/core/dex/info/ConstStorage.java

@@ -15,8 +15,8 @@
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.DexNode;
 import jadx.core.dex.nodes.FieldNode;
-import jadx.core.dex.nodes.ResRefField;
 import jadx.core.dex.nodes.parser.FieldInitAttr;
+import jadx.core.utils.ErrorsCounter;
 
 public class ConstStorage {
 
@@ -101,16 +101,16 @@ private ValueStorage getClsValues(ClassNode cls) {
 
 	@Nullable
 	public FieldNode getConstField(ClassNode cls, Object value, boolean searchGlobal) {
+		if (!replaceEnabled) {
+			return null;
+		}
 		DexNode dex = cls.dex();
 		if (value instanceof Integer) {
-			String str = resourcesNames.get(value);
-			if (str != null) {
-				return new ResRefField(dex, str.replace('/', '.'));
+			FieldNode rField = getResourceField((Integer) value, dex);
+			if (rField != null) {
+				return rField;
 			}
 		}
-		if (!replaceEnabled) {
-			return null;
-		}
 		boolean foundInGlobal = globalValues.contains(value);
 		if (foundInGlobal && !searchGlobal) {
 			return null;
@@ -139,6 +139,31 @@ public FieldNode getConstField(ClassNode cls, Object value, boolean searchGlobal
 		return null;
 	}
 
+	@Nullable
+	private FieldNode getResourceField(Integer value, DexNode dex) {
+		String str = resourcesNames.get(value);
+		if (str == null) {
+			return null;
+		}
+		ClassNode appResClass = dex.root().getAppResClass();
+		if (appResClass == null) {
+			return null;
+		}
+		String[] parts = str.split("/", 2);
+		if (parts.length != 2) {
+			return null;
+		}
+		String typeName = parts[0];
+		String fieldName = parts[1];
+		for (ClassNode innerClass : appResClass.getInnerClasses()) {
+			if (innerClass.getShortName().equals(typeName)) {
+				return innerClass.searchFieldByName(fieldName);
+			}
+		}
+		ErrorsCounter.classWarn(appResClass, "Not found resource field with id: " + value + ", name: " + str.replace('/', '.'));
+		return null;
+	}
+
 	@Nullable
 	public FieldNode getConstFieldByLiteralArg(ClassNode cls, LiteralArg arg) {
 		PrimitiveType type = arg.getType().getPrimitiveType();

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

@@ -13,7 +13,6 @@
 import com.android.dex.ClassData.Method;
 import com.android.dex.ClassDef;
 import com.android.dex.Dex;
-import com.android.dx.rop.code.AccessFlags;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,7 +50,7 @@ public class ClassNode extends LineAttrNode implements ILoadable, IDexNode {
 
 	private final List<MethodNode> methods;
 	private final List<FieldNode> fields;
-	private List<ClassNode> innerClasses = Collections.emptyList();
+	private List<ClassNode> innerClasses = new ArrayList<>();
 
 	// store decompiled code
 	private CodeWriter code;
@@ -132,14 +131,16 @@ public ClassNode(DexNode dex, ClassDef cls) {
 	}
 
 	// empty synthetic class
-	public ClassNode(DexNode dex, ClassInfo clsInfo) {
+	public ClassNode(DexNode dex, String name, int accessFlags) {
 		this.dex = dex;
-		this.clsInfo = clsInfo;
-		this.interfaces = Collections.emptyList();
-		this.methods = Collections.emptyList();
-		this.fields = Collections.emptyList();
-		this.accessFlags = new AccessInfo(AccessFlags.ACC_PUBLIC | AccessFlags.ACC_SYNTHETIC, AFType.CLASS);
+		this.clsInfo = ClassInfo.fromName(dex.root(), name);
+		this.interfaces = new ArrayList<>();
+		this.methods = new ArrayList<>();
+		this.fields = new ArrayList<>();
+		this.accessFlags = new AccessInfo(accessFlags, AFType.CLASS);
 		this.parentClass = this;
+
+		dex.addClassNode(this);
 	}
 
 	private void loadAnnotations(ClassDef cls) {
@@ -368,10 +369,8 @@ public List<ClassNode> getInnerClasses() {
 	}
 
 	public void addInnerClass(ClassNode cls) {
-		if (innerClasses.isEmpty()) {
-			innerClasses = new ArrayList<>(3);
-		}
 		innerClasses.add(cls);
+		cls.parentClass = this;
 	}
 
 	public boolean isEnum() {

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

@@ -46,12 +46,15 @@ public DexNode(RootNode root, DexFile input, int dexId) {
 
 	public void loadClasses() {
 		for (ClassDef cls : dexBuf.classDefs()) {
-			ClassNode clsNode = new ClassNode(this, cls);
-			classes.add(clsNode);
-			clsMap.put(clsNode.getClassInfo(), clsNode);
+			addClassNode(new ClassNode(this, cls));
 		}
 	}
 
+	public void addClassNode(ClassNode clsNode) {
+		classes.add(clsNode);
+		clsMap.put(clsNode.getClassInfo(), clsNode);
+	}
+
 	void initInnerClasses() {
 		// move inner classes
 		List<ClassNode> inner = new ArrayList<>();

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

@@ -37,11 +37,12 @@ public class RootNode {
 	private final ConstStorage constValues;
 	private final InfoStorage infoStorage = new InfoStorage();
 
+	private ClspGraph clsp;
 	private List<DexNode> dexNodes;
 	@Nullable
 	private String appPackage;
+	@Nullable
 	private ClassNode appResClass;
-	private ClspGraph clsp;
 
 	public RootNode(JadxArgs args) {
 		this.args = args;
@@ -90,8 +91,10 @@ public void loadResources(List<ResourceFile> resources) {
 			LOG.error("Failed to parse '.arsc' file", e);
 			return;
 		}
+		processResources(parser.getResStorage());
+	}
 
-		ResourceStorage resStorage = parser.getResStorage();
+	public void processResources(ResourceStorage resStorage) {
 		constValues.setResourcesNames(resStorage.getResourcesNames());
 		appPackage = resStorage.getAppPackage();
 		appResClass = AndroidResourcesUtils.searchAppResClass(this, resStorage);

jadx-core/src/main/java/jadx/core/dex/visitors/EnumVisitor.java

@@ -52,7 +52,7 @@ public boolean visit(ClassNode cls) throws JadxException {
 			}
 		}
 		if (staticMethod == null) {
-			ErrorsCounter.classError(cls, "Enum class init method not found");
+			ErrorsCounter.classWarn(cls, "Enum class init method not found");
 			return true;
 		}
 

jadx-core/src/main/java/jadx/core/utils/CodegenUtils.java

@@ -0,0 +1,14 @@
+package jadx.core.utils;
+
+import jadx.core.codegen.CodeWriter;
+import jadx.core.dex.attributes.AType;
+import jadx.core.dex.attributes.AttrNode;
+
+public class CodegenUtils {
+
+	public static void addComments(CodeWriter code, AttrNode node) {
+		for (String comment : node.getAll(AType.COMMENTS)) {
+			code.startLine("/* ").add(comment).add(" */");
+		}
+	}
+}

jadx-core/src/main/java/jadx/core/utils/ErrorsCounter.java

@@ -74,8 +74,8 @@ public static String classError(ClassNode cls, String errorMsg, Throwable e) {
 		return cls.dex().root().getErrorsCounter().addError(cls, errorMsg, e);
 	}
 
-	public static String classError(ClassNode cls, String errorMsg) {
-		return classError(cls, errorMsg, null);
+	public static String classWarn(ClassNode cls, String warnMsg) {
+		return cls.dex().root().getErrorsCounter().addWarning(cls, warnMsg);
 	}
 
 	public static String methodError(MethodNode mth, String errorMsg, Throwable e) {