diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java index 4452bbc4..b486b0b6 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/data/ResTypeSpec.java @@ -30,10 +30,10 @@ public final class ResTypeSpec { private final ResTable mResTable; private final ResPackage mPackage; - private final byte mId; + private final int mId; private final int mEntryCount; - public ResTypeSpec(String name, ResTable resTable, ResPackage package_, byte id, int entryCount) { + public ResTypeSpec(String name, ResTable resTable, ResPackage package_, int id, int entryCount) { this.mName = name; this.mResTable = resTable; this.mPackage = package_; @@ -45,7 +45,7 @@ public final class ResTypeSpec { return mName; } - public byte getId() { + public int getId() { return mId; } diff --git a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java index f4b8eeca..0e64575b 100644 --- a/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java +++ b/brut.apktool/apktool-lib/src/main/java/brut/androlib/res/decoder/ARSCDecoder.java @@ -161,7 +161,7 @@ public class ARSCDecoder { private ResTypeSpec readSingleTableTypeSpec() throws AndrolibException, IOException { checkChunkType(Header.TYPE_SPEC_TYPE); - byte id = mIn.readByte(); + int id = mIn.readUnsignedByte(); mIn.skipBytes(3); int entryCount = mIn.readInt(); @@ -177,7 +177,7 @@ public class ARSCDecoder { private ResType readTableType() throws IOException, AndrolibException { checkChunkType(Header.TYPE_TYPE); - byte typeId = mIn.readByte(); + int typeId = mIn.readUnsignedByte(); if (mResTypeSpecs.containsKey(typeId)) { mResId = (0xff000000 & mResId) | mResTypeSpecs.get(typeId).getId() << 16; mTypeSpec = mResTypeSpecs.get(typeId); @@ -502,7 +502,7 @@ public class ARSCDecoder { private ResType mType; private int mResId; private boolean[] mMissingResSpecs; - private HashMap mResTypeSpecs = new HashMap<>(); + private HashMap mResTypeSpecs = new HashMap<>(); private final static short ENTRY_FLAG_COMPLEX = 0x0001;