ReVanced-Mirror/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2024-12-12 13:57:46 +01:00
Code Issues Projects Releases Wiki Activity

Revert "fix: normalize paths for uncompressed assets & unknown files"

Browse Source 
This reverts commit ca25a26944.
This commit is contained in:
Connor Tumbleson 2018-04-06 14:58:11 -04:00
parent 46ebcb0fab
commit 72196f3544
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -653,8 +653,7 @@ public class Androlib {
// loop through unknown files // loop through unknown files
for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) { for (Map.Entry<String,String> unknownFileInfo : files.entrySet()) {
String normalizedPath = BrutIO.normalizePath(unknownFileInfo.getKey()); String cleanedPath = BrutIO.sanitizeUnknownFile(unknownFileDir, unknownFileInfo.getKey());
String cleanedPath = BrutIO.sanitizeUnknownFile(unknownFileDir, normalizedPath);
File inputFile = new File(unknownFileDir, cleanedPath); File inputFile = new File(unknownFileDir, cleanedPath);
if (inputFile.isDirectory()) { if (inputFile.isDirectory()) {
continue; continue;
@ -685,16 +684,15 @@ public class Androlib {
File assetFileDir = new File(appDir, ASSET_DIRNAME); File assetFileDir = new File(appDir, ASSET_DIRNAME);
for (String asset : files) { for (String asset : files) {
String normalizedPath = BrutIO.normalizePath(asset); String cleanedPath = BrutIO.sanitizeUnknownFile(assetFileDir, asset);
String cleanedPath = BrutIO.sanitizeUnknownFile(assetFileDir, normalizedPath);
File inputFile = new File(appDir, cleanedPath); File inputFile = new File(appDir, cleanedPath);
if (inputFile.isDirectory()) { if (inputFile.isDirectory()) {
continue; continue;
} }
LOGGER.fine(String.format("Copying uncompressed asset: %s", normalizedPath)); LOGGER.fine(String.format("Copying uncompressed asset: %s", asset));
ZipEntry newEntry = getStoredZipEntry(normalizedPath, inputFile); ZipEntry newEntry = getStoredZipEntry(cleanedPath, inputFile);
outputFile.putNextEntry(newEntry); outputFile.putNextEntry(newEntry);
BrutIO.copy(inputFile, outputFile); BrutIO.copy(inputFile, outputFile);
outputFile.closeEntry(); outputFile.closeEntry();

3
brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResUnknownFiles.java
View File

@ -16,7 +16,6 @@
*/ */
package brut.androlib.res.data; package brut.androlib.res.data;
import brut.util.BrutIO;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.Map; import java.util.Map;
@ -28,7 +27,7 @@ public class ResUnknownFiles {
private final Map<String, String> mUnknownFiles = new LinkedHashMap<>(); private final Map<String, String> mUnknownFiles = new LinkedHashMap<>();
public void addUnknownFileInfo(String file, String value) { public void addUnknownFileInfo(String file, String value) {
mUnknownFiles.put(BrutIO.normalizePath(file), value); mUnknownFiles.put(file, value);
} }
public Map<String, String> getUnknownFiles() { public Map<String, String> getUnknownFiles() {