ReVanced/ARSCLib
1
0
Fork 0
mirror of https://github.com/revanced/ARSCLib.git synced 2025-05-02 07:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #16 from revanced/save-lib-splits

Browse Source 
fix writing apks that dont have a resource table
This commit is contained in:
REAndroid 2023-03-17 14:03:01 -04:00 committed by GitHub
commit ec7597f097
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/reandroid/apk/ApkModule.java
View File

@ -168,10 +168,10 @@ public class ApkModule implements ApkFile {
} }
return version; return version;
} }
public void removeResFilesWithEntry(int resourceId) throws IOException { public void removeResFilesWithEntry(int resourceId) {
removeResFilesWithEntry(resourceId, null, true); removeResFilesWithEntry(resourceId, null, true);
} }
public void removeResFilesWithEntry(int resourceId, ResConfig resConfig, boolean trimEntryArray) throws IOException { public void removeResFilesWithEntry(int resourceId, ResConfig resConfig, boolean trimEntryArray) {
List<Entry> removedList = removeResFiles(resourceId, resConfig); List<Entry> removedList = removeResFiles(resourceId, resConfig);
SpecTypePair specTypePair = null; SpecTypePair specTypePair = null;
for(Entry entry:removedList){ for(Entry entry:removedList){
@ -187,10 +187,10 @@ public class ApkModule implements ApkFile {
specTypePair.removeNullEntries(resourceId); specTypePair.removeNullEntries(resourceId);
} }
} }
public List<Entry> removeResFiles(int resourceId) throws IOException { public List<Entry> removeResFiles(int resourceId) {
return removeResFiles(resourceId, null); return removeResFiles(resourceId, null);
} }
public List<Entry> removeResFiles(int resourceId, ResConfig resConfig) throws IOException { public List<Entry> removeResFiles(int resourceId, ResConfig resConfig) {
List<Entry> results = new ArrayList<>(); List<Entry> results = new ArrayList<>();
if(resourceId == 0 && resConfig==null){ if(resourceId == 0 && resConfig==null){
return results; return results;
@ -266,7 +266,7 @@ public class ApkModule implements ApkFile {
serializer.setWriteInterceptor(interceptor); serializer.setWriteInterceptor(interceptor);
serializer.writeZip(file); serializer.writeZip(file);
} }
private void uncompressNonXmlResFiles() throws IOException { private void uncompressNonXmlResFiles() {
for(ResFile resFile:listResFiles()){ for(ResFile resFile:listResFiles()){
if(resFile.isBinaryXml()){ if(resFile.isBinaryXml()){
continue; continue;
@ -280,7 +280,7 @@ public class ApkModule implements ApkFile {
public void removeDir(String dirName){ public void removeDir(String dirName){
getApkArchive().removeDir(dirName); getApkArchive().removeDir(dirName);
} }
public void validateResourcesDir() throws IOException { public void validateResourcesDir() {
List<ResFile> resFileList = listResFiles(); List<ResFile> resFileList = listResFiles();
Set<String> existPaths=new HashSet<>(); Set<String> existPaths=new HashSet<>();
List<InputSource> sourceList = getApkArchive().listInputSources(); List<InputSource> sourceList = getApkArchive().listInputSources();
@ -308,7 +308,7 @@ public class ApkModule implements ApkFile {
stringPool.refreshUniqueIdMap(); stringPool.refreshUniqueIdMap();
getTableBlock().refresh(); getTableBlock().refresh();
} }
public void setResourcesRootDir(String dirName) throws IOException { public void setResourcesRootDir(String dirName) {
List<ResFile> resFileList = listResFiles(); List<ResFile> resFileList = listResFiles();
Set<String> existPaths=new HashSet<>(); Set<String> existPaths=new HashSet<>();
List<InputSource> sourceList = getApkArchive().listInputSources(); List<InputSource> sourceList = getApkArchive().listInputSources();
@ -333,12 +333,15 @@ public class ApkModule implements ApkFile {
stringPool.refreshUniqueIdMap(); stringPool.refreshUniqueIdMap();
getTableBlock().refresh(); getTableBlock().refresh();
} }
public List<ResFile> listResFiles() throws IOException { public List<ResFile> listResFiles() {
return listResFiles(0, null); return listResFiles(0, null);
} }
public List<ResFile> listResFiles(int resourceId, ResConfig resConfig) throws IOException { public List<ResFile> listResFiles(int resourceId, ResConfig resConfig) {
List<ResFile> results=new ArrayList<>(); List<ResFile> results=new ArrayList<>();
TableBlock tableBlock=getTableBlock(); TableBlock tableBlock=getTableBlock();
if (tableBlock==null){
return results;
}
TableStringPool stringPool= tableBlock.getStringPool(); TableStringPool stringPool= tableBlock.getStringPool();
for(InputSource inputSource:getApkArchive().listInputSources()){ for(InputSource inputSource:getApkArchive().listInputSources()){
String name=inputSource.getAlias(); String name=inputSource.getAlias();
@ -583,7 +586,7 @@ public class ApkModule implements ApkFile {
mergeFiles(module); mergeFiles(module);
getUncompressedFiles().merge(module.getUncompressedFiles()); getUncompressedFiles().merge(module.getUncompressedFiles());
} }
private void mergeTable(ApkModule module) throws IOException { private void mergeTable(ApkModule module) {
if(!module.hasTableBlock()){ if(!module.hasTableBlock()){
return; return;
} }
@ -599,7 +602,7 @@ public class ApkModule implements ApkFile {
TableBlock coming=module.getTableBlock(); TableBlock coming=module.getTableBlock();
exist.merge(coming); exist.merge(coming);
} }
private void mergeFiles(ApkModule module) throws IOException { private void mergeFiles(ApkModule module) {
APKArchive archiveExist = getApkArchive(); APKArchive archiveExist = getApkArchive();
APKArchive archiveComing = module.getApkArchive(); APKArchive archiveComing = module.getApkArchive();
Map<String, InputSource> comingAlias=ApkUtil.toAliasMap(archiveComing.listInputSources()); Map<String, InputSource> comingAlias=ApkUtil.toAliasMap(archiveComing.listInputSources());