From 103aa978df1a655eff779ce89a6c4c1f1fac7899 Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 14 Jul 2019 06:56:37 -0400 Subject: [PATCH] refactor: remove outdated ALLOWED_PACKAGES constant --- .../brut/androlib/res/AndrolibResources.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java index 40a57477..43724424 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java @@ -167,22 +167,19 @@ final public class AndrolibResources { // compare resources.arsc package name to the one present in AndroidManifest ResPackage resPackage = resTable.getCurrentResPackage(); - String packageOriginal = resPackage.getName(); + String pkgOriginal = resPackage.getName(); mPackageRenamed = resTable.getPackageRenamed(); resTable.setPackageId(resPackage.getId()); - resTable.setPackageOriginal(packageOriginal); + resTable.setPackageOriginal(pkgOriginal); - // 1) Check if packageOriginal === mPackageRenamed - // 2) Check if packageOriginal is ignored via IGNORED_PACKAGES - // 2a) If its ignored, make sure the mPackageRenamed isn't explicitly allowed - if (packageOriginal.equalsIgnoreCase(mPackageRenamed) || - (Arrays.asList(IGNORED_PACKAGES).contains(packageOriginal) && - ! Arrays.asList(ALLOWED_PACKAGES).contains(mPackageRenamed))) { + // 1) Check if pkgOriginal === mPackageRenamed + // 2) Check if pkgOriginal is ignored via IGNORED_PACKAGES + if (pkgOriginal.equalsIgnoreCase(mPackageRenamed) || (Arrays.asList(IGNORED_PACKAGES).contains(pkgOriginal))) { LOGGER.info("Regular manifest package..."); } else { - LOGGER.info("Renamed manifest package found! Replacing " + mPackageRenamed + " with " + packageOriginal); - ResXmlPatcher.renameManifestPackage(new File(filePath), packageOriginal); + LOGGER.info("Renamed manifest package found! Replacing " + mPackageRenamed + " with " + pkgOriginal); + ResXmlPatcher.renameManifestPackage(new File(filePath), pkgOriginal); } } @@ -1016,6 +1013,4 @@ final public class AndrolibResources { private final static String[] IGNORED_PACKAGES = new String[] { "android", "com.htc", "com.lge", "com.lge.internal", "yi", "flyme", "air.com.adobe.appentry", "FFFFFFFFFFFFFFFFFFFFFF" }; - - private final static String[] ALLOWED_PACKAGES = new String[] { }; }