mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
fix: resolve crashes and debug filter issues in Metrics and MapView (#4824)
Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
This commit is contained in:
parent
9ad28e924f
commit
a10fe61d0f
6 changed files with 27 additions and 26 deletions
|
|
@ -193,19 +193,19 @@ class LogFilterManager {
|
|||
return logs.filter { logItem ->
|
||||
when (filterMode) {
|
||||
FilterMode.OR ->
|
||||
filterTexts.any {
|
||||
it.contains(logItem.logMessage, ignoreCase = true) ||
|
||||
it.contains(logItem.messageType, ignoreCase = true) ||
|
||||
it.contains(logItem.formattedReceivedDate, ignoreCase = true) ||
|
||||
(logItem.decodedPayload?.contains(it, ignoreCase = true) == true)
|
||||
filterTexts.any { filter ->
|
||||
logItem.logMessage.contains(filter, ignoreCase = true) ||
|
||||
logItem.messageType.contains(filter, ignoreCase = true) ||
|
||||
logItem.formattedReceivedDate.contains(filter, ignoreCase = true) ||
|
||||
(logItem.decodedPayload?.contains(filter, ignoreCase = true) == true)
|
||||
}
|
||||
|
||||
FilterMode.AND ->
|
||||
filterTexts.all {
|
||||
it.contains(logItem.logMessage, ignoreCase = true) ||
|
||||
it.contains(logItem.messageType, ignoreCase = true) ||
|
||||
it.contains(logItem.formattedReceivedDate, ignoreCase = true) ||
|
||||
(logItem.decodedPayload?.contains(it, ignoreCase = true) == true)
|
||||
filterTexts.all { filter ->
|
||||
logItem.logMessage.contains(filter, ignoreCase = true) ||
|
||||
logItem.messageType.contains(filter, ignoreCase = true) ||
|
||||
logItem.formattedReceivedDate.contains(filter, ignoreCase = true) ||
|
||||
(logItem.decodedPayload?.contains(filter, ignoreCase = true) == true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue