diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 43cc475c..41d7257b 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -654,8 +654,10 @@ class MeshService : Service(), Logging { */ private fun buildMeshPacket( destId: String?, + wantAck: Boolean = false, initFn: MeshProtos.SubPacket.Builder.() -> Unit ): MeshPacket = newMeshPacketTo(destId).apply { + this.wantAck = wantAck decoded = MeshProtos.SubPacket.newBuilder().also { initFn(it) }.build() @@ -1352,7 +1354,7 @@ class MeshService : Service(), Logging { info("sendData dest=$destId <- ${payloadIn.size} bytes (connectionState=$connectionState)") // encapsulate our payload in the proper protobufs and fire it off - val packet = buildMeshPacket(destId) { + val packet = buildMeshPacket(destId, wantAck = true) { data = MeshProtos.Data.newBuilder().also { it.typ = MeshProtos.Data.Type.forNumber(typ) it.payload = ByteString.copyFrom(payloadIn) diff --git a/app/src/main/proto b/app/src/main/proto index 5e2df6c9..bfae47bd 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit 5e2df6c9986cd75f0af4eab1ba0d2aacf258aaab +Subproject commit bfae47bdc0da23bb1e53fed054d3de2d161389bc