From 038aa89d79d2918fb5729c8b9a91f1de5f801e87 Mon Sep 17 00:00:00 2001 From: REAndroid Date: Fri, 30 Dec 2022 11:52:41 -0500 Subject: [PATCH] Make unique package directory name for decoded res xml files --- .../java/com/reandroid/lib/apk/ApkModuleXmlDecoder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/reandroid/lib/apk/ApkModuleXmlDecoder.java b/src/main/java/com/reandroid/lib/apk/ApkModuleXmlDecoder.java index 35b8465..208b4a6 100644 --- a/src/main/java/com/reandroid/lib/apk/ApkModuleXmlDecoder.java +++ b/src/main/java/com/reandroid/lib/apk/ApkModuleXmlDecoder.java @@ -74,7 +74,7 @@ import java.util.*; EntryBlock entryBlock=resFile.pickOne(); 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); String path=resFile.buildPath(); path=path.replace('/', File.separatorChar); @@ -97,7 +97,7 @@ import java.util.*; ResXmlBlock resXmlBlock=new ResXmlBlock(); 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); String path=resFile.buildPath(); path=path.replace('/', File.separatorChar); @@ -207,6 +207,9 @@ import java.util.*; } return element; } + private String getPackageDirName(PackageBlock packageBlock){ + return packageBlock.getIndex()+"-"+packageBlock.getName(); + } private void logMessage(String msg) { APKLogger apkLogger=apkModule.getApkLogger();