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

rename ValueHeader

Browse Source
This commit is contained in:
REAndroid 2023-02-18 06:38:03 -05:00
parent 0c04aa5b27
commit 997ed231aa
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/reandroid/apk/StringPoolBuilder.java
View File

@ -19,7 +19,7 @@ import com.reandroid.arsc.chunk.PackageBlock;
import com.reandroid.arsc.chunk.TableBlock;
import com.reandroid.arsc.pool.SpecStringPool;
import com.reandroid.arsc.pool.TableStringPool;
import com.reandroid.arsc.value.Header;
import com.reandroid.arsc.value.ValueHeader;
import com.reandroid.arsc.value.ValueType;
import com.reandroid.json.JSONArray;
import com.reandroid.json.JSONException;
@ -90,8 +90,8 @@ public class StringPoolBuilder {
return mSpecNameMap.get(pkgId);
}
private void scan(JSONObject jsonObject){
if(jsonObject.has(Header.NAME_entry_name)){
addSpecName(jsonObject.optString(Header.NAME_entry_name));
if(jsonObject.has(ValueHeader.NAME_entry_name)){
addSpecName(jsonObject.optString(ValueHeader.NAME_entry_name));
}
if(jsonObject.has(ApkUtil.NAME_value_type)){
if(ValueType.STRING.name().equals(jsonObject.getString(ApkUtil.NAME_value_type))){

8
src/main/java/com/reandroid/apk/xmlencoder/XMLValuesEncoderId.java
View File

@ -15,7 +15,7 @@
*/
package com.reandroid.apk.xmlencoder;
import com.reandroid.arsc.value.Header;
import com.reandroid.arsc.value.ValueHeader;
import com.reandroid.arsc.value.Entry;
class XMLValuesEncoderId extends XMLValuesEncoder{
@ -38,8 +38,8 @@ import com.reandroid.arsc.value.Entry;
setVisibility(entry);
}
private void setVisibility(Entry entry){
Header header = entry.getHeader();
header.setWeak(true);
header.setPublic(true);
ValueHeader valueHeader = entry.getHeader();
valueHeader.setWeak(true);
valueHeader.setPublic(true);
}
}

2
src/main/java/com/reandroid/arsc/header/HeaderBlock.java
View File

@ -217,7 +217,7 @@ import java.util.List;
builder.append("Unknown type=");
builder.append(String.format("0x%02x", (0xffff & t)));
}
builder.append("{Header=");
builder.append("{ValueHeader=");
builder.append(getHeaderSize());
builder.append(", Chunk=");
builder.append(getChunkSize());

4
src/main/java/com/reandroid/arsc/value/Entry.java
View File

@ -195,7 +195,7 @@
public TableEntry<?, ?> getTableEntry(){
return mTableEntry;
}
public Header getHeader(){
public ValueHeader getHeader(){
TableEntry<?, ?> tableEntry = getTableEntry();
if(tableEntry!=null){
return tableEntry.getHeader();
@ -319,7 +319,7 @@
setNull(true);
return;
}
boolean is_complex = json.optBoolean(Header.NAME_is_complex, false);
boolean is_complex = json.optBoolean(ValueHeader.NAME_is_complex, false);
TableEntry<?, ?> entry = createTableEntry(is_complex);
setTableEntry(entry);
entry.fromJson(json);

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

@ -15,7 +15,7 @@
*/
package com.reandroid.arsc.value;
public class EntryHeader extends Header{
public class EntryHeader extends ValueHeader {
public EntryHeader(){
super(HEADER_SIZE_SCALAR);
}

10
src/main/java/com/reandroid/arsc/value/EntryHeaderMap.java
View File

@ -17,7 +17,7 @@ package com.reandroid.arsc.value;
import com.reandroid.json.JSONObject;
public class EntryHeaderMap extends Header{
public class EntryHeaderMap extends ValueHeader {
public EntryHeaderMap(){
super(HEADER_SIZE_COMPLEX);
setComplex(true);
@ -36,12 +36,12 @@ public class EntryHeaderMap extends Header{
}
@Override
public void merge(Header header){
if(header == this || !(header instanceof EntryHeaderMap)){
public void merge(ValueHeader valueHeader){
if(valueHeader == this || !(valueHeader instanceof EntryHeaderMap)){
return;
}
super.merge(header);
EntryHeaderMap entryHeaderMap = (EntryHeaderMap) header;
super.merge(valueHeader);
EntryHeaderMap entryHeaderMap = (EntryHeaderMap) valueHeader;
setParentId(entryHeaderMap.getParentId());
setValuesCount(entryHeaderMap.getValuesCount());
}

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

@ -42,7 +42,7 @@ public class ResTableMapEntry extends TableEntry<EntryHeaderMap, ResValueMapArra
getValue().setChildesCount(valuesCount);
}
@Override
void onHeaderLoaded(Header header){
void onHeaderLoaded(ValueHeader valueHeader){
getValue().setChildesCount(getValuesCount());
}

10
src/main/java/com/reandroid/arsc/value/TableEntry.java
View File

@ -24,7 +24,7 @@ import com.reandroid.json.JSONObject;
import java.io.IOException;
import java.io.OutputStream;
public abstract class TableEntry<HEADER extends Header, VALUE extends Block> extends Block implements
public abstract class TableEntry<HEADER extends ValueHeader, VALUE extends Block> extends Block implements
JSONConvert<JSONObject> {
private final HEADER header;
private final VALUE resValue;
@ -78,9 +78,9 @@ public abstract class TableEntry<HEADER extends Header, VALUE extends Block> ext
@Override
public void onReadBytes(BlockReader reader) throws IOException {
Header header = getHeader();
header.readBytes(reader);
onHeaderLoaded(header);
ValueHeader valueHeader = getHeader();
valueHeader.readBytes(reader);
onHeaderLoaded(valueHeader);
getValue().readBytes(reader);
}
@ -92,7 +92,7 @@ public abstract class TableEntry<HEADER extends Header, VALUE extends Block> ext
return result;
}
void onHeaderLoaded(Header header){
void onHeaderLoaded(ValueHeader valueHeader){
}
abstract void onRemoved();
abstract boolean shouldMerge(TableEntry<?, ?> tableEntry);

16
src/main/java/com/reandroid/arsc/value/Header.java → src/main/java/com/reandroid/arsc/value/ValueHeader.java
View File

@ -25,9 +25,9 @@ import com.reandroid.json.JSONObject;
import java.io.IOException;
public class Header extends BlockItem implements JSONConvert<JSONObject> {
public class ValueHeader extends BlockItem implements JSONConvert<JSONObject> {
private ReferenceItem mStringReference;
public Header(int size){
public ValueHeader(int size){
super(size);
writeSize();
putInteger(getBytesInternal(), OFFSET_SPEC_REFERENCE, -1);
@ -161,14 +161,14 @@ public class Header extends BlockItem implements JSONConvert<JSONObject> {
setKey(stringItem.getIndex());
linkStringReference(stringItem);
}
public void merge(Header header){
if(header == null || header ==this){
public void merge(ValueHeader valueHeader){
if(valueHeader == null || valueHeader ==this){
return;
}
setComplex(header.isComplex());
setWeak(header.isWeak());
setPublic(header.isPublic());
setName(header.getName());
setComplex(valueHeader.isComplex());
setWeak(valueHeader.isWeak());
setPublic(valueHeader.isPublic());
setName(valueHeader.getName());
}
public void toJson(JSONObject jsonObject) {
jsonObject.put(NAME_entry_name, getName());