handle multiple packages on xml encoding

src/main/java/com/reandroid/lib/apk/ResourceIds.java

@@ -83,6 +83,7 @@ import java.util.*;
     public void fromXml(XMLDocument xmlDocument) throws IOException {
         mTable.fromXml(xmlDocument);
     }
+
     public XMLDocument toXMLDocument(){
         return mTable.toXMLDocument();
     }

src/main/java/com/reandroid/lib/apk/xmlencoder/EncodeMaterials.java

@@ -35,11 +35,12 @@
  import java.util.regex.Matcher;
 
  public class EncodeMaterials implements ResourceResolver {
-     private ResourceIds.Table.Package packageIds;
+     private final Set<ResourceIds.Table.Package> packageIdSet = new HashSet<>();
      private PackageBlock currentPackage;
      private final Set<FrameworkTable> frameworkTables = new HashSet<>();
      private APKLogger apkLogger;
      private boolean mForceCreateNamespaces = true;
+     private Set<String> mFrameworkPackageNames;
      public EncodeMaterials(){
      }
      public SpecString getSpecString(String name){
@@ -134,11 +135,12 @@
          return getFrameworkEntry(packageName, type, name);
      }
      public int resolveLocalResourceId(String type, String name){
-         ResourceIds.Table.Package.Type.Entry entry =
+         for(ResourceIds.Table.Package pkg:packageIdSet){
-                 this.packageIds.getEntry(type, name);
+             ResourceIds.Table.Package.Type.Entry entry = pkg.getEntry(type, name);
              if(entry!=null){
                  return entry.getResourceId();
              }
+         }
          EntryGroup entryGroup=getLocalEntryGroup(type, name);
          if(entryGroup!=null){
              return entryGroup.getResourceId();
@@ -240,14 +242,20 @@
          return null;
      }
      private boolean isFrameworkPackageName(String packageName){
+         return getFrameworkPackageNames().contains(packageName);
+     }
+     private Set<String> getFrameworkPackageNames(){
+         if(mFrameworkPackageNames!=null){
+             return mFrameworkPackageNames;
+         }
+         Set<String> results=new HashSet<>();
          for(FrameworkTable table:frameworkTables){
              for(PackageBlock packageBlock:table.listPackages()){
-                 if(packageName.equals(packageBlock.getName())){
+                 results.add(packageBlock.getName());
-                     return true;
              }
          }
-         }
+         mFrameworkPackageNames=results;
-         return false;
+         return results;
      }
      public EntryBlock getFrameworkEntry(String packageName, String type, String name){
          for(FrameworkTable table:frameworkTables){
@@ -280,8 +288,12 @@
          this.mForceCreateNamespaces = force;
          return this;
      }
-     public EncodeMaterials setPackageIds(ResourceIds.Table.Package packageIds) {
+     public EncodeMaterials addPackageIds(Collection<ResourceIds.Table.Package> packageIdList) {
-         this.packageIds = packageIds;
+         this.packageIdSet.addAll(packageIdList);
+         return this;
+     }
+     public EncodeMaterials addPackageIds(ResourceIds.Table.Package packageIds) {
+         this.packageIdSet.add(packageIds);
          return this;
      }
      public EncodeMaterials setCurrentPackage(PackageBlock currentPackage) {
@@ -291,6 +303,7 @@
      public EncodeMaterials addFramework(FrameworkTable frameworkTable) {
          frameworkTable.loadResourceNameMap();
          this.frameworkTables.add(frameworkTable);
+         this.mFrameworkPackageNames=null;
          return this;
      }
      public EncodeMaterials setAPKLogger(APKLogger logger) {
@@ -298,9 +311,6 @@
          return this;
      }
 
-     public ResourceIds.Table.Package getPackageIds() {
-         return packageIds;
-     }
      public PackageBlock getCurrentPackage() {
          return currentPackage;
      }
@@ -317,7 +327,7 @@
 
      @Override
      public int resolveResourceId(String packageName, String type, String name) {
-         if(packageName==null || packageName.equals(getCurrentPackageName())){
+         if(!isFrameworkPackageName(packageName)){
              return resolveLocalResourceId(type, name);
          }
          return resolveFrameworkResourceId(packageName, type, name);
@@ -356,7 +366,7 @@
          resourceIds.loadPackageBlock(packageBlock);
          ResourceIds.Table.Package packageId = resourceIds.getTable().listPackages().get(0);
          return new EncodeMaterials()
-                 .setPackageIds(packageId)
+                 .addPackageIds(packageId)
                  .setCurrentPackage(packageBlock)
                  .addFramework(Frameworks.getAndroid());
      }

src/main/java/com/reandroid/lib/apk/xmlencoder/RESEncoder.java

@@ -28,10 +28,7 @@
 
  import java.io.File;
  import java.io.IOException;
- import java.util.ArrayList;
+ import java.util.*;
- import java.util.HashSet;
- import java.util.List;
- import java.util.Set;
  import java.util.zip.ZipEntry;
 
  public class RESEncoder {
@@ -70,9 +67,23 @@
                      +ApkUtil.FILE_NAME_PUBLIC_XML+"  file found in '"+mainDir);
          }
          preloadStringPool(pubXmlFileList);
-         for(File pubXmlFile:pubXmlFileList){
+
-             EncodeMaterials encodeMaterials = loadPublicXml(pubXmlFile);
+         EncodeMaterials encodeMaterials=new EncodeMaterials();
+
+         Map<File, ResourceIds.Table.Package> map =
+                 initializeEncodeMaterials(pubXmlFileList, encodeMaterials);
+
+         for(Map.Entry<File, ResourceIds.Table.Package> entry:map.entrySet()){
+             File pubXmlFile=entry.getKey();
+             ResourceIds.Table.Package pkgResourceIds=entry.getValue();
              addParsedFiles(pubXmlFile);
+
+             PackageCreator packageCreator = new PackageCreator();
+             packageCreator.setPackageName(pkgResourceIds.name);
+
+             PackageBlock packageBlock = packageCreator.createNew(tableBlock, pkgResourceIds);
+             encodeMaterials.setCurrentPackage(packageBlock);
+
              File resDir=toResDirectory(pubXmlFile);
              encodeResDir(encodeMaterials, resDir);
              FilePathEncoder filePathEncoder = new FilePathEncoder(encodeMaterials);
@@ -80,7 +91,6 @@
              filePathEncoder.setUncompressedFiles(getApkModule().getUncompressedFiles());
              filePathEncoder.encodeResDir(resDir);
 
-             PackageBlock packageBlock = encodeMaterials.getCurrentPackage();
              packageBlock.sortTypes();
              packageBlock.refresh();
 
@@ -99,7 +109,6 @@
          ValuesStringPoolBuilder poolBuilder=new ValuesStringPoolBuilder();
          for(File pubXml:pubXmlFileList){
              File resDir=toResDirectory(pubXml);
-             logMessage("Scanning: "+resDir.getParentFile().getName());
              List<File> valuesDirList = listValuesDir(resDir);
              for(File dir:valuesDirList){
                  logVerbose(poolBuilder.size()+" building pool: "+dir.getName());
@@ -108,33 +117,37 @@
          }
          poolBuilder.addTo(tableBlock.getTableStringPool());
      }
-     private EncodeMaterials loadPublicXml(File pubXmlFile) throws IOException, XMLException {
+
+     private Map<File, ResourceIds.Table.Package> initializeEncodeMaterials(
+             List<File> pubXmlFileList, EncodeMaterials encodeMaterials)
+             throws IOException, XMLException {
+
+         Map<File, ResourceIds.Table.Package> results = new HashMap<>();
+
+         String packageName=null;
+         for(File pubXmlFile:pubXmlFileList){
+             if(packageName==null){
+                 packageName=readManifestPackageName(toAndroidManifest(pubXmlFile));
+             }
              ResourceIds resourceIds=new ResourceIds();
              resourceIds.fromXml(pubXmlFile);
-
+             ResourceIds.Table.Package pkg = resourceIds.getTable()
-         List<ResourceIds.Table.Package> pkgList = resourceIds
+                     .listPackages().get(0);
-                 .getTable().listPackages();
+             if(pkg.name==null){
-         if(pkgList.size()!=1){
+                 pkg.name=packageName;
-             throw new IOException("Package count should be 1, count="
+             }
-                     +pkgList.size()+", in file: "+pubXmlFile);
+             encodeMaterials.addPackageIds(pkg);
+             results.put(pubXmlFile, pkg);
          }
 
-         XMLDocument manifestDocument = XMLDocument.load(toAndroidManifest(pubXmlFile));
+         encodeMaterials.addFramework(Frameworks.getAndroid())
-         String packageName = manifestDocument
-                 .getDocumentElement().getAttributeValue("package");
-
-         ResourceIds.Table.Package pkgResourceIds = pkgList.get(0);
-
-         PackageCreator packageCreator = new PackageCreator();
-         packageCreator.setPackageName(packageName);
-
-         PackageBlock packageBlock = packageCreator.createNew(tableBlock, pkgResourceIds);
-
-         return new EncodeMaterials()
-                 .addFramework(Frameworks.getAndroid())
-                 .setCurrentPackage(packageBlock)
-                 .setPackageIds(pkgResourceIds)
                  .setAPKLogger(apkLogger);
+         return results;
+     }
+     private String readManifestPackageName(File manifestFile) throws XMLException {
+         XMLDocument manifestDocument = XMLDocument.load(manifestFile);
+         return manifestDocument
+                 .getDocumentElement().getAttributeValue("package");
      }
      private void encodeResDir(EncodeMaterials materials, File resDir) throws XMLException {