meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: Make search escape regex, so '.' and similar behave properly. (#2263)

Browse source
This commit is contained in:
DaneEvans 2025-06-27 23:12:15 +10:00 • committed by GitHub
parent 55a2bda513
commit ea25a8198a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/model/DebugViewModel.kt
View file

@ -126,11 +126,13 @@ class LogSearchManager {
}
return filteredLogs.flatMapIndexed { logIndex, log ->
searchText.split(" ").flatMap { term ->
val messageMatches = term.toRegex(RegexOption.IGNORE_CASE).findAll(log.logMessage)
val escapedTerm = Regex.escape(term)
val regex = escapedTerm.toRegex(RegexOption.IGNORE_CASE)
val messageMatches = regex.findAll(log.logMessage)
.map { match -> SearchMatch(logIndex, match.range.first, match.range.last, "message") }
val typeMatches = term.toRegex(RegexOption.IGNORE_CASE).findAll(log.messageType)
val typeMatches = regex.findAll(log.messageType)
.map { match -> SearchMatch(logIndex, match.range.first, match.range.last, "type") }
val dateMatches = term.toRegex(RegexOption.IGNORE_CASE).findAll(log.formattedReceivedDate)
val dateMatches = regex.findAll(log.formattedReceivedDate)
.map { match -> SearchMatch(logIndex, match.range.first, match.range.last, "date") }
messageMatches + typeMatches + dateMatches
}

4
app/src/main/java/com/geeksville/mesh/ui/debug/Debug.kt
View file

@ -297,7 +297,7 @@ private fun rememberAnnotatedString(
append(text)
if (searchText.isNotEmpty()) {
searchText.split(" ").forEach { term ->
term.toRegex(RegexOption.IGNORE_CASE).findAll(text).forEach { match ->
Regex(Regex.escape(term), RegexOption.IGNORE_CASE).findAll(text).forEach { match ->
addStyle(
style = highlightStyle,
start = match.range.first,
@ -339,7 +339,7 @@ private fun rememberAnnotatedLogMessage(log: UiMeshLog, searchText: String): Ann
// Add search highlight annotations
if (searchText.isNotEmpty()) {
searchText.split(" ").forEach { term ->
term.toRegex(RegexOption.IGNORE_CASE).findAll(log.logMessage).forEach { match ->
Regex(Regex.escape(term), RegexOption.IGNORE_CASE).findAll(log.logMessage).forEach { match ->
addStyle(
style = highlightStyle,
start = match.range.first,