sforkowany z mirror/meshtastic-android
stop fetching channels at first !disabled entry
rodzic
3175d5e2d2
commit
aac5e7cd7e
|
@ -781,11 +781,13 @@ class MeshService : Service(), Logging {
|
||||||
channels[ch.index] = ch
|
channels[ch.index] = ch
|
||||||
debug("Admin: Received channel ${ch.index}")
|
debug("Admin: Received channel ${ch.index}")
|
||||||
if (ch.index + 1 < mi.maxChannels) {
|
if (ch.index + 1 < mi.maxChannels) {
|
||||||
if (ch.hasSettings()) {
|
|
||||||
|
// Stop once we get to the first disabled entry
|
||||||
|
if (/* ch.hasSettings() || */ ch.role != ChannelProtos.Channel.Role.DISABLED) {
|
||||||
// Not done yet, request next channel
|
// Not done yet, request next channel
|
||||||
requestChannel(ch.index + 1)
|
requestChannel(ch.index + 1)
|
||||||
} else {
|
} else {
|
||||||
debug("We've received the primary channel, allowing rest of app to start...")
|
debug("We've received the last channel, allowing rest of app to start...")
|
||||||
onHasSettings()
|
onHasSettings()
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Ładowanie…
Reference in New Issue