ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-04 18:12:54 +01:00
Code Issues Projects Releases Wiki Activity

fix: fallback to res-auto namespace if non-android pkg

Browse Source
This commit is contained in:
Connor Tumbleson 2020-11-28 15:29:57 -05:00 committed by Connor Tumbleson
parent 150ffc4fdc
commit 3ab1a1a5e4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/AXmlResourceParser.java
View File

@ -296,7 +296,7 @@ public class AXmlResourceParser implements XmlResourceParser {
if (value.length() == 0) { if (value.length() == 0) {
ResID resourceId = new ResID(getAttributeNameResource(index)); ResID resourceId = new ResID(getAttributeNameResource(index));
if (resourceId.package_ == PRIVATE_PKG_ID) { if (resourceId.package_ == PRIVATE_PKG_ID) {
value = getNonDefaultNamespaceUri(); value = getNonDefaultNamespaceUri(offset);
} else { } else {
value = android_ns; value = android_ns;
} }
@ -305,15 +305,19 @@ public class AXmlResourceParser implements XmlResourceParser {
return value; return value;
} }
private String getNonDefaultNamespaceUri() { private String getNonDefaultNamespaceUri(int offset) {
int offset = m_namespaces.getCurrentCount() + 1; String prefix = m_strings.getString(m_namespaces.getPrefix(offset));
String prefix = m_strings.getString(m_namespaces.get(offset, true)); if (prefix != null) {
return m_strings.getString(m_namespaces.getUri(offset));
if (! prefix.equalsIgnoreCase("android")) {
return m_strings.getString(m_namespaces.get(offset, false));
} }
return android_ns; // If we are here. There is some clever obfuscation going on. Our reference points to the namespace are gone.
// Normally we could take the index * attributeCount to get an offset.
// That would point to the URI in the StringBlock table, but that is empty.
// We have the namespaces that can't be touched in the opening tag.
// Though no known way to correlate them at this time.
// So return the res-auto namespace.
return "http://schemas.android.com/apk/res-auto";
} }
@Override @Override
@ -985,7 +989,7 @@ public class AXmlResourceParser implements XmlResourceParser {
private StringBlock m_strings; private StringBlock m_strings;
private int[] m_resourceIDs; private int[] m_resourceIDs;
private NamespaceStack m_namespaces = new NamespaceStack(); private NamespaceStack m_namespaces = new NamespaceStack();
private String android_ns = "http://schemas.android.com/apk/res/android"; private final String android_ns = "http://schemas.android.com/apk/res/android";
private boolean m_decreaseDepth; private boolean m_decreaseDepth;
private int m_event; private int m_event;
private int m_lineNumber; private int m_lineNumber;