ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-06-02 03:16:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2785 from iBotPeaches/revert-2650-fix-private-reference

Browse Source 
Revert "fix: decoding references to private resources"
This commit is contained in:
Connor Tumbleson 2022-03-21 07:44:22 -04:00 committed by GitHub
parent 49071d0fb0
commit fc28ac56ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResResSpec.java
View File

@ -18,7 +18,6 @@ package brut.androlib.res.data;
import brut.androlib.AndrolibException;
import brut.androlib.err.UndefinedResObjectException;
import brut.androlib.res.decoder.ARSCDecoder;
import org.apache.commons.lang3.StringUtils;
import java.util.LinkedHashMap;
@ -29,13 +28,11 @@ import java.util.Set;
public class ResResSpec {
private final ResID mId;
private final String mName;
private final int mFlags;
private final ResPackage mPackage;
private final ResTypeSpec mType;
private final Map<ResConfigFlags, ResResource> mResources = new LinkedHashMap<>();
public ResResSpec(ResID id, String name, int flags, ResPackage pkg, ResTypeSpec type) {
this.mFlags = flags;
public ResResSpec(ResID id, String name, ResPackage pkg, ResTypeSpec type) {
this.mId = id;
String cleanName;
@ -75,19 +72,13 @@ public class ResResSpec {
return mResources.containsKey(new ResConfigFlags());
}
public boolean isPublicResource() {
return (getFlags() & ARSCDecoder.ENTRY_FLAG_PUBLIC) != 0;
}
public String getFullName(ResPackage relativeToPackage, boolean excludeType) {
return getFullName(getPackage().equals(relativeToPackage), excludeType);
}
public String getFullName(boolean excludePackage, boolean excludeType) {
String privateSuffix = isPublicResource() ? "" : "*";
String packageName = excludePackage ? "" : getPackage().getName() + ":";
return (packageName.isEmpty() ? "" : privateSuffix + packageName)
+ (excludeType ? "" : getType().getName() + "/") + getName();
return (excludePackage ? "" : getPackage().getName() + ":")
+ (excludeType ? "" : getType().getName() + "/") + getName();
}
public ResID getId() {
@ -106,10 +97,6 @@ public class ResResSpec {
return mType;
}
public int getFlags() {
return mFlags;
}
public boolean isDummyResSpec() {
return getName().startsWith("APKTOOL_DUMMY_");
}

8
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java
View File

@ -336,12 +336,12 @@ public class ARSCDecoder {
if (spec.isDummyResSpec()) {
removeResSpec(spec);
spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), entryData.mFlags, mPkg, mTypeSpec);
spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
mPkg.addResSpec(spec);
mTypeSpec.addResSpec(spec);
}
} else {
spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), entryData.mFlags, mPkg, mTypeSpec);
spec = new ResResSpec(resId, mSpecNames.getString(specNamesId), mPkg, mTypeSpec);
mPkg.addResSpec(spec);
mTypeSpec.addResSpec(spec);
}
@ -538,7 +538,7 @@ public class ARSCDecoder {
continue;
}
ResResSpec spec = new ResResSpec(new ResID(resId | i), "APKTOOL_DUMMY_" + Integer.toHexString(i), ENTRY_FLAG_PUBLIC, mPkg, mTypeSpec);
ResResSpec spec = new ResResSpec(new ResID(resId | i), "APKTOOL_DUMMY_" + Integer.toHexString(i), mPkg, mTypeSpec);
// If we already have this resID dont add it again.
if (! mPkg.hasResSpec(new ResID(resId | i))) {
@ -602,7 +602,7 @@ public class ARSCDecoder {
private final HashMap<Integer, ResTypeSpec> mResTypeSpecs = new HashMap<>();
private final static short ENTRY_FLAG_COMPLEX = 0x0001;
public final static short ENTRY_FLAG_PUBLIC = 0x0002;
private final static short ENTRY_FLAG_PUBLIC = 0x0002;
private final static short ENTRY_FLAG_WEAK = 0x0004;
public static class Header {

10
brut.apktool/apktool-lib/src/test/java/brut/androlib/aapt2/BuildAndDecodeTest.java
View File

@ -72,16 +72,6 @@ public class BuildAndDecodeTest extends BaseTest {
compareValuesFiles("values/strings.xml");
}
@Test
public void valuesColorsTest() throws BrutException {
compareValuesFiles("values/colors.xml");
}
@Test
public void valuesBoolsTest() throws BrutException {
compareValuesFiles("values/bools.xml");
}
@Test
public void valuesMaxLengthTest() throws BrutException {
compareValuesFiles("values-es/strings.xml");

4
brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/bools.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item type="bool" name="bool_private_reference">@*android:bool/config_enableActivityRecognitionHardwareOverlay</item>
</resources>

4
brut.apktool/apktool-lib/src/test/resources/aapt2/testapp/res/values/colors.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="color_private_reference">@*android:color/Indigo_700</color>
</resources>