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

refactor: remove outdated ALLOWED_PACKAGES constant

Browse Source
This commit is contained in:
Connor Tumbleson 2019-07-14 06:56:37 -04:00
parent 8084762274
commit 103aa978df
No known key found for this signature in database
GPG Key ID: C3CC0A201EC7DA75
1 changed files with 7 additions and 12 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/AndrolibResources.java
View File

@ -167,22 +167,19 @@ final public class AndrolibResources {
// compare resources.arsc package name to the one present in AndroidManifest // compare resources.arsc package name to the one present in AndroidManifest
ResPackage resPackage = resTable.getCurrentResPackage(); ResPackage resPackage = resTable.getCurrentResPackage();
String packageOriginal = resPackage.getName(); String pkgOriginal = resPackage.getName();
mPackageRenamed = resTable.getPackageRenamed(); mPackageRenamed = resTable.getPackageRenamed();
resTable.setPackageId(resPackage.getId()); resTable.setPackageId(resPackage.getId());
resTable.setPackageOriginal(packageOriginal); resTable.setPackageOriginal(pkgOriginal);
// 1) Check if packageOriginal === mPackageRenamed // 1) Check if pkgOriginal === mPackageRenamed
// 2) Check if packageOriginal is ignored via IGNORED_PACKAGES // 2) Check if pkgOriginal is ignored via IGNORED_PACKAGES
// 2a) If its ignored, make sure the mPackageRenamed isn't explicitly allowed if (pkgOriginal.equalsIgnoreCase(mPackageRenamed) || (Arrays.asList(IGNORED_PACKAGES).contains(pkgOriginal))) {
if (packageOriginal.equalsIgnoreCase(mPackageRenamed) ||
(Arrays.asList(IGNORED_PACKAGES).contains(packageOriginal) &&
! Arrays.asList(ALLOWED_PACKAGES).contains(mPackageRenamed))) {
LOGGER.info("Regular manifest package..."); LOGGER.info("Regular manifest package...");
} else { } else {
LOGGER.info("Renamed manifest package found! Replacing " + mPackageRenamed + " with " + packageOriginal); LOGGER.info("Renamed manifest package found! Replacing " + mPackageRenamed + " with " + pkgOriginal);
ResXmlPatcher.renameManifestPackage(new File(filePath), packageOriginal); ResXmlPatcher.renameManifestPackage(new File(filePath), pkgOriginal);
} }
} }
@ -1016,6 +1013,4 @@ final public class AndrolibResources {
private final static String[] IGNORED_PACKAGES = new String[] { private final static String[] IGNORED_PACKAGES = new String[] {
"android", "com.htc", "com.lge", "com.lge.internal", "yi", "flyme", "air.com.adobe.appentry", "android", "com.htc", "com.lge", "com.lge.internal", "yi", "flyme", "air.com.adobe.appentry",
"FFFFFFFFFFFFFFFFFFFFFF" }; "FFFFFFFFFFFFFFFFFFFFFF" };
private final static String[] ALLOWED_PACKAGES = new String[] { };
} }