diff --git a/CHANGES b/CHANGES index a54fb962..72d29621 100644 --- a/CHANGES +++ b/CHANGES @@ -23,6 +23,7 @@ v2.0.0 (TBA) -Fixed (issue #496) - Fixes Windows builds caused by java.nio problems -Fixed (issue #510) - Any error output is sent stderr instead of stdout -Fixed (issue #426) - Filename too long (JesusFreke) +-Added output to list Apktool version to help debugging. -Updated known bytes for configurations to 38 (from addition of layout direction) -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi) diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java index 1951c1e3..b9698242 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java @@ -262,7 +262,9 @@ public class Androlib { HashMap flags, String aaptPath) throws BrutException { - mAaptPath = aaptPath; + LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + appDir.getName()); + + mAaptPath = aaptPath; Map meta = readMetaFile(appDir); Object t1 = meta.get("isFrameworkApk"); flags.put("framework", t1 == null ? false : (Boolean) t1); diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java index 29a8ab61..3d6b4d98 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java @@ -31,6 +31,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; import java.io.File; import java.io.IOException; import java.util.*; +import java.util.logging.Logger; import java.util.zip.ZipEntry; /** @@ -81,6 +82,8 @@ public class ApkDecoder { } outDir.mkdirs(); + LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + mApkFile.getName()); + if (hasResources()) { setAnalysisMode(mAnalysisMode, true); // read the resources.arsc checking for STORED vs DEFLATE @@ -342,6 +345,9 @@ public class ApkDecoder { private final Androlib mAndrolib; + private final static Logger LOGGER = Logger.getLogger(Androlib.class + .getName()); + private ExtFile mApkFile; private File mOutDir; private ResTable mResTable;