mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-07-11 22:06:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(firmware): Retry ESP32 OTA service connections cleanly (#6081)

Browse Source
This commit is contained in:
Jeremiah K
2026-07-08 22:07:25 -05:00
committed by GitHub
parent bd14228fb6
commit c2a8e67aee
16 changed files with 1297 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/model/src/commonMain/kotlin/org/meshtastic/core/model/util/Extensions.kt
View File

@@ -19,6 +19,7 @@
package org.meshtastic.core.model.util
import org.meshtastic.proto.Channel
import org.meshtastic.proto.ClientNotification
import org.meshtastic.proto.Config
import org.meshtastic.proto.MeshPacket
import org.meshtastic.proto.ModuleConfig
@@ -139,3 +140,13 @@ fun getInitials(fullName: String): String {
}
fun String.withoutEmojis(): String = filterNot { char -> char.isSurrogate() }
private val OTA_PATTERN = Regex("\\bOTA\\b", RegexOption.IGNORE_CASE)
/**
* OTA-status detector matching the firmware update preflight gate's criterion: any ClientNotification whose message
* contains "OTA" as a whole word (e.g. "Rebooting to BLE OTA", "Cannot start OTA: ...") is consumed by the firmware
* update flow and suppressed as a generic alert. Uses word-boundary matching so unrelated messages containing the
* substring (e.g. "ROTATE", "QUOTA") are not misclassified.
*/
fun ClientNotification.isOtaStatusNotification(): Boolean = message.isNotBlank() && OTA_PATTERN.containsMatchIn(message)