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

fix: xml array encoding/decoding of integer and string #12

Browse Source
This commit is contained in:
REAndroid 2023-01-16 06:58:33 -05:00
parent 1c53bd295c
commit ee5db344af
3 changed files with 48 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/reandroid/lib/apk/ApkUtil.java
View File

@ -137,4 +137,7 @@ public class ApkUtil {
public static final String NAME_data="data";
public static final String RES_DIR_NAME="res";
public static final String FILE_NAME_PUBLIC_XML ="public.xml";
public static final String TAG_STRING_ARRAY = "string-array";
public static final String TAG_INTEGER_ARRAY = "integer-array";
}

19
src/main/java/com/reandroid/lib/apk/xmldecoder/XMLArrayDecoder.java
View File

@ -15,13 +15,18 @@
*/
package com.reandroid.lib.apk.xmldecoder;
import com.reandroid.lib.apk.ApkUtil;
import com.reandroid.lib.arsc.decoder.ValueDecoder;
import com.reandroid.lib.arsc.value.ResValueBag;
import com.reandroid.lib.arsc.value.ResValueBagItem;
import com.reandroid.lib.arsc.value.ValueType;
import com.reandroid.lib.common.EntryStore;
import com.reandroid.xml.XMLElement;
class XMLArrayDecoder extends BagDecoder{
import java.util.HashSet;
import java.util.Set;
class XMLArrayDecoder extends BagDecoder{
public XMLArrayDecoder(EntryStore entryStore) {
super(entryStore);
}
@ -30,11 +35,19 @@ class XMLArrayDecoder extends BagDecoder{
public void decode(ResValueBag resValueBag, XMLElement parentElement) {
ResValueBagItem[] bagItems = resValueBag.getBagItems();
EntryStore entryStore=getEntryStore();
Set<ValueType> valueTypes = new HashSet<>();
for(int i=0;i<bagItems.length;i++){
String value = ValueDecoder.decodeIntEntry(entryStore, bagItems[i]);
XMLElement child=new XMLElement("item");
ResValueBagItem bagItem = bagItems[i];
String value = ValueDecoder.decodeIntEntry(entryStore, bagItem);
XMLElement child = new XMLElement("item");
child.setTextContent(value);
parentElement.addChild(child);
valueTypes.add(bagItem.getValueType());
}
if(valueTypes.contains(ValueType.STRING)){
parentElement.setTagName(ApkUtil.TAG_STRING_ARRAY);
}else if(valueTypes.size()==1 && valueTypes.contains(ValueType.INT_DEC)){
parentElement.setTagName(ApkUtil.TAG_INTEGER_ARRAY);
}
}
@Override

35
src/main/java/com/reandroid/lib/apk/xmlencoder/XMLValuesEncoderArray.java
View File

@ -15,6 +15,7 @@
*/
package com.reandroid.lib.apk.xmlencoder;
import com.reandroid.lib.apk.ApkUtil;
import com.reandroid.lib.arsc.array.ResValueBagItemArray;
import com.reandroid.lib.arsc.decoder.ValueDecoder;
import com.reandroid.lib.arsc.value.ResValueBag;
@ -29,7 +30,14 @@ class XMLValuesEncoderArray extends XMLValuesEncoderBag{
@Override
void encodeChildes(XMLElement parentElement, ResValueBag resValueBag){
int count = parentElement.getChildesCount();
boolean tag_string="string-array".equals(parentElement.getTagName());
String tagName = parentElement.getTagName();
boolean force_string = false;
boolean force_integer = false;
if(ApkUtil.TAG_STRING_ARRAY.equals(tagName)){
force_string = true;
}else if(ApkUtil.TAG_INTEGER_ARRAY.equals(tagName)){
force_integer = true;
}
ResValueBagItemArray itemArray = resValueBag.getResValueBagItemArray();
for(int i=0;i<count;i++){
XMLElement child=parentElement.getChildAt(i);
@ -39,12 +47,24 @@ class XMLValuesEncoderArray extends XMLValuesEncoderBag{
String valueText=child.getTextContent();
if(ValueDecoder.isReference(valueText)){
if(force_string){
bagItem.setValueAsString(ValueDecoder
.unEscapeSpecialCharacter(valueText));
}else if(force_integer){
valueText=trimText(valueText);
if(!ValueDecoder.isInteger(valueText)){
throw new EncodeException("Invalid integer value for array name="
+parentElement.getAttributeValue("name")
+", entry no"+(i+1)+", near line: " + child.getLineNumber());
}
bagItem.setTypeAndData(ValueType.INT_DEC,
ValueDecoder.parseInteger(valueText));
}else if(ValueDecoder.isReference(valueText)){
bagItem.setTypeAndData(ValueType.REFERENCE,
getMaterials().resolveReference(valueText));
}else if(EncodeUtil.isEmpty(valueText)) {
bagItem.setTypeAndData(ValueType.NULL, 0);
}else if(!tag_string){
}else {
ValueDecoder.EncodeResult encodeResult =
ValueDecoder.encodeGuessAny(valueText);
if(encodeResult!=null){
@ -54,10 +74,13 @@ class XMLValuesEncoderArray extends XMLValuesEncoderBag{
bagItem.setValueAsString(ValueDecoder
.unEscapeSpecialCharacter(valueText));
}
}else {
bagItem.setValueAsString(ValueDecoder
.unEscapeSpecialCharacter(valueText));
}
}
}
private static String trimText(String text){
if(text==null){
return null;
}
return text.trim();
}
}