From ab46bf6ab99db2ce45f3e5d66def212a54bcc410 Mon Sep 17 00:00:00 2001
From: andrekir <andrekir@pm.me>
Date: Wed, 26 Apr 2023 17:56:10 -0300
Subject: [PATCH] refactor: simplify routeDiscovery conditional

---
 app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index 6819d75ba..857ac21df 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -17,7 +17,6 @@ import androidx.lifecycle.asLiveData
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.geeksville.mesh.NodeInfo
-import com.geeksville.mesh.Portnums
 import com.geeksville.mesh.R
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.databinding.AdapterNodeLayoutBinding
@@ -342,12 +341,11 @@ class UsersFragment : ScreenFragment("Users"), Logging {
 
         model.packetResponse.asLiveData().observe(viewLifecycleOwner) { meshLog ->
             meshLog?.meshPacket?.let { meshPacket ->
-                if (meshPacket.decoded.portnum != Portnums.PortNum.TRACEROUTE_APP) return@let
-                val routeList = meshLog.routeDiscovery?.routeList
+                val routeList = meshLog.routeDiscovery?.routeList ?: return@let
                 fun nodeName(num: Int) = model.nodeDB.nodesByNum?.get(num)?.user?.longName
 
                 var routeStr = "${nodeName(meshPacket.from)} --> "
-                routeList?.forEach { num -> routeStr += "${nodeName(num)} --> " }
+                routeList.forEach { num -> routeStr += "${nodeName(num)} --> " }
                 routeStr += "${nodeName(meshPacket.to)}"
 
                 MaterialAlertDialogBuilder(requireContext())