mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

refactor: simplify routeDiscovery conditional

pull/627/head
andrekir 2023-04-26 17:56:10 -03:00
rodzic 34eac6af18
commit ab46bf6ab9
1 zmienionych plików z 2 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
Wyświetl plik

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