From 1e3b66f9be3e1c78afe20192e0c828e9520bcc2c Mon Sep 17 00:00:00 2001 From: Connor Tumbleson Date: Sun, 9 Mar 2014 17:47:43 -0500 Subject: [PATCH] adds "miui", "android" and "com.htc" to list of ignored renamed packages. --- CHANGES | 1 + .../src/main/java/brut/androlib/res/AndrolibResources.java | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGES b/CHANGES index 8911bc7b..3bacd672 100644 --- a/CHANGES +++ b/CHANGES @@ -36,6 +36,7 @@ v2.0.0 (TBA) -Fixed (issue #196) - Fixed style crash due to malformed styles. -Fixed (issue #603) - Fixed unknown files prefixed with common name from being ignored. -Fixed (issue #606) - Fixed unknown files being ignored when -r is used. +-Fixed (issue #609) - Fixed handling renamed manifests with ("android", "com.htc" and "miui"). -Fixed issue with non-URI standard characters in apk name (Thanks rover12421) -Added output to list Apktool version to help debugging. -Updated known bytes for configurations to 38 (from addition of layout direction) 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 112253a0..7b5e6ade 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 @@ -184,8 +184,8 @@ final public class AndrolibResources { resTable.setPackageId(resPackage.getId()); resTable.setPackageOriginal(mPackageOriginal); - if (mPackageOriginal.equalsIgnoreCase(mPackageRenamed) || "android".equalsIgnoreCase(mPackageRenamed) - || "com.htc".equalsIgnoreCase(mPackageRenamed)) { + if (mPackageOriginal.equalsIgnoreCase(mPackageRenamed) || + Arrays.asList(IGNORED_PACKAGES).contains(mPackageOriginal)) { LOGGER.info("Regular manifest package..."); } else { try { @@ -851,4 +851,6 @@ final public class AndrolibResources { private File mAaptBinary = null; + private final static String[] IGNORED_PACKAGES = new String[] { + "android", "com.htc", "miui" }; }