From 28fec09a54815544e580f0684293829f56e99a04 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Fri, 2 Apr 2021 13:56:09 +0800 Subject: [PATCH] fix message not allowed to be queued while sleeping (I think) --- .../main/java/com/geeksville/mesh/service/MeshService.kt | 2 +- .../main/java/com/geeksville/mesh/ui/MessagesFragment.kt | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 64fd24a8..c2d25f58 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1465,7 +1465,7 @@ class MeshService : Service(), Logging { /// If we've received our initial config, our radio settings and all of our channels, send any queueed packets and broadcast connected to clients private fun onHasSettings() { - processEarlyPackets() // send receive any packets that were queued up + processEarlyPackets() // send any packets that were queued up // broadcast an intent with our new connection state serviceBroadcasts.broadcastConnection() 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 b81eab13..d552e4b6 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt @@ -252,7 +252,10 @@ class MessagesFragment : ScreenFragment("Messages"), Logging { // If connection state _OR_ myID changes we have to fix our ability to edit outgoing messages fun updateTextEnabled() { binding.textInputLayout.isEnabled = - model.isConnected.value != MeshService.ConnectionState.DISCONNECTED && model.nodeDB.myId.value != null && model.radioConfig.value != null + model.isConnected.value != MeshService.ConnectionState.DISCONNECTED + + // Just being connected is enough to allow sending texts I think + // && model.nodeDB.myId.value != null && model.radioConfig.value != null } model.isConnected.observe(viewLifecycleOwner, Observer { _ -> @@ -260,7 +263,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging { updateTextEnabled() }) - model.nodeDB.myId.observe(viewLifecycleOwner, Observer { _ -> + /* model.nodeDB.myId.observe(viewLifecycleOwner, Observer { _ -> // If we don't know our node ID and we are offline don't let user try to send updateTextEnabled() }) @@ -268,7 +271,7 @@ class MessagesFragment : ScreenFragment("Messages"), Logging { model.radioConfig.observe(viewLifecycleOwner, Observer { _ -> // If we don't know our node ID and we are offline don't let user try to send updateTextEnabled() - }) + }) */ } }