Skip to content

fix: resolve crashes and debug filter issues in Metrics and MapView #4824

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

Merged
jamesarich merged 3 commits into from
Mar 17, 2026
Merged

fix: resolve crashes and debug filter issues in Metrics and MapView #4824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddac036
fix: resolve crashes and debug filter bug from 2.7.14 issues
jamesarich Mar 17, 2026
6344faa
fix(map): fix IllegalFormatConversionException in fdroid map node popup
jamesarich Mar 17, 2026
a570f8f
refactor(map): simplify BaseMapViewModel and remove redundant overrides
jamesarich Mar 17, 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
10 changes: 3 additions & 7 deletions app/src/fdroid/kotlin/org/meshtastic/app/map/MapView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.layout.wrapContentWidth
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -97,7 +96,6 @@ import org.meshtastic.core.common.util.nowMillis
import org.meshtastic.core.common.util.nowSeconds
import org.meshtastic.core.model.DataPacket
import org.meshtastic.core.model.Node
import org.meshtastic.core.model.util.toString
import org.meshtastic.core.resources.Res
import org.meshtastic.core.resources.calculating
import org.meshtastic.core.resources.cancel
Expand All @@ -107,10 +105,7 @@ import org.meshtastic.core.resources.delete_for_everyone
import org.meshtastic.core.resources.delete_for_me
import org.meshtastic.core.resources.expires
import org.meshtastic.core.resources.getString
import org.meshtastic.core.resources.heading
import org.meshtastic.core.resources.latitude
import org.meshtastic.core.resources.location_disabled
import org.meshtastic.core.resources.longitude
import org.meshtastic.core.resources.map_cache_info
import org.meshtastic.core.resources.map_cache_manager
import org.meshtastic.core.resources.map_cache_size
Expand Down Expand Up @@ -142,7 +137,6 @@ import org.meshtastic.core.ui.util.showToast
import org.meshtastic.feature.map.LastHeardFilter
import org.meshtastic.feature.map.model.TracerouteOverlay
import org.meshtastic.feature.map.tracerouteNodeSelection
import org.meshtastic.proto.Config.DisplayConfig.DisplayUnits
import org.meshtastic.proto.Position
import org.meshtastic.proto.Waypoint
import org.osmdroid.bonuspack.utils.BonusPackHelper.getBitmapFromVectorDrawable
Expand Down Expand Up @@ -444,7 +438,9 @@ fun MapView(
if (node.batteryStr != "") node.batteryStr else "?",
)
ourNode?.distanceStr(node, displayUnits)?.let { dist ->
subDescription = getString(Res.string.map_subDescription, ourNode.bearing(node).toString(), dist)
ourNode.bearing(node)?.let { bearing ->
subDescription = getString(Res.string.map_subDescription, bearing, dist)
}
}
setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_BOTTOM)
position = nodePosition
Expand Down
5 changes: 1 addition & 4 deletions app/src/fdroid/kotlin/org/meshtastic/app/map/MapViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import org.koin.core.annotation.KoinViewModel
import org.meshtastic.core.common.BuildConfigProvider
import org.meshtastic.core.model.DataPacket
import org.meshtastic.core.model.RadioController
import org.meshtastic.core.repository.MapPrefs
import org.meshtastic.core.repository.NodeRepository
Expand All @@ -37,7 +36,7 @@ import org.meshtastic.proto.LocalConfig
class MapViewModel(
mapPrefs: MapPrefs,
packetRepository: PacketRepository,
override val nodeRepository: NodeRepository,
nodeRepository: NodeRepository,
radioController: RadioController,
radioConfigRepository: RadioConfigRepository,
buildConfigProvider: BuildConfigProvider,
Expand Down Expand Up @@ -65,6 +64,4 @@ class MapViewModel(
get() = localConfig.value

val applicationId = buildConfigProvider.applicationId

override fun getUser(userId: String?) = nodeRepository.getUser(userId ?: DataPacket.ID_BROADCAST)
}
9 changes: 6 additions & 3 deletions app/src/main/kotlin/org/meshtastic/app/navigation/NodesNavigation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import androidx.navigation3.runtime.NavKey
import kotlinx.coroutines.flow.Flow
import org.jetbrains.compose.resources.StringResource
import org.koin.compose.viewmodel.koinViewModel
import org.koin.core.parameter.parametersOf
import org.meshtastic.app.map.node.NodeMapScreen
import org.meshtastic.app.ui.node.AdaptiveNodeListScreen
import org.meshtastic.core.navigation.ContactsRoutes
Expand Down Expand Up @@ -115,7 +116,8 @@ fun EntryProviderScope<NavKey>.nodeDetailGraph(
}

entry<NodeDetailRoutes.TracerouteLog> { args ->
val metricsViewModel = koinViewModel<MetricsViewModel>()
val metricsViewModel =
koinViewModel<MetricsViewModel>(key = "metrics-${args.destNum}") { parametersOf(args.destNum) }
metricsViewModel.setNodeId(args.destNum)

TracerouteLogScreen(
Expand All @@ -134,7 +136,8 @@ fun EntryProviderScope<NavKey>.nodeDetailGraph(
}

entry<NodeDetailRoutes.TracerouteMap> { args ->
val metricsViewModel = koinViewModel<MetricsViewModel>()
val metricsViewModel =
koinViewModel<MetricsViewModel>(key = "metrics-${args.destNum}") { parametersOf(args.destNum) }
metricsViewModel.setNodeId(args.destNum)

TracerouteMapScreen(
Expand Down Expand Up @@ -176,8 +179,8 @@ private inline fun <reified R : Route> EntryProviderScope<NavKey>.addNodeDetailS
crossinline getDestNum: (R) -> Int,
) {
entry<R> { args ->
val metricsViewModel = koinViewModel<MetricsViewModel>()
val destNum = getDestNum(args)
val metricsViewModel = koinViewModel<MetricsViewModel>(key = "metrics-$destNum") { parametersOf(destNum) }
metricsViewModel.setNodeId(destNum)

routeInfo.screenComposable(metricsViewModel) { backStack.removeLastOrNull() }
Expand Down
7 changes: 6 additions & 1 deletion app/src/test/kotlin/org/meshtastic/app/di/KoinVerificationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import org.koin.test.verify.injectedParameters
import org.koin.test.verify.verify
import org.meshtastic.app.map.MapViewModel
import org.meshtastic.core.model.util.NodeIdLookup
import org.meshtastic.feature.node.metrics.MetricsViewModel

class KoinVerificationTest {

Expand All @@ -54,7 +55,11 @@ class KoinVerificationTest {
HttpClientEngine::class,
OkHttpClient::class,
),
injections = injectedParameters(definition<MapViewModel>(SavedStateHandle::class)),
injections =
injectedParameters(
definition<MapViewModel>(SavedStateHandle::class),
definition<MetricsViewModel>(Int::class),
),
)
}
}
2 changes: 1 addition & 1 deletion feature/map/src/commonMain/kotlin/org/meshtastic/feature/map/BaseMapViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import org.meshtastic.proto.Waypoint
@Suppress("TooManyFunctions")
open class BaseMapViewModel(
protected val mapPrefs: MapPrefs,
protected open val nodeRepository: NodeRepository,
protected val nodeRepository: NodeRepository,
private val packetRepository: PacketRepository,
private val radioController: RadioController,
) : ViewModel() {
Expand Down
20 changes: 10 additions & 10 deletions ...ettings/src/commonMain/kotlin/org/meshtastic/feature/settings/debugging/DebugViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}
}
Expand Down
Loading