Update ARSCLib & refactor depreciated methods #95

REAndroid · Apr 5, 2024 · 7f144bf · 7f144bf
1 parent 72e516a
commit 7f144bf
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/libs/ARSCLib.jar b/libs/ARSCLib.jar
diff --git a/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java b/src/main/java/com/reandroid/apkeditor/common/AndroidManifestHelper.java
@@ -90,7 +90,7 @@ public static void removeAttributeFromManifestAndApplication(AndroidManifestBloc
             return;
         }
         int removed = manifestElement.removeAttributesWithId(resourceId);
-        ResXmlElement applicationElement = manifestElement.getElementByTagName(
+        ResXmlElement applicationElement = manifestElement.getElement(
                 AndroidManifest.TAG_application);
         if(removed > 1){
             if(logger != null){

diff --git a/src/main/java/com/reandroid/apkeditor/info/InfoWriter.java b/src/main/java/com/reandroid/apkeditor/info/InfoWriter.java
@@ -36,7 +36,7 @@ public InfoWriter(Writer writer){
     }
 
     public void writeResources(PackageBlock packageBlock, List<String> typeFilters, boolean writeEntries) throws IOException {
-        Iterator<ResourceEntry> itr = packageBlock.getResources();
+        Iterator<ResourceEntry> itr = packageBlock.iterator();
         while (itr.hasNext()){
             ResourceEntry resourceEntry = itr.next();
             writeResources(resourceEntry, writeEntries);

diff --git a/src/main/java/com/reandroid/apkeditor/info/InfoWriterJson.java b/src/main/java/com/reandroid/apkeditor/info/InfoWriterJson.java
@@ -129,7 +129,7 @@ private void writeBagEntry(Entry entry) {
         ResValueMapArray mapArray = entry.getResValueMapArray();
         JSONWriter jsonWriter = mJsonWriter.object()
                 .key(NAME_QUALIFIERS).value(entry.getResConfig().getQualifiers())
-                .key("size").value(mapArray.childesCount())
+                .key("size").value(mapArray.size())
                 .key("parent").value(((ResTableMapEntry)entry.getTableEntry()).getParentId())
                 .key(TAG_BAG).array();
         for(ResValueMap resValueMap : mapArray.getChildes()){

diff --git a/src/main/java/com/reandroid/apkeditor/refactor/TypeNameRefactor.java b/src/main/java/com/reandroid/apkeditor/refactor/TypeNameRefactor.java
@@ -97,7 +97,7 @@ private void scanTableEntries(TableBlock tableBlock){
         }
     }
     private void scanPackageEntries(PackageBlock packageBlock){
-        Iterator<ResourceEntry> itr = packageBlock.getResources();
+        Iterator<ResourceEntry> itr = packageBlock.iterator();
         while (itr.hasNext() && !isFinished()){
             ResourceEntry resourceEntry = itr.next();
             checkEntryGroup(resourceEntry);
@@ -140,7 +140,7 @@ private boolean checkArray(ResTableMapEntry resValueBag){
         if(hasRefactoredName(name)){
             return false;
         }
-        if(resValueBag.getValue().childesCount()<2){
+        if(resValueBag.getValue().size()<2){
             return false;
         }
         if(!ArrayBag.isArray(resValueBag.getParentEntry())){
@@ -155,7 +155,7 @@ private boolean checkPlurals(ResTableMapEntry resValueBag){
         if(hasRefactoredName(name)){
             return false;
         }
-        if(resValueBag.getValue().childesCount()<2){
+        if(resValueBag.getValue().size()<2){
             return false;
         }
         if(!PluralsBag.isPlurals(resValueBag.getParentEntry())){
@@ -221,7 +221,7 @@ private void scanXml(ResXmlDocument xmlBlock, int resourceId){
                 return;
             }
         }
-        List<ResXmlAttribute> attributeList = listAttributes(xmlBlock.getResXmlElement());
+        List<ResXmlAttribute> attributeList = listAttributes(xmlBlock.getDocumentElement());
         for(ResXmlAttribute attribute:attributeList){
             scanAttribute(attribute, isManifest);
         }
@@ -260,7 +260,7 @@ private boolean checkInterpolator(ResXmlDocument resXmlDocument, int resourceId)
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -278,7 +278,7 @@ private boolean checkAnim(ResXmlDocument resXmlDocument, int resourceId){
         if(!hasRefactoredName("animator")){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -296,7 +296,7 @@ private boolean checkXml(ResXmlDocument resXmlDocument, int resourceId){
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -310,7 +310,7 @@ private boolean checkMenu(ResXmlDocument resXmlDocument, int resourceId){
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -327,7 +327,7 @@ private boolean checkAnimator(ResXmlDocument resXmlDocument, int resourceId){
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -356,7 +356,7 @@ private boolean checkDrawable(ResXmlDocument resXmlDocument, int resourceId){
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }
@@ -380,7 +380,7 @@ private boolean checkLayout(ResXmlDocument resXmlDocument, int resourceId){
         if(hasRefactoredName(name)){
             return false;
         }
-        ResXmlElement root=resXmlDocument.getResXmlElement();
+        ResXmlElement root=resXmlDocument.getDocumentElement();
         if(root==null){
             return false;
         }