Revert "Feat/1919 pax graphs" (#2479)

Author: jamesarich

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

@@ -42,12 +42,6 @@ import com.geeksville.mesh.Portnums.PortNum
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
-import com.google.protobuf.InvalidProtocolBufferException
-import com.geeksville.mesh.MeshProtos
-import com.geeksville.mesh.TelemetryProtos
-import com.geeksville.mesh.AdminProtos
-import com.geeksville.mesh.PaxcountProtos
-import com.geeksville.mesh.StoreAndForwardProtos
 
 data class SearchMatch(
     val logIndex: Int,
@@ -162,7 +156,6 @@ class LogFilterManager {
     }
 }
 
-@Suppress("TooManyFunctions")
 @HiltViewModel
 class DebugViewModel @Inject constructor(
     private val meshLogRepository: MeshLogRepository,
@@ -213,41 +206,29 @@ class DebugViewModel @Inject constructor(
             messageType = log.message_type,
             formattedReceivedDate = TIME_FORMAT.format(log.received_date),
             logMessage = annotateMeshLogMessage(log),
-            decodedPayload = decodePayloadFromMeshLog(log),
         )
     }.toImmutableList()
 
     /**
      * Transform the input [MeshLog] by enhancing the raw message with annotations.
      */
     private fun annotateMeshLogMessage(meshLog: MeshLog): String {
-        return when (meshLog.message_type) {
+        val annotated = when (meshLog.message_type) {
             "Packet" -> meshLog.meshPacket?.let { packet ->
-                annotatePacketLog(packet)
-            } ?: meshLog.raw_message
+                annotateRawMessage(meshLog.raw_message, packet.from, packet.to)
+            }
+
             "NodeInfo" -> meshLog.nodeInfo?.let { nodeInfo ->
                 annotateRawMessage(meshLog.raw_message, nodeInfo.num)
-            } ?: meshLog.raw_message
+            }
+
             "MyNodeInfo" -> meshLog.myNodeInfo?.let { nodeInfo ->
                 annotateRawMessage(meshLog.raw_message, nodeInfo.myNodeNum)
-            } ?: meshLog.raw_message
-            else -> meshLog.raw_message
-        }
-    }
+            }
 
-    private fun annotatePacketLog(packet: MeshProtos.MeshPacket): String {
-        val builder = packet.toBuilder()
-        val hasDecoded = builder.hasDecoded()
-        val decoded = if (hasDecoded) builder.decoded else null
-        if (hasDecoded) builder.clearDecoded()
-        val baseText = builder.build().toString().trimEnd()
-        val result = if (hasDecoded && decoded != null) {
-            val decodedText = decoded.toString().trimEnd().prependIndent("  ")
-            "$baseText\ndecoded {\n$decodedText\n}"
-        } else {
-            baseText
+            else -> null
         }
-        return annotateRawMessage(result, packet.from, packet.to)
+        return annotated ?: meshLog.raw_message
     }
 
     /**
@@ -293,7 +274,6 @@ class DebugViewModel @Inject constructor(
         val messageType: String,
         val formattedReceivedDate: String,
         val logMessage: String,
-        val decodedPayload: String? = null,
     )
 
     companion object {
@@ -315,54 +295,4 @@ class DebugViewModel @Inject constructor(
         }
 
     fun setSelectedLogId(id: String?) { _selectedLogId.value = id }
-
-    /**
-     * Attempts to fully decode the payload of a MeshLog's MeshPacket using the appropriate protobuf definition,
-     * based on the portnum of the packet.
-     *
-     * For known portnums, the payload is parsed into its corresponding proto message and returned as a string.
-     * For text and alert messages, the payload is interpreted as UTF-8 text.
-     * For unknown portnums, the payload is shown as a hex string.
-     *
-     * @param log The MeshLog containing the packet and payload to decode.
-     * @return A human-readable string representation of the decoded payload, or an error message if decoding fails,
-     *         or null if the log does not contain a decodable packet.
-     */
-    private fun decodePayloadFromMeshLog(log: MeshLog): String? {
-        var result: String? = null
-        val packet = log.meshPacket
-        if (packet == null || !packet.hasDecoded()) {
-            result = null
-        } else {
-            val portnum = packet.decoded.portnumValue
-            val payload = packet.decoded.payload.toByteArray()
-            result = try {
-                when (portnum) {
-                    PortNum.TEXT_MESSAGE_APP_VALUE,
-                    PortNum.ALERT_APP_VALUE ->
-                        payload.toString(Charsets.UTF_8)
-                    PortNum.POSITION_APP_VALUE ->
-                        MeshProtos.Position.parseFrom(payload).toString()
-                    PortNum.WAYPOINT_APP_VALUE ->
-                        MeshProtos.Waypoint.parseFrom(payload).toString()
-                    PortNum.NODEINFO_APP_VALUE ->
-                        MeshProtos.User.parseFrom(payload).toString()
-                    PortNum.TELEMETRY_APP_VALUE ->
-                        TelemetryProtos.Telemetry.parseFrom(payload).toString()
-                    PortNum.ROUTING_APP_VALUE ->
-                        MeshProtos.Routing.parseFrom(payload).toString()
-                    PortNum.ADMIN_APP_VALUE ->
-                        AdminProtos.AdminMessage.parseFrom(payload).toString()
-                    PortNum.PAXCOUNTER_APP_VALUE ->
-                        PaxcountProtos.Paxcount.parseFrom(payload).toString()
-                    PortNum.STORE_FORWARD_APP_VALUE ->
-                        StoreAndForwardProtos.StoreAndForward.parseFrom(payload).toString()
-                    else -> payload.joinToString(" ") { "%02x".format(it) }
-                }
-            } catch (e: InvalidProtocolBufferException) {
-                "Failed to decode payload: ${e.message}"
-            }
-        }
-        return result
-    }
 }

