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

handle null/empty json string values

Browse Source
This commit is contained in:
REAndroid 2023-01-13 06:39:12 -05:00
parent 92a648612f
commit de90186007
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/reandroid/lib/apk/StringPoolBuilder.java
View File

@ -95,7 +95,7 @@ public class StringPoolBuilder {
} }
if(jsonObject.has(ApkUtil.NAME_value_type)){ if(jsonObject.has(ApkUtil.NAME_value_type)){
if(ValueType.STRING.name().equals(jsonObject.getString(ApkUtil.NAME_value_type))){ if(ValueType.STRING.name().equals(jsonObject.getString(ApkUtil.NAME_value_type))){
String data= jsonObject.getString(ApkUtil.NAME_data); String data= jsonObject.optString(ApkUtil.NAME_data, "");
addTableString(data); addTableString(data);
} }
return; return;

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

@ -435,7 +435,7 @@ import java.util.Set;
} }
ValueType valueType=ValueType.fromName(json.getString(NAME_value_type)); ValueType valueType=ValueType.fromName(json.getString(NAME_value_type));
if(valueType==ValueType.STRING){ if(valueType==ValueType.STRING){
setValueAsString(json.getString(NAME_data)); setValueAsString(json.optString(NAME_data, ""));
}else if(valueType==ValueType.INT_BOOLEAN){ }else if(valueType==ValueType.INT_BOOLEAN){
setValueAsBoolean(json.getBoolean(NAME_data)); setValueAsBoolean(json.getBoolean(NAME_data));
}else { }else {

2
src/main/java/com/reandroid/lib/arsc/chunk/xml/ResXmlBlock.java
View File

@ -288,7 +288,7 @@ package com.reandroid.lib.arsc.chunk.xml;
results.add(attr.getString(ResXmlAttribute.NAME_name)); results.add(attr.getString(ResXmlAttribute.NAME_name));
ValueType valueType=ValueType.fromName(attr.getString(ResXmlAttribute.NAME_value_type)); ValueType valueType=ValueType.fromName(attr.getString(ResXmlAttribute.NAME_value_type));
if(valueType==ValueType.STRING){ if(valueType==ValueType.STRING){
results.add(attr.getString(ResXmlAttribute.NAME_data)); results.add(attr.optString(ResXmlAttribute.NAME_data));
} }
} }
} }

2
src/main/java/com/reandroid/lib/arsc/chunk/xml/ResXmlElement.java
View File

@ -761,7 +761,7 @@ import java.util.*;
start.setComment(json.optString(NAME_comment, null)); start.setComment(json.optString(NAME_comment, null));
String text= json.optString(NAME_text, null); String text= json.optString(NAME_text, null);
if(text!=null){ if(text!=null){
setResXmlText(text); addResXmlText(text);
} }
String uri = json.optString(NAME_namespace_uri, null); String uri = json.optString(NAME_namespace_uri, null);
if(uri!=null){ if(uri!=null){

2
src/main/java/com/reandroid/lib/arsc/value/ResValueBagItem.java
View File

@ -204,7 +204,7 @@ public class ResValueBagItem extends BaseResValueItem{
setType(valueType); setType(valueType);
setId(json.getInt(NAME_id)); setId(json.getInt(NAME_id));
if(valueType==ValueType.STRING){ if(valueType==ValueType.STRING){
setValueAsString(json.getString(NAME_data)); setValueAsString(json.optString(NAME_data, ""));
}else if(valueType==ValueType.INT_BOOLEAN){ }else if(valueType==ValueType.INT_BOOLEAN){
setValueAsBoolean(json.getBoolean(NAME_data)); setValueAsBoolean(json.getBoolean(NAME_data));
}else { }else {

2
src/main/java/com/reandroid/lib/arsc/value/ResValueInt.java
View File

@ -127,7 +127,7 @@ public class ResValueInt extends BaseResValueItem {
public void fromJson(JSONObject json) { public void fromJson(JSONObject json) {
ValueType valueType=ValueType.fromName(json.getString(NAME_value_type)); ValueType valueType=ValueType.fromName(json.getString(NAME_value_type));
if(valueType==ValueType.STRING){ if(valueType==ValueType.STRING){
setValueAsString(json.getString(NAME_data)); setValueAsString(json.optString(NAME_data, ""));
}else if(valueType==ValueType.INT_BOOLEAN){ }else if(valueType==ValueType.INT_BOOLEAN){
setValueAsBoolean(json.getBoolean(NAME_data)); setValueAsBoolean(json.getBoolean(NAME_data));
}else { }else {