From 952bca3b142c876e41ac4efc3bc8ae72452b6d55 Mon Sep 17 00:00:00 2001 From: andrekir Date: Tue, 20 Jun 2023 08:35:08 -0300 Subject: [PATCH] refactor: replace lowercase() with equals() --- app/src/main/java/com/geeksville/mesh/model/UIState.kt | 5 +++-- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 2 +- 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 7bee9c099..4b4c223e3 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -541,8 +541,9 @@ class UIViewModel @Inject constructor( } } - val adminChannelIndex: Int - get() = channelSet.settingsList.map { it.name.lowercase() }.indexOf("admin") + val adminChannelIndex: Int /** matches [MeshService.adminChannelIndex] **/ + get() = channelSet.settingsList.indexOfFirst { it.name.equals("admin", ignoreCase = true) } + .coerceAtLeast(0) /** * Write the persisted packet data out to a CSV file in the specified location. 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 d327586eb..8eae84b7b 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -466,7 +466,7 @@ class MeshService : Service(), Logging { /// Admin channel index private val adminChannelIndex: Int - get() = channelSet.settingsList.indexOfFirst { it.name.lowercase() == "admin" } + get() = channelSet.settingsList.indexOfFirst { it.name.equals("admin", ignoreCase = true) } .coerceAtLeast(0) /// Generate a new mesh packet builder with our node as the sender, and the specified node num