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

Fix for window builds due to java.nio

Browse Source
This commit is contained in:
Connor Tumbleson 2013-09-07 08:53:07 -05:00
parent acea65f63a
commit 054ddb1388
2 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -20,6 +20,7 @@ v2.0.0 (TBA)
-Fixed (issue #469) - Added (-m / --match-original) -Fixed (issue #469) - Added (-m / --match-original)
-Fixed (issue #326) - Fixed PNG increasing brightness on build (Thanks Christiaan) -Fixed (issue #326) - Fixed PNG increasing brightness on build (Thanks Christiaan)
-Fixed (issue #448) - Merge smali2 into Apktool -Fixed (issue #448) - Merge smali2 into Apktool
-Fixed (issue #496) - Fixes Windows builds caused by java.nio problems
-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)

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

@ -536,7 +536,7 @@ public class Androlib {
} }
public void buildUnknownFiles(File appDir, File outFile, Map<String, Object> meta) public void buildUnknownFiles(File appDir, File outFile, Map<String, Object> meta)
throws AndrolibException { throws AndrolibException {
File file; File file;
mPath = Paths.get(appDir.getPath() + File.separatorChar + UNK_DIRNAME); mPath = Paths.get(appDir.getPath() + File.separatorChar + UNK_DIRNAME);
@ -554,18 +554,15 @@ public class Androlib {
// create filesystem // create filesystem
Path path = Paths.get(outFile.getAbsolutePath()); Path path = Paths.get(outFile.getAbsolutePath());
URI apkFileSystem = new URI("jar", path.toUri().toString(), null); URI apkFileSystem = new URI("jar", path.toUri().toString(), null);
try(FileSystem zipFS = FileSystems.newFileSystem(apkFileSystem, zip_properties)) {
// loop through files inside // loop through files inside
for (Map.Entry<String,String> entry : files.entrySet()) { for (Map.Entry<String,String> entry : files.entrySet()) {
// check if file exists file = new File(mPath.toFile(), entry.getKey());
file = new File(mPath.toFile(), entry.getKey()); if (file.isFile() && file.exists()) {
if (file.isFile() && file.exists()) { insertFolder(apkFileSystem, zip_properties, file.getParentFile(), entry.getValue(), mPath.toAbsolutePath());
insertFile(zipFS, file, entry.getValue(),mPath.toAbsolutePath()); insertFile(apkFileSystem, zip_properties, file, entry.getValue(), mPath.toAbsolutePath());
}
} }
zipFS.close();
} }
} catch (IOException ex) { } catch (IOException ex) {
throw new AndrolibException(ex); throw new AndrolibException(ex);
@ -575,17 +572,41 @@ public class Androlib {
} }
} }
public void insertFile(FileSystem zipfs, File insert, String method, Path root) private void insertFile(URI apkFileSystem, Map<String,String> zip_properties, File insert, String method, Path location)
throws AndrolibException, IOException { throws AndrolibException, IOException {
Path zipRoot = zipfs.getPath(zipfs.getSeparator());
Path zipPath = zipfs.getPath(zipRoot.toString() + insert.getAbsolutePath().replace(root.toString(),""));
Path tmp = zipPath.normalize().getParent();
if (!Files.isDirectory(tmp, LinkOption.NOFOLLOW_LINKS)) { // ZipFileSystem only writes at .close()
Files.createDirectories(tmp); // http://mail.openjdk.java.net/pipermail/nio-dev/2012-July/001764.html
try(FileSystem fs = FileSystems.newFileSystem(apkFileSystem, zip_properties)) {
Path root = fs.getPath("/");
// in order to get the path relative to the zip, we strip off the absolute path, minus what we
// already have in the zip. thus /var/files/apktool/apk/unknown/folder/file => /folder/file
Path dest = fs.getPath(root.toString() + insert.getAbsolutePath().replace(location.toString(),""));
Path newFile = Paths.get(insert.getAbsolutePath());
Files.copy(newFile,dest, StandardCopyOption.REPLACE_EXISTING);
fs.close();
}
}
private void insertFolder(URI apkFileSystem, Map<String,String> zip_properties, File insert, String method, Path location)
throws AndrolibException, IOException {
try(FileSystem fs = FileSystems.newFileSystem(apkFileSystem, zip_properties)) {
Path root = fs.getPath("/");
Path dest = fs.getPath(root.toString() + insert.getAbsolutePath().replace(location.toString(),""));
Path parent = dest.normalize();
// check for folder existing in apkFileSystem
if (parent != null && Files.notExists(parent)) {
if (!Files.isDirectory(parent, LinkOption.NOFOLLOW_LINKS)) {
Files.createDirectories(parent);
}
}
fs.close();
} }
Path newFile = Paths.get(insert.getAbsolutePath());
Files.copy(newFile,zipPath, StandardCopyOption.REPLACE_EXISTING);
} }
public void buildApk(File appDir, File outApk, public void buildApk(File appDir, File outApk,