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

handle missing contactKey digit

Browse source
This commit is contained in:
andrekir 2023-01-02 21:36:35 -03:00
parent 9e5cffbfb1
commit 1e95c200e6
2 changed files with 9 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
View file

@ -259,21 +259,12 @@ class MessagesFragment : Fragment(), Logging {
binding.messageTitle.text = contactName
}
// contactKey: unique contact key filter (channel)+(nodeId)
fun sendMessage(str: String, contactKey: String) {
model.sendMessage(
str,
contactKey[0].digitToInt(), // Channel
contactKey.substring(1) // NodeID
)
}
binding.sendButton.setOnClickListener {
debug("User clicked sendButton")
val str = binding.messageInputText.text.toString().trim()
if (str.isNotEmpty())
sendMessage(str, contactKey)
model.sendMessage(str, contactKey)
binding.messageInputText.setText("") // blow away the string the user just entered
// requireActivity().hideKeyboard()
@ -283,7 +274,7 @@ class MessagesFragment : Fragment(), Logging {
debug("did IME action")
val str = binding.messageInputText.text.toString().trim()
if (str.isNotEmpty()) sendMessage(str, contactKey)
if (str.isNotEmpty()) model.sendMessage(str, contactKey)
binding.messageInputText.setText("") // blow away the string the user just entered
// requireActivity().hideKeyboard()
@ -335,7 +326,7 @@ class MessagesFragment : Fragment(), Logging {
binding.messageInputText.setText(newText)
binding.messageInputText.setSelection(newText.length)
} else {
sendMessage(action.message, contactKey)
model.sendMessage(action.message, contactKey)
}
}
binding.quickChatLayout.addView(button)