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

fix: don't rename R class fields alias (PR #492)

Browse Source 
* fix: R class fields alias
* implemented with clearer approach
This commit is contained in:
tRuNKator
2019-03-22 16:54:22 +05:00
committed by skylot
parent 2e9039da4e
commit 5f0dbf856b
3 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/deobf/Deobfuscator.java
+3
View File
@@ -11,6 +11,7 @@ import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import jadx.core.dex.attributes.AFlag;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -225,6 +226,8 @@ public class Deobfuscator {
clsInfo.rename(cls.dex().root(), fullName);
}
for (FieldNode field : cls.getFields()) {
if (field.contains(AFlag.DONT_RENAME))
continue;
renameField(field);
}
for (MethodNode mth : cls.getMethods()) {
jadx-core/src/main/java/jadx/core/dex/attributes/AFlag.java
+1
View File
@@ -19,6 +19,7 @@ public enum AFlag {
DONT_SHRINK,
DONT_INLINE,
DONT_GENERATE,
DONT_RENAME, // do not rename during deobfuscation
SKIP,
REMOVE,
jadx-core/src/main/java/jadx/core/utils/android/AndroidResourcesUtils.java
+2
View File
@@ -6,6 +6,7 @@ import java.util.Map;
import java.util.TreeMap;
import com.android.dx.rop.code.AccessFlags;
import jadx.core.dex.attributes.AFlag;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
@@ -124,6 +125,7 @@ public class AndroidResourcesUtils {
if (fieldNode != null
&& !fieldNode.getName().equals(resName)
&& NameMapper.isValidIdentifier(resName)) {
fieldNode.add(AFlag.DONT_RENAME);
fieldNode.getFieldInfo().setAlias(resName);
}
}