app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt

@@ -47,7 +47,6 @@ import com.geeksville.mesh.repository.api.FirmwareReleaseRepository
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import com.geeksville.mesh.service.ServiceAction
 import com.geeksville.mesh.ui.map.MAP_STYLE_ID
-import com.geeksville.mesh.Portnums
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -89,15 +88,13 @@ data class MetricsState(
     val isLocalDevice: Boolean = false,
     val latestStableFirmware: FirmwareRelease = FirmwareRelease(),
     val latestAlphaFirmware: FirmwareRelease = FirmwareRelease(),
-    val paxMetrics: List<MeshLog> = emptyList(),
 ) {
     fun hasDeviceMetrics() = deviceMetrics.isNotEmpty()
     fun hasSignalMetrics() = signalMetrics.isNotEmpty()
     fun hasPowerMetrics() = powerMetrics.isNotEmpty()
     fun hasTracerouteLogs() = tracerouteRequests.isNotEmpty()
     fun hasPositionLogs() = positionLogs.isNotEmpty()
     fun hasHostMetrics() = hostMetrics.isNotEmpty()
-    fun hasPaxMetrics() = paxMetrics.isNotEmpty()
 
     fun deviceMetricsFiltered(timeFrame: TimeFrame): List<Telemetry> {
         val oldestTime = timeFrame.calculateOldestTime()
@@ -267,7 +264,7 @@ class MetricsViewModel @Inject constructor(
     val timeFrame: StateFlow<TimeFrame> = _timeFrame
 
     init {
-        if (destNum != null) {
+        destNum?.let {
             radioConfigRepository.nodeDBbyNum
                 .mapLatest { nodes -> nodes[destNum] to nodes.keys.firstOrNull() }
                 .distinctUntilChanged()
@@ -347,12 +344,6 @@ class MetricsViewModel @Inject constructor(
                     }
                 }.launchIn(viewModelScope)
 
-            meshLogRepository.getLogsFrom(destNum, Portnums.PortNum.PAXCOUNTER_APP_VALUE).onEach { logs ->
-                _state.update { state ->
-                    state.copy(paxMetrics = logs)
-                }
-            }.launchIn(viewModelScope)
-
             firmwareReleaseRepository.stableRelease.filterNotNull().onEach { latestStable ->
                 _state.update { state ->
                     state.copy(latestStableFirmware = latestStable)
@@ -366,8 +357,6 @@ class MetricsViewModel @Inject constructor(
             }.launchIn(viewModelScope)
 
             debug("MetricsViewModel created")
-        } else {
-            debug("MetricsViewModel: destNum is null, skipping metrics flows initialization.")
         }
     }
 

app/src/main/java/com/geeksville/mesh/navigation/NodesRoutes.kt

@@ -24,7 +24,6 @@ import androidx.compose.material.icons.filled.LightMode
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.Memory
 import androidx.compose.material.icons.filled.PermScanWifi
-import androidx.compose.material.icons.filled.People
 import androidx.compose.material.icons.filled.Power
 import androidx.compose.material.icons.filled.Router
 import androidx.compose.runtime.remember
@@ -43,7 +42,6 @@ import com.geeksville.mesh.ui.metrics.PositionLogScreen
 import com.geeksville.mesh.ui.metrics.PowerMetricsScreen
 import com.geeksville.mesh.ui.metrics.SignalMetricsScreen
 import com.geeksville.mesh.ui.metrics.TracerouteLogScreen
-import com.geeksville.mesh.ui.metrics.PaxMetricsScreen
 import com.geeksville.mesh.ui.node.NodeDetailScreen
 import com.geeksville.mesh.ui.node.NodeMapScreen
 import com.geeksville.mesh.ui.node.NodeScreen
@@ -88,9 +86,6 @@ sealed class NodeDetailRoutes {
 
     @Serializable
     data object HostMetricsLog : Route
-
-    @Serializable
-    data object PaxMetrics : Route
 }
 
 fun NavGraphBuilder.nodesGraph(
@@ -166,7 +161,6 @@ fun NavGraphBuilder.nodeDetailGraph(
 
                     NodeDetailRoute.POWER -> PowerMetricsScreen(hiltViewModel(parentEntry))
                     NodeDetailRoute.HOST -> HostMetricsLogScreen(hiltViewModel(parentEntry))
-                    NodeDetailRoute.PAX -> PaxMetricsScreen(hiltViewModel(parentEntry))
                 }
             }
         }
@@ -186,5 +180,4 @@ enum class NodeDetailRoute(
     TRACEROUTE(R.string.traceroute, NodeDetailRoutes.TracerouteLog, Icons.Default.PermScanWifi),
     POWER(R.string.power, NodeDetailRoutes.PowerMetrics, Icons.Default.Power),
     HOST(R.string.host, NodeDetailRoutes.HostMetricsLog, Icons.Default.Memory),
-    PAX(R.string.pax, NodeDetailRoutes.PaxMetrics, Icons.Default.People),
 }

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

@@ -237,14 +237,6 @@ internal fun DebugItem(
                         color = colorScheme.onSurface
                     )
                 )
-                // Show decoded payload if available
-                if (!log.decodedPayload.isNullOrBlank()) {
-                    DecodedPayloadBlock(
-                        decodedPayload = log.decodedPayload,
-                        isSelected = isSelected,
-                        colorScheme = colorScheme
-                    )
-                }
             }
         }
     }
