permissionlesstech/bitchat-android
1
0
Fork 0
mirror of https://github.com/permissionlesstech/bitchat-android.git synced 2026-07-25 01:45:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix fragmentation baby (#266)

Browse Source
This commit is contained in:
callebtc
2025-08-19 11:16:23 +02:00
committed by GitHub
parent 9795e2ce8a
commit 4acfafb998
3 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/bitchat/android/protocol/BinaryProtocol.kt
+17 -6
View File
@@ -248,13 +248,24 @@ object BinaryProtocol {
}
fun decode(data: ByteArray): BitchatPacket? {
// Try decode as-is first (robust when padding wasn't applied) - iOS fix
decodeCore(data)?.let { return it }
// If that fails, try after removing padding
val unpadded = MessagePadding.unpad(data)
if (unpadded.contentEquals(data)) return null // No padding was removed, already failed
return decodeCore(unpadded)
}
/**
* Core decoding implementation used by decode() with and without padding removal - iOS fix
*/
private fun decodeCore(raw: ByteArray): BitchatPacket? {
try {
// Remove padding first - exactly same as iOS
val unpaddedData = MessagePadding.unpad(data)
if (raw.size < HEADER_SIZE + SENDER_ID_SIZE) return null
if (unpaddedData.size < HEADER_SIZE + SENDER_ID_SIZE) return null
val buffer = ByteBuffer.wrap(unpaddedData).apply { order(ByteOrder.BIG_ENDIAN) }
val buffer = ByteBuffer.wrap(raw).apply { order(ByteOrder.BIG_ENDIAN) }
// Header
val version = buffer.get().toUByte()
@@ -280,7 +291,7 @@ object BinaryProtocol {
if (hasRecipient) expectedSize += RECIPIENT_ID_SIZE
if (hasSignature) expectedSize += SIGNATURE_SIZE
if (unpaddedData.size < expectedSize) return null
if (raw.size < expectedSize) return null
// SenderID
val senderID = ByteArray(SENDER_ID_SIZE)