Skip to content

Bugfix: Packet mergers in sample apps #588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
philips77 merged 2 commits into from
Sep 11, 2024
Merged

Bugfix: Packet mergers in sample apps #588

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
67b410f
Bugfix: fixed packet merger
philips77 Sep 11, 2024
88e832d
Bugfix: fixed packet merger
philips77 Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Bugfix: fixed packet merger
  • Loading branch information
@philips77
philips77 committed Sep 11, 2024
commit 88e832df579b9392e18dd0f795e0cfa58de9f8eb
6 changes: 5 additions & 1 deletion examples/trivia/src/main/java/no/nordicsemi/android/ble/trivia/spec/PacketMerger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class PacketMerger : DataMerger {
if (lastPacket == null)
return false

if (index == 0) {
receivedDataSize = 0
}

val buffer = ByteBuffer.wrap(lastPacket)
receivedDataSize += buffer.remaining()

Expand All @@ -33,7 +37,7 @@ class PacketMerger : DataMerger {
ByteArray(buffer.remaining())
.apply { buffer.get(this) }
.also { output.write(it) }
return receivedDataSize - 2 == expectedSize
return receivedDataSize - 2 >= expectedSize
}

}
6 changes: 5 additions & 1 deletion test/src/main/java/no/nordicsemi/andorid/ble/test/spec/HeaderBasedPacketMerger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,10 @@ class HeaderBasedPacketMerger: DataMerger {
if (lastPacket == null)
return false

if (index == 0) {
receivedDataSize = 0
}

val buffer = ByteBuffer.wrap(lastPacket)
receivedDataSize += buffer.remaining()

Expand All @@ -33,7 +37,7 @@ class HeaderBasedPacketMerger: DataMerger {
ByteArray(buffer.remaining())
.apply { buffer.get(this) }
.also { output.write(it) }
return receivedDataSize - 2 == expectedSize
return receivedDataSize - 2 >= expectedSize
}

}