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

fix(xml): reversed XML attribute name decoding priority (#1208)(PR #1214)

Browse Source
This commit is contained in:
Jan S
2021-07-24 16:13:27 +02:00
committed by GitHub
parent b5720bd14e
commit ea8b9ce462
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-core/src/main/java/jadx/core/xmlgen/BinaryXMLParser.java
+17 -11
View File
@@ -335,19 +335,25 @@ public class BinaryXMLParser extends CommonBinaryParser {
}
private String getAttributeName(int id) {
// As the outcome of https://github.com/skylot/jadx/issues/1208
// Android seems to favor entries from AndroidResMap and only if
// there is no entry uses the values form the XML string pool
if (0 <= id && id < resourceIds.length) {
int resId = resourceIds[id];
String str = ValuesParser.getAndroidResMap().get(resId);
if (str != null) {
// cut type before /
int typeEnd = str.indexOf('/');
if (typeEnd != -1) {
return str.substring(typeEnd + 1);
}
return str;
}
}
String str = getString(id);
if (str == null || str.isEmpty()) {
int resId = resourceIds[id];
str = ValuesParser.getAndroidResMap().get(resId);
if (str == null) {
return "NOT_FOUND_0x" + Integer.toHexString(id);
}
// cut type before /
int typeEnd = str.indexOf('/');
if (typeEnd != -1) {
return str.substring(typeEnd + 1);
}
return str;
return "NOT_FOUND_0x" + Integer.toHexString(id);
}
return str;
}