kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
fix: PKC channel index in sent `MeshPacket`s
rodzic
cec234b58a
commit
bfa2eaef11
|
@ -516,16 +516,17 @@ class MeshService : Service(), Logging {
|
||||||
this.wantAck = wantAck
|
this.wantAck = wantAck
|
||||||
this.id = id
|
this.id = id
|
||||||
this.hopLimit = hopLimit
|
this.hopLimit = hopLimit
|
||||||
this.channel = channel
|
|
||||||
this.priority = priority
|
this.priority = priority
|
||||||
decoded = MeshProtos.Data.newBuilder().also {
|
decoded = MeshProtos.Data.newBuilder().also {
|
||||||
initFn(it)
|
initFn(it)
|
||||||
}.build()
|
}.build()
|
||||||
if (channel == DataPacket.PKC_CHANNEL_INDEX) {
|
if (channel == DataPacket.PKC_CHANNEL_INDEX) {
|
||||||
|
pkiEncrypted = true
|
||||||
nodeDBbyNodeNum[to]?.user?.publicKey?.let { publicKey ->
|
nodeDBbyNodeNum[to]?.user?.publicKey?.let { publicKey ->
|
||||||
pkiEncrypted = !publicKey.isEmpty
|
|
||||||
this.publicKey = publicKey
|
this.publicKey = publicKey
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
this.channel = channel
|
||||||
}
|
}
|
||||||
|
|
||||||
return build()
|
return build()
|
||||||
|
|
Ładowanie…
Reference in New Issue