Skip to content

Fix native VehicleDecoder leak in DashKitDataSource #249

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
wpmed92 merged 1 commit into from
Oct 7, 2026
Merged

Fix native VehicleDecoder leak in DashKitDataSource #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion ...lot-android/app/src/main/java/com/softwiredtech/dashpilot/datasource/DashKitDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ class DashKitDataSource(

override fun disconnect() {
manager.removeGattListener(this)
decoder.destroy()
}

override fun onServicesReady(gatt: BluetoothGatt) {
Expand Down Expand Up @@ -66,7 +67,7 @@ class DashKitDataSource(
private fun parseAndEmit(payload: ByteArray) {
if (payload.isEmpty()) return
for (frame in parseCanPacket(payload)) {
currentState = decoder.decodeFrame(frame.bus, frame.address, frame.data)
currentState = decoder.decodeFrame(frame.bus, frame.address, frame.data) ?: return
}
_incoming.tryEmit(currentState)
}
Expand Down
8 changes: 5 additions & 3 deletions dashpilot-android/app/src/main/java/com/softwiredtech/dashpilot/vehicle/CanFrameDecoder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,19 @@ class CanFrameDecoder(
private val bridge: VehicleBridge,
profile: VehicleProfile
) {
val decoderHandle: Long = bridge.nativeCreateVehicleDecoder(
var decoderHandle: Long = bridge.nativeCreateVehicleDecoder(
profile.dbcContents, profile.busIndices, profile.type
)

fun decodeFrame(bus: Int, address: Int, data: ByteArray): CarState {
@Synchronized fun decodeFrame(bus: Int, address: Int, data: ByteArray): CarState? {
if (decoderHandle == 0L) return null
val values = bridge.nativeDecodeCanFrame(decoderHandle, bus, address, data)
return arrayToCarState(values)
}

fun destroy() {
@Synchronized fun destroy() {
bridge.nativeDestroyVehicleDecoder(decoderHandle)
decoderHandle = 0
}

companion object {
Expand Down
Loading