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

Fix xml attribute encoding

Browse Source
This commit is contained in:
REAndroid 2022-12-12 12:09:00 -05:00
parent b75cb1f163
commit 34a9742d6b
2 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/java/com/reandroid/lib/arsc/chunk/xml/ResXmlAttribute.java
View File

@ -3,7 +3,6 @@ package com.reandroid.lib.arsc.chunk.xml;
import com.reandroid.lib.arsc.array.ResXmlIDArray;
import com.reandroid.lib.arsc.base.Block;
import com.reandroid.lib.arsc.container.FixedBlockContainer;
import com.reandroid.lib.arsc.decoder.ValueDecoder;
import com.reandroid.lib.arsc.item.*;
import com.reandroid.lib.arsc.pool.ResXmlStringPool;
import com.reandroid.lib.arsc.value.ValueType;
@ -22,7 +21,7 @@ public class ResXmlAttribute extends FixedBlockContainer
public ResXmlAttribute() {
super(7);
mNamespaceReference =new IntegerItem(-1);
mNameReference =new IntegerItem();
mNameReference =new IntegerItem(-1);
mValueStringReference =new IntegerItem(-1);
mNameType=new ShortItem((short) 0x0008);
mReserved =new ByteItem();
@ -138,60 +137,29 @@ public class ResXmlAttribute extends FixedBlockContainer
public int getNameResourceID(){
return getResourceId(getNameReference());
}
public boolean setName(String name, int resourceId){
ResXmlStringPool stringPool=getStringPool();
if(stringPool==null){
return false;
}
String old=getName();
if(resourceId==0){
if(name.equals(old)){
return false;
}
ResXmlString resXmlString=stringPool.getOrCreate(name);
setNameReference(resXmlString.getIndex());
return true;
}
public void setNameResourceID(int resourceId){
ResXmlIDMap xmlIDMap=getResXmlIDMap();
if(xmlIDMap==null){
return false;
return;
}
int oldId=getNameResourceID();
if(oldId==resourceId){
if(name.equals(old)){
return false;
ResXmlID xmlID = xmlIDMap.getOrCreate(resourceId);
setNameReference(xmlID.getIndex());
}
public void setName(String name, int resourceId){
if(resourceId!=0){
setNameResourceID(resourceId);
return;
}
ResXmlID resXmlID=xmlIDMap.getByResId(resourceId);
if(resXmlID!=null){
int ref=resXmlID.getIndex();
ResXmlString idName=stringPool.get(ref);
if(idName != null){
if(name.equals(idName.getHtml())){
setNameReference(ref);
}else {
idName.set(name);
if(name==null){
name="";
}
return true;
ResXmlIDMap xmlIDMap=getResXmlIDMap();
ResXmlStringPool stringPool=getStringPool();
if(stringPool==null || xmlIDMap==null){
return;
}
}
int stringsCount=stringPool.countStrings();
int idCount=xmlIDMap.getResXmlIDArray().childesCount();
if(idCount>stringsCount){
xmlIDMap.addResourceId(idCount, resourceId);;
stringPool.getStringsArray().ensureSize(idCount+1);
ResXmlString resXmlString=stringPool.get(idCount);
resXmlString.set(name);
setNameReference(idCount);
return true;
}
xmlIDMap.addResourceId(stringsCount, resourceId);
stringPool.getStringsArray().ensureSize(stringsCount+1);
ResXmlString resXmlString=stringPool.get(stringsCount);
resXmlString.set(name);
setNameReference(stringsCount);
return true;
ResXmlString xmlString = stringPool.getOrCreateAttributeName(xmlIDMap.getResXmlIDArray().childesCount(), name);
setNameReference(xmlString.getIndex());
}
private int getResourceId(int ref){
if(ref<0){

38
src/main/java/com/reandroid/lib/arsc/pool/ResXmlStringPool.java
View File

@ -2,6 +2,8 @@ package com.reandroid.lib.arsc.pool;
import com.reandroid.lib.arsc.array.StringArray;
import com.reandroid.lib.arsc.array.ResXmlStringArray;
import com.reandroid.lib.arsc.array.StyleArray;
import com.reandroid.lib.arsc.group.StringGroup;
import com.reandroid.lib.arsc.item.IntegerArray;
import com.reandroid.lib.arsc.item.IntegerItem;
import com.reandroid.lib.arsc.item.ResXmlString;
@ -14,4 +16,40 @@ public class ResXmlStringPool extends BaseStringPool<ResXmlString> {
StringArray<ResXmlString> newInstance(IntegerArray offsets, IntegerItem itemCount, IntegerItem itemStart, boolean is_utf8) {
return new ResXmlStringArray(offsets, itemCount, itemStart, is_utf8);
}
public ResXmlString getOrCreateAttributeName(int idMapCount, String str){
StringGroup<ResXmlString> group = get(str);
if(group!=null){
for(ResXmlString xmlString:group.listItems()){
if(xmlString.getIndex()>idMapCount){
return xmlString;
}
}
}
StringArray<ResXmlString> stringsArray = getStringsArray();
stringsArray.ensureSize(idMapCount);
int i=stringsArray.childesCount();
stringsArray.ensureSize(i+1);
ResXmlString xmlString=stringsArray.get(i);
xmlString.set(str);
refreshUniqueIdMap();
return xmlString;
}
@Override
public void onChunkLoaded() {
super.onChunkLoaded();
StyleArray styleArray = getStyleArray();
if(styleArray.childesCount()>0){
notifyResXmlStringPoolHasStyles(styleArray.childesCount());
}
}
private static void notifyResXmlStringPoolHasStyles(int styleArrayCount){
if(HAS_STYLE_NOTIFIED){
return;
}
String msg="Not expecting ResXmlStringPool to have styles count="
+styleArrayCount+",\n please create issue along with this apk/file on https://github.com/REAndroid/ARSCEditor";
System.err.println(msg);
HAS_STYLE_NOTIFIED=true;
}
private static boolean HAS_STYLE_NOTIFIED;
}