Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove Apktool Dummys. #3258

Merged
merged 2 commits into from
Aug 9, 2023
Merged

Remove Apktool Dummys. #3258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd54c13
refactor: properly parse dummy resources
iBotPeaches Aug 8, 2023
9d16eb0
feat: remove dummys
iBotPeaches Aug 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResPackage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,6 @@ boolean isSynthesized(ResID resId) {
return mSynthesizedRes.contains(resId);
}

public void removeResSpec(ResResSpec spec) {
mResSpecs.remove(spec.getId());
}

public void addResSpec(ResResSpec spec) throws AndrolibException {
if (mResSpecs.put(spec.getId(), spec) != null) {
throw new AndrolibException("Multiple resource specs: " + spec);
Expand Down
4 changes: 0 additions & 4 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ public ResTypeSpec getType() {
return mType;
}

public boolean isDummyResSpec() {
return getName().startsWith("APKTOOL_DUMMY_");
}

public void addResource(ResResource res) throws AndrolibException {
addResource(res, false);
}
Expand Down
13 changes: 1 addition & 12 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,11 @@ public final class ResTypeSpec {
private final String mName;
private final Map<String, ResResSpec> mResSpecs = new LinkedHashMap<>();

private final ResTable mResTable;
private final ResPackage mPackage;

private final int mId;
private final int mEntryCount;

public ResTypeSpec(String name, ResTable resTable, ResPackage package_, int id, int entryCount) {
public ResTypeSpec(String name, int id) {
this.mName = name;
this.mResTable = resTable;
this.mPackage = package_;
this.mId = id;
this.mEntryCount = entryCount;
}

public String getName() {
Expand All @@ -68,10 +61,6 @@ public ResResSpec getResSpecUnsafe(String name) {
return mResSpecs.get(name);
}

public void removeResSpec(ResResSpec spec) {
mResSpecs.remove(spec.getName());
}

public void addResSpec(ResResSpec spec) throws AndrolibException {
if (mResSpecs.put(spec.getName(), spec) != null) {
throw new AndrolibException(String.format("Multiple res specs: %s/%s", getName(), spec.getName()));
Expand Down
5 changes: 0 additions & 5 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/value/ResScalarValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ public void serializeToResValuesXml(XmlSerializer serializer,
}
}

// Dummy attributes should be <item> with type attribute
if (res.getResSpec().isDummyResSpec()) {
item = true;
}

// Android does not allow values (false) for ids.xml anymore
// https://issuetracker.google.com/issues/80475496
// But it decodes as a ResBoolean, which makes no sense. So force it to empty
Expand Down
55 changes: 3 additions & 52 deletions brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ private ARSCDecoder(InputStream arscStream, ResTable resTable, boolean storeFlag

private ResPackage[] readResourceTable() throws IOException, AndrolibException {
Set<ResPackage> pkgs = new LinkedHashSet<>();

ResTypeSpec typeSpec;

chunkLoop:
Expand Down Expand Up @@ -112,10 +113,6 @@ private ResPackage[] readResourceTable() throws IOException, AndrolibException {
}
}

if (mPkg != null && mPkg.getResSpecCount() > 0) {
addMissingResSpecs();
}

return pkgs.toArray(new ResPackage[0]);
}

Expand Down Expand Up @@ -245,7 +242,7 @@ private ResTypeSpec readTableSpecType() throws AndrolibException, IOException {
mHeader.checkForUnreadHeader(mIn);

mIn.skipBytes(entryCount * 4); // flags
mTypeSpec = new ResTypeSpec(mTypeNames.getString(id - 1), mResTable, mPkg, id, entryCount);
mTypeSpec = new ResTypeSpec(mTypeNames.getString(id - 1), id);
mPkg.addType(mTypeSpec);

return mTypeSpec;
Expand All @@ -264,7 +261,6 @@ private ResType readTableType() throws IOException, AndrolibException {
int entryCount = mIn.readInt();
mIn.skipInt(); // entriesStart

mMissingResSpecMap = new LinkedHashMap<>();
ResConfigFlags flags = readConfigFlags();

mHeader.checkForUnreadHeader(mIn);
Expand Down Expand Up @@ -297,12 +293,11 @@ private ResType readTableType() throws IOException, AndrolibException {
mType = flags.isInvalid && !mKeepBroken ? null : mPkg.getOrCreateConfig(flags);

for (int i : entryOffsetMap.keySet()) {
mResId = (mResId & 0xffff0000) | i;
int offset = entryOffsetMap.get(i);
if (offset == NO_ENTRY) {
continue;
}
mMissingResSpecMap.put(i, false);
mResId = (mResId & 0xffff0000) | i;

// As seen in some recent APKs - there are more entries reported than can fit in the chunk.
if (mIn.position() == mHeader.endPosition) {
Expand Down Expand Up @@ -369,14 +364,6 @@ private void readEntry(EntryData entryData) throws AndrolibException {
ResResSpec spec;
if (mPkg.hasResSpec(resId)) {
spec = mPkg.getResSpec(resId);

if (spec.isDummyResSpec()) {
removeResSpec(spec);

spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
mPkg.addResSpec(spec);
mTypeSpec.addResSpec(spec);
}
} else {
spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
mPkg.addResSpec(spec);
Expand Down Expand Up @@ -598,41 +585,6 @@ private void addTypeSpec(ResTypeSpec resTypeSpec) {
mResTypeSpecs.put(resTypeSpec.getId(), resTypeSpec);
}

private void addMissingResSpecs() throws AndrolibException {
int resId = mResId & 0xffff0000;

for (int i : mMissingResSpecMap.keySet()) {
if (mMissingResSpecMap.get(i)) continue;

ResResSpec spec = new ResResSpec(new ResID(resId | i), "APKTOOL_DUMMY_" + Integer.toHexString(i), mPkg, mTypeSpec);

// If we already have this resID don't add it again.
if (! mPkg.hasResSpec(new ResID(resId | i))) {
mPkg.addResSpec(spec);
mTypeSpec.addResSpec(spec);

if (mType == null) {
mType = mPkg.getOrCreateConfig(new ResConfigFlags());
}

// We are going to make dummy attributes a null reference (@null) now instead of a boolean false.
// This is because aapt2 is much more strict when it comes to what we can put in an application.
ResValue value = new ResReferenceValue(mPkg, 0, "");

ResResource res = new ResResource(mType, spec, value);
mType.addResource(res);
spec.addResource(res);
}
}
}

private void removeResSpec(ResResSpec spec) {
if (mPkg.hasResSpec(spec.getId())) {
mPkg.removeResSpec(spec);
mTypeSpec.removeResSpec(spec);
}
}

private ARSCHeader nextChunk() throws IOException {
return mHeader = ARSCHeader.read(mIn);
}
Expand All @@ -658,7 +610,6 @@ private void checkChunkType(int expectedType) throws AndrolibException {
private ResType mType;
private int mResId;
private int mTypeIdOffset = 0;
private HashMap<Integer, Boolean> mMissingResSpecMap;
private final HashMap<Integer, ResTypeSpec> mResTypeSpecs = new HashMap<>();

private final static short ENTRY_FLAG_COMPLEX = 0x0001;
Expand Down