meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: simplify setOwner logic

Browse source
This commit is contained in:
andrekir 2023-05-26 16:18:02 -03:00
parent 956db658e9
commit 7ca724142f
3 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -280,7 +280,8 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
regionAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item)
spinner.adapter = regionAdapter
model.ownerName.observe(viewLifecycleOwner) { name ->
model.ourNodeInfo.asLiveData().observe(viewLifecycleOwner) { node ->
val name = node?.user?.longName
binding.usernameEditText.isEnabled = !name.isNullOrEmpty() && !model.isManaged
binding.usernameEditText.setText(name)
}
@ -361,7 +362,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
val n = binding.usernameEditText.text.toString().trim()
model.ourNodeInfo.value?.user?.let {
val user = it.copy(longName = n, shortName = getInitials(n))
if (n.isNotEmpty()) model.setOwner(user)
if (n.isNotEmpty()) model.setOwner(user.toProto())
}
requireActivity().hideKeyboard()
}