ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-01-07 18:45:58 +01:00
Code Issues Projects Releases Wiki Activity

Add apktool version to output during decode/rebuild

Browse Source
This commit is contained in:
Connor Tumbleson 2013-09-17 21:52:09 -05:00
parent 27922bdb81
commit 02ac674551
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -23,6 +23,7 @@ v2.0.0 (TBA)
-Fixed (issue #496) - Fixes Windows builds caused by java.nio problems -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 #510) - Any error output is sent stderr instead of stdout
-Fixed (issue #426) - Filename too long (JesusFreke) -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) -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) -Fixed NPE when handling odex apks even with --no-src specified. (Thanks Rodrigo Chiossi)

4
brut.apktool/apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -262,7 +262,9 @@ public class Androlib {
HashMap<String, Boolean> flags, String aaptPath) HashMap<String, Boolean> flags, String aaptPath)
throws BrutException { throws BrutException {
mAaptPath = aaptPath; LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + appDir.getName());
mAaptPath = aaptPath;
Map<String, Object> meta = readMetaFile(appDir); Map<String, Object> meta = readMetaFile(appDir);
Object t1 = meta.get("isFrameworkApk"); Object t1 = meta.get("isFrameworkApk");
flags.put("framework", t1 == null ? false : (Boolean) t1); flags.put("framework", t1 == null ? false : (Boolean) t1);

6
brut.apktool/apktool-lib/src/main/java/brut/androlib/ApkDecoder.java
View File

@ -31,6 +31,7 @@ import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import java.io.File; import java.io.File;
import java.io.IOException; import java.io.IOException;
import java.util.*; import java.util.*;
import java.util.logging.Logger;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
/** /**
@ -81,6 +82,8 @@ public class ApkDecoder {
} }
outDir.mkdirs(); outDir.mkdirs();
LOGGER.info("Using Apktool " + Androlib.getVersion() + " on " + mApkFile.getName());
if (hasResources()) { if (hasResources()) {
setAnalysisMode(mAnalysisMode, true); setAnalysisMode(mAnalysisMode, true);
// read the resources.arsc checking for STORED vs DEFLATE // read the resources.arsc checking for STORED vs DEFLATE
@ -342,6 +345,9 @@ public class ApkDecoder {
private final Androlib mAndrolib; private final Androlib mAndrolib;
private final static Logger LOGGER = Logger.getLogger(Androlib.class
.getName());
private ExtFile mApkFile; private ExtFile mApkFile;
private File mOutDir; private File mOutDir;
private ResTable mResTable; private ResTable mResTable;