Skip to content

fix #4285 - Neighbor popup #4346

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

Draft
DaneEvans wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

fix #4285 - Neighbor popup #4346

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3bcc92e
add filtering back in to prevent popups.
DaneEvans Jan 28, 2026
bc1c446
linter.
DaneEvans Jan 28, 2026
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
50 changes: 33 additions & 17 deletions app/src/main/java/com/geeksville/mesh/service/MeshNeighborInfoHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,29 +61,45 @@ constructor(
val requestId = packet.decoded.requestId
val start = commandSender.neighborInfoStartTimes.remove(requestId)

val neighbors =
ni.neighborsList.joinToString("\n") { n ->
val node = nodeManager.nodeDBbyNodeNum[n.nodeId]
val name = node?.let { "${it.longName} (${it.shortName})" } ?: getString(Res.string.unknown_username)
"• $name (SNR: ${n.snr})"
}
// Only show response if packet is addressed to us and we sent a request in the last 3 minutes
val myNodeNum = nodeManager.myNodeNum
val isAddressedToUs = packet.to == myNodeNum
val isRecentRequest = start != null && (System.currentTimeMillis() - start) < NEIGHBOR_RQ_COOLDOWN

val formatted = "Neighbors of ${nodeManager.nodeDBbyNodeNum[packet.from]?.longName ?: "Unknown"}:\n$neighbors"
if (isAddressedToUs && isRecentRequest) {
val neighbors =
ni.neighborsList.joinToString("\n") { n ->
val node = nodeManager.nodeDBbyNodeNum[n.nodeId]
val name =
node?.let { "${it.longName} (${it.shortName})" } ?: getString(Res.string.unknown_username)
"• $name (SNR: ${n.snr})"
}

val responseText =
if (start != null) {
val elapsedMs = System.currentTimeMillis() - start
val seconds = elapsedMs / MILLIS_PER_SECOND
Logger.i { "Neighbor info $requestId complete in $seconds s" }
String.format(Locale.US, "%s\n\nDuration: %.1f s", formatted, seconds)
} else {
formatted
}
val formatted =
"Neighbors of ${nodeManager.nodeDBbyNodeNum[packet.from]?.longName ?: "Unknown"}:\n$neighbors"

val responseText =
if (start != null) {
val elapsedMs = System.currentTimeMillis() - start
val seconds = elapsedMs / MILLIS_PER_SECOND
Logger.i { "Neighbor info $requestId complete in $seconds s" }
String.format(Locale.US, "%s\n\nDuration: %.1f s", formatted, seconds)
} else {
formatted
}

serviceRepository.setNeighborInfoResponse(responseText)
serviceRepository.setNeighborInfoResponse(responseText)
} else {
Logger.d {
"Neighbor info response filtered: isAddressedToUs=$isAddressedToUs, isRecentRequest=$isRecentRequest"
}
}
}

companion object {
private const val MILLIS_PER_SECOND = 1000.0

// Only show neighbor info responses for requests sent in the last 3 minutes
private const val NEIGHBOR_RQ_COOLDOWN = 3 * 60 * 1000L // 3 minutes in milliseconds
}
}