ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-11-11 06:59:24 +01:00
Code Issues Projects Releases Wiki Activity

progress on UnknownFile handling

Browse Source
This commit is contained in:
Connor Tumbleson 2013-03-31 09:04:12 -05:00
parent be77354859
commit 4b8ed4c2b1
2 changed files with 59 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,10 +28,10 @@ import brut.directory.*;
import brut.util.BrutIO;
import brut.util.OS;
import java.io.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.logging.Logger;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@ -143,6 +143,54 @@ public class Androlib {
}
}
private boolean isAPKFileNames(String file) {
for (String apkFile : APK_STANDARD_ALL_FILENAMES) {
if (apkFile.equals(file) || file.startsWith(apkFile)) {
return true;
}
}
return false;
}
public void decodeUnknownFiles(ExtFile apkFile, File outDir)
throws AndrolibException {
LOGGER.info("Copying unknown files/dir...");
File unknownOut = new File(outDir, UNK_DIRNAME);
// have to use container of ZipFile to help identify compression type
// with regular looping of apkFile for easy copy
try {
Directory unk = apkFile.getDirectory();
ZipFile apkZipFile = new ZipFile(apkFile.getAbsolutePath());
// loop all items in container, ignoring any that are pre-defined by aapt
Set<String> files = unk.getFiles();
for (String file : files) {
if (!isAPKFileNames(file)) {
unk.copyToDir(unknownOut,file);
System.out.println(apkZipFile.getEntry(file).getMethod());
}
}
// for folders now.
Map<String, Directory> dirs = unk.getDirs();
for (String dir : dirs.keySet()) {
if (!isAPKFileNames(dir)) {
unk.copyToDir(unknownOut,dir);
System.out.println(apkZipFile.getEntry(dir).getMethod());
}
// @todo add ability to loop through dir and pull those methods
}
}
catch (DirectoryException ex) {
throw new AndrolibException(ex);
}
catch (IOException ex) {
throw new AndrolibException(ex);
}
}
public void writeOriginalFiles(ExtFile apkFile, File outDir)
throws AndrolibException {
LOGGER.info("Copying original files...");
@ -635,11 +683,15 @@ public class Androlib {
private final static String SMALI_DIRNAME = "smali";
private final static String APK_DIRNAME = "build/apk";
private final static String UNK_DIRNAME = "unknown";
private final static String[] APK_RESOURCES_FILENAMES = new String[] {
"resources.arsc", "AndroidManifest.xml", "res" };
private final static String[] APK_RESOURCES_WITHOUT_RES_FILENAMES = new String[] {
"resources.arsc", "AndroidManifest.xml" };
private final static String[] APP_RESOURCES_FILENAMES = new String[] {
"AndroidManifest.xml", "res" };
private final static String[] APK_MANIFEST_FILENAMES = new String[] { "AndroidManifest.xml" };
private final static String[] APK_MANIFEST_FILENAMES = new String[] {
"AndroidManifest.xml" };
private final static String[] APK_STANDARD_ALL_FILENAMES = new String[] {
"classes.dex", "AndroidManifest.xml", "resources.arsc","res","lib","assets","META-INF" };
}

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

@ -133,10 +133,11 @@ public class ApkDecoder {
}
mAndrolib.decodeRawFiles(mApkFile, outDir);
mAndrolib.decodeUnknownFiles(mApkFile, outDir);
mAndrolib.writeOriginalFiles(mApkFile, outDir);
// remove version names in favour of aapt injection
mAndrolib.remove_manifest_versions(outDir.getAbsolutePath() + "/AndroidManifest.xml");
// remove version names in favour of aapt injection
mAndrolib.remove_manifest_versions(outDir.getAbsolutePath() + "/AndroidManifest.xml");
writeMetaFile();
}