From d29c86ee74ad64cbd91013a60cb51b5b5213e69e Mon Sep 17 00:00:00 2001 From: andrekir Date: Sun, 16 Oct 2022 12:36:21 -0300 Subject: [PATCH] admin channel not case-sensitive --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 3 ++- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 9886ecf2..d1505c69 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -383,7 +383,8 @@ class UIViewModel @Inject constructor( } } - val adminChannelIndex: Int get() = channelSet.settingsList.map { it.name }.indexOf("admin") + val adminChannelIndex: Int + get() = channelSet.settingsList.map { it.name.lowercase() }.indexOf("admin") fun requestShutdown(idNum: Int) { try { 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 66de2ef5..f2841949 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -930,7 +930,7 @@ class MeshService : Service(), Logging { } private fun addChannelSettings(ch: ChannelProtos.Channel) { - if (ch.index == 0 || ch.settings.name == "admin") adminChannelIndex = ch.index + if (ch.index == 0 || ch.settings.name.lowercase() == "admin") adminChannelIndex = ch.index serviceScope.handledLaunch { channelSetRepository.addSettings(ch) } @@ -1354,7 +1354,7 @@ class MeshService : Service(), Logging { } private fun setChannel(ch: ChannelProtos.Channel) { - if (ch.index == 0 || ch.settings.name == "admin") adminChannelIndex = ch.index + if (ch.index == 0 || ch.settings.name.lowercase() == "admin") adminChannelIndex = ch.index sendToRadio(newMeshPacketTo(myNodeNum).buildAdminPacket(wantResponse = true) { setChannel = ch })