@@ -788,48 +780,3 @@ private suspend fun exportAllLogs(context: Context, logs: List<UiMeshLog>) = wit
         warn("Error:IOException: " + e.toString())
     }
 }
-
-@Composable
-private fun DecodedPayloadBlock(
-    decodedPayload: String,
-    isSelected: Boolean,
-    colorScheme: ColorScheme
-) {
-    Text(
-        text = stringResource(id = R.string.debug_decoded_payload),
-        style = TextStyle(
-            fontSize = if (isSelected) 10.sp else 8.sp,
-            fontWeight = FontWeight.Bold,
-            color = colorScheme.primary
-        ),
-        modifier = Modifier.padding(top = 8.dp, bottom = 4.dp)
-    )
-    Text(
-        text = "{",
-        style = TextStyle(
-            fontSize = if (isSelected) 10.sp else 8.sp,
-            fontWeight = FontWeight.Bold,
-            color = colorScheme.primary
-        ),
-        modifier = Modifier.padding(start = 8.dp, bottom = 2.dp)
-    )
-    Text(
-        text = decodedPayload,
-        softWrap = true,
-        style = TextStyle(
-            fontSize = if (isSelected) 10.sp else 8.sp,
-            fontFamily = FontFamily.Monospace,
-            color = colorScheme.onSurface.copy(alpha = 0.8f)
-        ),
-        modifier = Modifier.padding(start = 16.dp, bottom = 0.dp)
-    )
-    Text(
-        text = "}",
-        style = TextStyle(
-            fontSize = if (isSelected) 10.sp else 8.sp,
-            fontWeight = FontWeight.Bold,
-            color = colorScheme.primary
-        ),
-        modifier = Modifier.padding(start = 8.dp, bottom = 4.dp)
-    )
-}