Make unique package directory name for decoded res xml files

This commit is contained in:
REAndroid 2022-12-30 11:52:41 -05:00
parent eeeb061925
commit 038aa89d79

View File

@ -74,7 +74,7 @@ import java.util.*;
EntryBlock entryBlock=resFile.pickOne(); EntryBlock entryBlock=resFile.pickOne();
PackageBlock packageBlock=entryBlock.getPackageBlock(); PackageBlock packageBlock=entryBlock.getPackageBlock();
File pkgDir=new File(outDir, packageBlock.getName()); File pkgDir=new File(outDir, getPackageDirName(packageBlock));
File resDir=new File(pkgDir, ApkUtil.RES_DIR_NAME); File resDir=new File(pkgDir, ApkUtil.RES_DIR_NAME);
String path=resFile.buildPath(); String path=resFile.buildPath();
path=path.replace('/', File.separatorChar); path=path.replace('/', File.separatorChar);
@ -97,7 +97,7 @@ import java.util.*;
ResXmlBlock resXmlBlock=new ResXmlBlock(); ResXmlBlock resXmlBlock=new ResXmlBlock();
resXmlBlock.readBytes(resFile.getInputSource().openStream()); resXmlBlock.readBytes(resFile.getInputSource().openStream());
File pkgDir=new File(outDir, packageBlock.getName()); File pkgDir=new File(outDir, getPackageDirName(packageBlock));
File resDir=new File(pkgDir, ApkUtil.RES_DIR_NAME); File resDir=new File(pkgDir, ApkUtil.RES_DIR_NAME);
String path=resFile.buildPath(); String path=resFile.buildPath();
path=path.replace('/', File.separatorChar); path=path.replace('/', File.separatorChar);
@ -207,6 +207,9 @@ import java.util.*;
} }
return element; return element;
} }
private String getPackageDirName(PackageBlock packageBlock){
return packageBlock.getIndex()+"-"+packageBlock.getName();
}
private void logMessage(String msg) { private void logMessage(String msg) {
APKLogger apkLogger=apkModule.getApkLogger(); APKLogger apkLogger=apkModule.getApkLogger();