From 691b7354835a788c6b404096fd8934fc8eb0c6c3 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 17 Apr 2023 18:37:19 -0300 Subject: [PATCH] fix: correct display of connection status --- .../com/geeksville/mesh/ui/SettingsFragment.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 3149e1a7b..89f284cc2 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -201,17 +201,15 @@ class SettingsFragment : ScreenFragment("Settings"), Logging { // Update the status string (highest priority messages first) val info = model.myNodeInfo.value - val statusText = binding.scanStatusText when (connected) { - MeshService.ConnectionState.CONNECTED -> { - statusText.text = if (region.number == 0) getString(R.string.must_set_region) - else getString(R.string.connected_to).format(info?.firmwareString ?: "unknown") - } - MeshService.ConnectionState.DISCONNECTED -> - statusText.text = getString(R.string.not_connected) - MeshService.ConnectionState.DEVICE_SLEEP -> - statusText.text = getString(R.string.connected_sleeping) - else -> {} + MeshService.ConnectionState.CONNECTED -> + if (region.number == 0) R.string.must_set_region else R.string.connected_to + MeshService.ConnectionState.DISCONNECTED -> R.string.not_connected + MeshService.ConnectionState.DEVICE_SLEEP -> R.string.connected_sleeping + else -> null + }?.let { + val firmwareString = info?.firmwareString ?: getString(R.string.unknown) + scanModel.setErrorText(getString(it, firmwareString)) } }