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 `user` null-safety in `PopupMenu`

pull/692/head
andrekir 2023-08-25 17:02:12 -03:00
rodzic 5b350aecf9
commit 46bad2f5eb
1 zmienionych plików z 16 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

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

@ -58,7 +58,7 @@ class UsersFragment : ScreenFragment("Users"), Logging {
private fun popup(view: View, position: Int) {
if (!model.isConnected()) return
val node = nodes[position]
val user = node.user
val user = node.user ?: return
val showAdmin = position == 0 || model.adminChannelIndex > 0
val popup = PopupMenu(requireContext(), view)
popup.inflate(R.menu.menu_nodes)
@ -68,32 +68,26 @@ class UsersFragment : ScreenFragment("Users"), Logging {
popup.setOnMenuItemClickListener { item: MenuItem ->
when (item.itemId) {
R.id.direct_message -> {
if (position > 0 && user != null) {
debug("calling MessagesFragment filter: 0${user.id}")
setFragmentResult(
"requestKey",
bundleOf(
"contactKey" to "0${user.id}",
"contactName" to user.longName
)
debug("calling MessagesFragment filter: 0${user.id}")
setFragmentResult(
"requestKey",
bundleOf(
"contactKey" to "0${user.id}",
"contactName" to user.longName
)
parentFragmentManager.beginTransaction()
.replace(R.id.mainActivityLayout, MessagesFragment())
.addToBackStack(null)
.commit()
}
)
parentFragmentManager.beginTransaction()
.replace(R.id.mainActivityLayout, MessagesFragment())
.addToBackStack(null)
.commit()
}
R.id.request_position -> {
if (position > 0 && user != null) {
debug("requesting position for ${user.longName}")
model.requestPosition(node.num)
}
debug("requesting position for '${user.longName}'")
model.requestPosition(node.num)
}
R.id.traceroute -> {
if (position > 0 && user != null) {
debug("requesting traceroute for ${user.longName}")
model.requestTraceroute(node.num)
}
debug("requesting traceroute for '${user.longName}'")
model.requestTraceroute(node.num)
}
R.id.remote_admin -> {
debug("calling remote admin --> destNum: ${node.num.toUInt()}")