Northern_Lights/NekoBoxForAndroid
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/NekoBoxForAndroid.git synced 2025-12-19 22:50:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: crash on 1.3.0

Browse Source 
Closes #543
Closes #439
Closes #514
Closes #540
This commit is contained in:
purofle 2024-02-18 15:11:07 +08:00
parent 680b362bcb
commit b34c0124da
No known key found for this signature in database
GPG Key ID: 57DEC1478152D973
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/main/java/io/nekohasekai/sagernet/fmt/v2ray/StandardV2RayBean.java
View File

@ -105,9 +105,8 @@ public abstract class StandardV2RayBean extends AbstractBean {
@Override @Override
public void serialize(ByteBufferOutput output) { public void serialize(ByteBufferOutput output) {
output.writeInt(0); output.writeInt(1);
super.serialize(output); super.serialize(output);
output.writeString(uuid); output.writeString(uuid);
output.writeString(encryption); output.writeString(encryption);
if (this instanceof VMessBean) { if (this instanceof VMessBean) {
@ -211,11 +210,33 @@ public abstract class StandardV2RayBean extends AbstractBean {
realityShortId = input.readString(); realityShortId = input.readString();
} }
enableECH = input.readBoolean(); if (version >= 1) { // 从老版本升级上来
if (enableECH) { enableECH = input.readBoolean();
enablePqSignature = input.readBoolean(); if (enableECH) {
disabledDRS = input.readBoolean(); enablePqSignature = input.readBoolean();
echConfig = input.readString(); disabledDRS = input.readBoolean();
echConfig = input.readString();
}
}
if (version == 0) {
// 从老版本升级上来但是 version == 0, 可能有 enableECH 也可能没有，需要做判断
int position = input.getByteBuffer().position(); // 当前位置
boolean tmpEnableECH = input.readBoolean();
int tmpPacketEncoding = input.readInt();
input.setPosition(position); // 读后归位
if (tmpPacketEncoding != 1 && tmpPacketEncoding != 2) {
input.getByteBuffer().position(position);
enableECH = tmpEnableECH;
if (enableECH) {
enablePqSignature = input.readBoolean();
disabledDRS = input.readBoolean();
echConfig = input.readString();
}
} // 否则后一位就是 packetEncoding
} }
packetEncoding = input.readInt(); packetEncoding = input.readInt();