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

fix: don't replace resources names with field names (#465)

Browse Source
This commit is contained in:
Skylot
2019-03-12 19:35:05 +03:00
parent 43538902a3
commit 7243ab5cb6
1 changed files with 10 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+10 -33
View File
@@ -15,8 +15,6 @@ import org.slf4j.LoggerFactory;
import jadx.api.ResourcesLoader; import jadx.api.ResourcesLoader;
import jadx.core.codegen.CodeWriter; import jadx.core.codegen.CodeWriter;
import jadx.core.dex.info.ConstStorage; import jadx.core.dex.info.ConstStorage;
import jadx.core.dex.instructions.args.ArgType;
import jadx.core.dex.nodes.FieldNode;
import jadx.core.dex.nodes.RootNode; import jadx.core.dex.nodes.RootNode;
import jadx.core.utils.StringUtils; import jadx.core.utils.StringUtils;
import jadx.core.utils.exceptions.JadxRuntimeException; import jadx.core.utils.exceptions.JadxRuntimeException;
@@ -40,7 +38,6 @@ public class BinaryXMLParser extends CommonBinaryParser {
private static final boolean ATTR_NEW_LINE = false; private static final boolean ATTR_NEW_LINE = false;
private final Map<Integer, String> styleMap = new HashMap<>(); private final Map<Integer, String> styleMap = new HashMap<>();
private final Map<Integer, FieldNode> localStyleMap = new HashMap<>();
private final Map<Integer, String> resNames; private final Map<Integer, String> resNames;
private final Map<String, String> nsMap = new HashMap<>(); private final Map<String, String> nsMap = new HashMap<>();
private Set<String> nsMapGenerated; private Set<String> nsMapGenerated;
@@ -63,16 +60,7 @@ public class BinaryXMLParser extends CommonBinaryParser {
this.rootNode = rootNode; this.rootNode = rootNode;
try { try {
readAndroidRStyleClass(); readAndroidRStyleClass();
// add application constants
ConstStorage constStorage = rootNode.getConstValues(); ConstStorage constStorage = rootNode.getConstValues();
Map<Object, FieldNode> constFields = constStorage.getGlobalConstFields();
for (Map.Entry<Object, FieldNode> entry : constFields.entrySet()) {
Object key = entry.getKey();
FieldNode field = entry.getValue();
if (field.getType().equals(ArgType.INT) && key instanceof Integer) {
localStyleMap.put((Integer) key, field);
}
}
resNames = constStorage.getResourcesNames(); resNames = constStorage.getResourcesNames();
} catch (Exception e) { } catch (Exception e) {
throw new JadxRuntimeException("BinaryXMLParser init error", e); throw new JadxRuntimeException("BinaryXMLParser init error", e);
@@ -381,38 +369,27 @@ public class BinaryXMLParser extends CommonBinaryParser {
private void decodeAttribute(int attributeNS, int attrValDataType, int attrValData, private void decodeAttribute(int attributeNS, int attrValDataType, int attrValData,
String shortNsName, String attrName) { String shortNsName, String attrName) {
if (attrValDataType == TYPE_REFERENCE) { if (attrValDataType == TYPE_REFERENCE) {
// reference custom processing // reference custom processing
String name = styleMap.get(attrValData); String name = styleMap.get(attrValData);
if (name != null) { if (name != null) {
writer.add("@style/").add(name.replaceAll("_", ".")); writer.add("@style/").add(name.replaceAll("_", "."));
} else { } else {
FieldNode field = localStyleMap.get(attrValData); String resName = resNames.get(attrValData);
if (field != null) { if (resName != null) {
String cls = field.getParentClass().getShortName().toLowerCase();
writer.add("@"); writer.add("@");
if ("id".equals(cls)) { if (resName.startsWith("id/")) {
writer.add('+'); writer.add("+");
} }
writer.add(cls).add("/").add(field.getName()); writer.add(resName);
} else { } else {
String resName = resNames.get(attrValData); resName = ValuesParser.getAndroidResMap().get(attrValData);
if (resName != null) { if (resName != null) {
writer.add("@"); writer.add("@android:").add(resName);
if (resName.startsWith("id/")) { } else if (attrValData == 0) {
writer.add("+"); writer.add("@null");
}
writer.add(resName);
} else { } else {
resName = ValuesParser.getAndroidResMap().get(attrValData); writer.add("0x").add(Integer.toHexString(attrValData));
if (resName != null) {
writer.add("@android:").add(resName);
} else if (attrValData == 0) {
writer.add("@null");
} else {
writer.add("0x").add(Integer.toHexString(attrValData));
}
} }
} }
} }