From 213164e95b9023410ea6c2d3c0b33c3d6a261e08 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 10 Oct 2022 18:06:19 -0300 Subject: [PATCH] requestConfig refactor --- .../com/geeksville/mesh/service/MeshService.kt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 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 dd5e2ce1..a82c5e60 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1363,12 +1363,16 @@ class MeshService : Service(), Logging { warn("Ignoring stale config complete") } - private fun requestDeviceConfig() { - AdminProtos.AdminMessage.ConfigType.values().forEach { - sendToRadio(newMeshPacketTo(myNodeNum).buildAdminPacket(wantResponse = true) { - if (it != AdminProtos.AdminMessage.ConfigType.UNRECOGNIZED) getConfigRequest = it - }) - } + private fun requestConfig(config: AdminProtos.AdminMessage.ConfigType) { + sendToRadio(newMeshPacketTo(myNodeNum).buildAdminPacket(wantResponse = true) { + getConfigRequest = config + }) + } + + private fun requestAllConfig() { + AdminProtos.AdminMessage.ConfigType.values().filter { + it != AdminProtos.AdminMessage.ConfigType.UNRECOGNIZED + }.forEach(::requestConfig) } private fun requestChannel(channelIndex: Int) {