Skip to content

optimize resource table build #104

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

Open
rotundtapir wants to merge 4 commits into
base: main
Choose a base branch
from
Open

optimize resource table build #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
46eead2
Update block indexes once after sorting instead of on every swap
rotundtapir Aug 27, 2026
c70337a
Skip sorting a block list that is already in order
rotundtapir Aug 27, 2026
8b20a7f
Drop the per-package refresh while encoding values
rotundtapir Aug 27, 2026
8572381
Look up defined entries by resolved id instead of scanning references
rotundtapir Aug 27, 2026
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
1 change: 0 additions & 1 deletion src/main/java/com/reandroid/apk/xmlencoder/XMLTableBlockEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ private void encodeValues(List<File> pubXmlFileList) throws IOException, XmlPull
filePathEncoder.encodePackageResDir(packageBlock, resDir);

packageBlock.sortTypes();
packageBlock.refresh();
}
}
private void encodeAttrs(List<File> pubXmlFileList) throws IOException, XmlPullParserException {
Expand Down
19 changes: 15 additions & 4 deletions src/main/java/com/reandroid/arsc/chunk/TypeBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,6 @@ public SpecTypePair getParentSpecTypePair() {
return getParent(SpecTypePair.class);
}
public Entry getOrCreateDefinedEntry(String name) {
Entry entry = getEntry(name);
if (entry != null) {
return entry;
}
PackageBlock packageBlock = getPackageBlock();
if (packageBlock == null) {
return null;
Expand All @@ -198,6 +194,21 @@ public Entry getOrCreateDefinedEntry(String name) {
if (id == 0) {
return null;
}
Entry entry = getEntry(id & 0xffff);
if (entry != null) {
String entryName = entry.getName();
if (name.equals(entryName)) {
return entry;
}
if (entryName != null && !entry.isNull()) {
// The defined id holds a different name; fall back to
// scanning this type block by name.
Entry existing = getEntry(name);
if (existing != null) {
return existing;
}
}
}
SpecStringPool stringPool = packageBlock.getSpecStringPool();
SpecString specString = stringPool.getOrCreate(name);
entry = getOrCreateEntry(id & 0xffff);
Expand Down
13 changes: 2 additions & 11 deletions src/main/java/com/reandroid/arsc/container/BlockList.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,19 +198,10 @@ public void destroy() {
onChanged();
}
public boolean sort(Comparator<? super T> comparator) {
if (size() < 2) {
if (!needsSort(comparator)) {
return false;
}
boolean sorted = mItems.sort(comparator, (i, j) -> {
T item1 = get(i);
T item2 = get(j);
if (item1 != null) {
item1.setIndex(i);
}
if (item2 != null) {
item2.setIndex(j);
}
});
boolean sorted = mItems.sortItems(comparator);
if (sorted) {
updateIndex();
}
Expand Down