Update ARSCLib to 1.3.5

REAndroid · Aug 2, 2024 · 850ec0d · 850ec0d
1 parent 507413d
commit 850ec0d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 17 deletions.
diff --git a/libs/ARSCLib.jar b/libs/ARSCLib.jar
diff --git a/src/main/java/com/reandroid/apkeditor/info/InfoWriter.java b/src/main/java/com/reandroid/apkeditor/info/InfoWriter.java
@@ -46,7 +46,7 @@ public void writeSignatureInfo(ApkSignatureBlock signatureBlock, boolean base64)
         }
     }
     public void writeResources(PackageBlock packageBlock, List<String> typeFilters, boolean writeEntries) throws IOException {
-        Iterator<ResourceEntry> itr = packageBlock.iterator();
+        Iterator<ResourceEntry> itr = packageBlock.getResources();
         while (itr.hasNext()){
             ResourceEntry resourceEntry = itr.next();
             writeResources(resourceEntry, writeEntries);

diff --git a/src/main/java/com/reandroid/apkeditor/merge/Merger.java b/src/main/java/com/reandroid/apkeditor/merge/Merger.java
@@ -83,15 +83,8 @@ public void run() throws IOException {
         }
         sanitizeManifest(mergedModule);
         Util.addApkEditorInfo(mergedModule, getClass().getSimpleName());
-        String message = mergedModule.refreshTable();
-        if(message != null){
-            logMessage(message);
-        }
-        message = mergedModule.refreshManifest();
-        if(message != null){
-            logMessage(message);
-        }
-
+        mergedModule.refreshTable();
+        mergedModule.refreshManifest();
         logMessage("Writing apk ...");
         mergedModule.writeApk(options.outputFile);
         mergedModule.close();
@@ -139,14 +132,10 @@ private void sanitizeManifest(ApkModule apkModule) {
         AndroidManifestBlock manifest = apkModule.getAndroidManifest();
         logMessage("Sanitizing manifest ...");
 
-        // FIXME: declare ID_requiredSplitTypes & ID_splitTypes at AndroidManifest
-        int ID_requiredSplitTypes = 0x0101064e;
-        int ID_splitTypes = 0x0101064f;
-
         AndroidManifestHelper.removeAttributeFromManifestById(manifest,
-                ID_requiredSplitTypes, this);
+                AndroidManifest.ID_requiredSplitTypes, this);
         AndroidManifestHelper.removeAttributeFromManifestById(manifest,
-                ID_splitTypes, this);
+                AndroidManifest.ID_splitTypes, this);
         AndroidManifestHelper.removeAttributeFromManifestByName(manifest,
                 AndroidManifest.NAME_splitTypes, this);
 

diff --git a/src/main/java/com/reandroid/apkeditor/refactor/TypeNameRefactor.java b/src/main/java/com/reandroid/apkeditor/refactor/TypeNameRefactor.java
@@ -98,7 +98,7 @@ private void scanTableEntries(TableBlock tableBlock){
         }
     }
     private void scanPackageEntries(PackageBlock packageBlock){
-        Iterator<ResourceEntry> itr = packageBlock.iterator();
+        Iterator<ResourceEntry> itr = packageBlock.getResources();
         while (itr.hasNext() && !isFinished()){
             ResourceEntry resourceEntry = itr.next();
             checkEntryGroup(resourceEntry);