From 2dd37e791df9f5c4772f93762b5ea49b74351a77 Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 21 Apr 2020 20:27:56 -0700 Subject: [PATCH] don't let users try to send texts if we haven't received our node ID I wanted an and not an or ;-) Based on the autobug and the great report inhttps://github.com/meshtastic/Meshtastic-esp32/issues/102 I think this should fix the crash described in the messages screen. --- app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt index 756bae244..38a099200 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt @@ -172,7 +172,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging { model.isConnected.observe(viewLifecycleOwner, Observer { connected -> // If we don't know our node ID and we are offline don't let user try to send textInputLayout.isEnabled = - connected != MeshService.ConnectionState.DISCONNECTED || model.nodeDB.myId.value != null + connected != MeshService.ConnectionState.DISCONNECTED && model.nodeDB.myId.value != null }) }