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

Merge branch 'MarcMil-master'

Browse Source
This commit is contained in:
Connor Tumbleson 2017-05-02 08:16:21 -04:00
commit af1e24be64
No known key found for this signature in database
GPG Key ID: C3CC0A201EC7DA75
12 changed files with 283 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
brut.apktool/apktool-cli/src/main/java/brut/apktool/Main.java
View File

@ -187,6 +187,11 @@ public class Main {
} catch (DirectoryException ex) {
System.err.println("Could not modify internal dex files. Please ensure you have permission.");
System.exit(1);
} finally {
try {
decoder.close();
} catch (IOException e) {
}
}
}

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

@ -741,6 +741,10 @@ public class Androlib {
return files;
}
public void close() throws IOException {
mAndRes.close();
}
private final static Logger LOGGER = Logger.getLogger(Androlib.class.getName());
private final static String SMALI_DIRNAME = "smali";

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

@ -60,6 +60,12 @@ public class ApkDecoder {
}
public void setApkFile(File apkFile) {
if (mApkFile != null) {
try {
mApkFile.close();
} catch (IOException ignored) {}
}
mApkFile = new ExtFile(apkFile);
mResTable = null;
}
@ -73,6 +79,7 @@ public class ApkDecoder {
}
public void decode() throws AndrolibException, IOException, DirectoryException {
try {
File outDir = getOutDir();
AndrolibResources.sKeepBroken = mKeepBrokenResources;
@ -160,6 +167,11 @@ public class ApkDecoder {
mAndrolib.recordUncompressedFiles(mApkFile, mUncompressedFiles);
mAndrolib.writeOriginalFiles(mApkFile, outDir);
writeMetaFile();
} finally {
try {
mApkFile.close();
} catch (IOException ignored) {}
}
}
public void setDecodeSources(short mode) throws AndrolibException {
@ -273,6 +285,10 @@ public class ApkDecoder {
}
}
public void close() throws IOException {
mAndrolib.close();
}
public final static short DECODE_SOURCES_NONE = 0x0000;
public final static short DECODE_SOURCES_SMALI = 0x0001;

18
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/AndrolibResources.java
View File

@ -121,7 +121,8 @@ final public class AndrolibResources {
File apk = getFrameworkApk(id, frameTag);
LOGGER.info("Loading resource table from file: " + apk);
ResPackage[] pkgs = getResPackagesFromApk(new ExtFile(apk), resTable, true);
mFramework = new ExtFile(apk);
ResPackage[] pkgs = getResPackagesFromApk(mFramework, resTable, true);
ResPackage pkg;
if (pkgs.length > 1) {
@ -555,8 +556,15 @@ final public class AndrolibResources {
private ResPackage[] getResPackagesFromApk(ExtFile apkFile,ResTable resTable, boolean keepBroken)
throws AndrolibException {
try {
BufferedInputStream bfi = new BufferedInputStream(apkFile.getDirectory().getFileInput("resources.arsc"));
Directory dir = apkFile.getDirectory();
BufferedInputStream bfi = new BufferedInputStream(dir.getFileInput("resources.arsc"));
try {
return ARSCDecoder.decode(bfi, false, keepBroken, resTable).getPackages();
} finally {
try {
bfi.close();
} catch (IOException ignored) {}
}
} catch (DirectoryException ex) {
throw new AndrolibException("Could not load resources.arsc from file: " + apkFile, ex);
}
@ -810,6 +818,10 @@ final public class AndrolibResources {
}
}
public void close() throws IOException {
mFramework.close();
}
public ApkOptions apkOptions;
// TODO: dirty static hack. I have to refactor decoding mechanisms.
@ -819,6 +831,8 @@ final public class AndrolibResources {
private File mFrameworkDirectory = null;
private ExtFile mFramework = null;
private String mMinSdkVersion = null;
private String mMaxSdkVersion = null;
private String mTargetSdkVersion = null;

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

@ -48,12 +48,12 @@ public class SmaliDecoder {
private void decode() throws AndrolibException {
try {
BaksmaliOptions options = new BaksmaliOptions();
final BaksmaliOptions options = new BaksmaliOptions();
// options
options.deodex = false;
options.implicitReferences = false;
options.parameterRegisters = false;
options.parameterRegisters = true;
options.localsDirective = true;
options.sequentialLabels = true;
options.debugInfo = mBakDeb;

103
brut.apktool/apktool-lib/src/test/java/brut/androlib/DefaultBaksmaliVariableTest.java Normal file
View File

@ -0,0 +1,103 @@
package brut.androlib;
import brut.common.BrutException;
import brut.directory.ExtFile;
import brut.util.OS;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.Paths;
import java.util.logging.Logger;
import static org.junit.Assert.assertEquals;
public class DefaultBaksmaliVariableTest {
@BeforeClass
public static void beforeClass() throws Exception, BrutException {
sTmpDir = new ExtFile(OS.createTempDirectory());
sTestOrigDir = new ExtFile(sTmpDir, "testjar-orig");
sTestNewDir = new ExtFile(sTmpDir, "testjar-new");
LOGGER.info("Unpacking testjar...");
TestUtils.copyResourceDir(BuildAndDecodeJarTest.class, "brut/apktool/issue1481/", sTestOrigDir);
LOGGER.info("Building issue1481.jar...");
File testJar = new File(sTmpDir, "issue1481.jar");
new Androlib().build(sTestOrigDir, testJar);
LOGGER.info("Decoding issue1481.jar...");
ApkDecoder apkDecoder = new ApkDecoder(testJar);
apkDecoder.setOutDir(sTestNewDir);
apkDecoder.decode();
}
@AfterClass
public static void afterClass() throws BrutException {
OS.rmdir(sTmpDir);
}
@Test
public void confirmBaksmaliParamsAreTheSame() throws BrutException, IOException {
String expected = TestUtils.replaceNewlines(".class public final Lcom/ibotpeaches/issue1481/BuildConfig;\n" +
".super Ljava/lang/Object;\n" +
".source \"BuildConfig.java\"\n" +
"\n" +
"\n" +
"# static fields\n" +
".field public static final APPLICATION_ID:Ljava/lang/String; = \"com.ibotpeaches.issue1481\"\n" +
"\n" +
".field public static final BUILD_TYPE:Ljava/lang/String; = \"debug\"\n" +
"\n" +
".field public static final DEBUG:Z\n" +
"\n" +
".field public static final FLAVOR:Ljava/lang/String; = \"\"\n" +
"\n" +
".field public static final VERSION_CODE:I = 0x1\n" +
"\n" +
".field public static final VERSION_NAME:Ljava/lang/String; = \"1.0\"\n" +
"\n" +
"\n" +
"# direct methods\n" +
".method static constructor <clinit>()V\n" +
" .locals 1\n" +
"\n" +
" .prologue\n" +
" .line 7\n" +
" const-string v0, \"true\"\n" +
"\n" +
" invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z\n" +
"\n" +
" move-result v0\n" +
"\n" +
" sput-boolean v0, Lcom/ibotpeaches/issue1481/BuildConfig;->DEBUG:Z\n" +
"\n" +
" return-void\n" +
".end method\n" +
"\n" +
".method public constructor <init>()V\n" +
" .locals 0\n" +
"\n" +
" .prologue\n" +
" .line 6\n" +
" invoke-direct {p0}, Ljava/lang/Object;-><init>()V\n" +
"\n" +
" return-void\n" +
".end method");
byte[] encoded = Files.readAllBytes(Paths.get(sTestNewDir + File.separator + "smali" + File.separator
+ "com" + File.separator + "ibotpeaches" + File.separator + "issue1481" + File.separator + "BuildConfig.smali"));
String obtained = TestUtils.replaceNewlines(new String(encoded));
assertEquals(expected, obtained);
}
private static ExtFile sTmpDir;
private static ExtFile sTestOrigDir;
private static ExtFile sTestNewDir;
private final static Logger LOGGER = Logger.getLogger(BuildAndDecodeJarTest.class.getName());
}

2
brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1481/apktool.yml Normal file
View File

@ -0,0 +1,2 @@
version: 2.2.3
apkFileName: issue1481.jar

45
brut.apktool/apktool-lib/src/test/resources/brut/apktool/issue1481/smali/com/ibotpeaches/issue1481/BuildConfig.smali Normal file
View File

@ -0,0 +1,45 @@
.class public final Lcom/ibotpeaches/issue1481/BuildConfig;
.super Ljava/lang/Object;
.source "BuildConfig.java"
# static fields
.field public static final APPLICATION_ID:Ljava/lang/String; = "com.ibotpeaches.issue1481"
.field public static final BUILD_TYPE:Ljava/lang/String; = "debug"
.field public static final DEBUG:Z
.field public static final FLAVOR:Ljava/lang/String; = ""
.field public static final VERSION_CODE:I = 0x1
.field public static final VERSION_NAME:Ljava/lang/String; = "1.0"
# direct methods
.method static constructor <clinit>()V
.registers 1
.prologue
.line 7
const-string v0, "true"
invoke-static {v0}, Ljava/lang/Boolean;->parseBoolean(Ljava/lang/String;)Z
move-result v0
sput-boolean v0, Lcom/ibotpeaches/issue1481/BuildConfig;->DEBUG:Z
return-void
.end method
.method public constructor <init>()V
.registers 1
.prologue
.line 6
invoke-direct {p0}, Ljava/lang/Object;-><init>()V
return-void
.end method

6
brut.j.dir/src/main/java/brut/directory/AbstractDirectory.java
View File

@ -17,6 +17,7 @@
package brut.directory;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.util.LinkedHashMap;
@ -235,6 +236,11 @@ public abstract class AbstractDirectory implements Directory {
return dirs;
}
public void close() throws IOException {
}
private SubPath getSubPath(String path) throws PathNotExist {
ParsedPath parsed = parsePath(path);
if (parsed.dir == null) {

3
brut.j.dir/src/main/java/brut/directory/Directory.java
View File

@ -50,5 +50,8 @@ public interface Directory {
public int getCompressionLevel(String fileName)
throws DirectoryException;
public void close() throws IOException;
public final char separator = '/';
}

5
brut.j.dir/src/main/java/brut/directory/ExtFile.java
View File

@ -17,6 +17,7 @@
package brut.directory;
import java.io.File;
import java.io.IOException;
import java.net.URI;
/**
@ -54,5 +55,9 @@ public class ExtFile extends File {
return mDirectory;
}
public void close() throws IOException {
mDirectory.close();
}
private Directory mDirectory;
}

4
brut.j.dir/src/main/java/brut/directory/ZipRODirectory.java
View File

@ -151,4 +151,8 @@ public class ZipRODirectory extends AbstractDirectory {
return mZipFile;
}
public void close() throws IOException {
mZipFile.close();
}
}