diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index cfb6410..a0586bf 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,6 +23,7 @@
+
diff --git a/docs/image-mode-technical.md b/docs/image-mode-technical.md
index 451766a..d5d6743 100644
--- a/docs/image-mode-technical.md
+++ b/docs/image-mode-technical.md
@@ -2,10 +2,11 @@
## 1. Overview
-Image mode mirrors the voice on-demand architecture exactly:
+Image mode mirrors the voice on-demand architecture exactly, including
+swarm-assisted recovery for stalled partial transfers:
- **Control plane (text messages):**
- - `IE2:` image envelope announces image availability in chat.
+ - `IE4:` image envelope announces image availability in chat.
- **Control plane (raw binary request):**
- Binary image fetch request (same raw route as image fragments).
- **Data plane (raw binary packets):**
@@ -14,11 +15,14 @@ Image mode mirrors the voice on-demand architecture exactly:
Images are never broadcast in full to channels. Chat carries only metadata;
pixels are fetched on demand when the user taps the image bubble.
+Shared swarm fallback is documented in
+[Swarm Mode Technical Design](./swarm-mode-technical.md).
+
## 2. Key Modules
- `lib/utils/image_message_parser.dart`
- `ImagePacket` (binary fragment format)
- - `ImageEnvelope` (`IE2`)
+ - `ImageEnvelope` (`IE4`)
- `ImageFetchRequest` (binary)
- `fragmentImage()` — split compressed bytes into packets
- `reassembleImage()` — join received fragments into bytes
@@ -27,8 +31,9 @@ pixels are fetched on demand when the user taps the image bubble.
- `lib/providers/image_provider.dart`
- Reassembly sessions, outgoing cache, deferred serving
- Outgoing sessions also registered as complete incoming sessions for immediate local display
+ - Received partial sessions can be re-served during swarm recovery
- `lib/providers/app_provider.dart`
- - Incoming routing for `IE2`, binary image fetch requests, binary `0x49` packets
+ - Incoming routing for `IE4`, binary image fetch requests, binary `0x49` packets, and raw swarm control payloads
- `lib/widgets/messages/image_message_bubble.dart`
- Square cover thumbnail (up to 256 px); tap-to-load for received images;
progress ring during fetch; full-screen `InteractiveViewer` on tap
@@ -40,9 +45,9 @@ pixels are fetched on demand when the user taps the image bubble.
## 3. Wire Formats
-### 3.1 Image Envelope (`IE2`)
+### 3.1 Image Envelope (`IE4`)
-Prefix: `IE2:` + colon-delimited compact payload (base36 numeric fields)
+Prefix: `IE4:` + colon-delimited compact payload (base36 numeric fields)
Fields:
@@ -54,51 +59,50 @@ Fields:
| `w` | base36 | Actual image width after compression (pixels) |
| `h` | base36 | Actual image height after compression (pixels) |
| `bytes` | base36 | Total compressed size in bytes |
-| `senderKey6` | string | 12 hex chars (6 bytes sender prefix) |
-| `ts` | base36 | Unix timestamp (seconds) |
-
Compact format:
```text
-IE2:{sid}:{fmt}:{total}:{w}:{h}:{bytes}:{senderKey6}:{ts}
+IE4:{sid}:{fmt}:{total}:{w}:{h}:{bytes}
```
Example (256×171 landscape image, 14 fragments):
```text
-IE2:a:0:e:74:4r:1mc:aabbccddeeff:s44we8
+IE4:a:0:e:74:4r:1mc
```
Note: `sid` is base36 on wire and expands to 8-hex internally.
`w` and `h` reflect the actual post-compression dimensions, which preserve
the source aspect ratio (contain within the configured max size).
-### 3.2 Image Fetch Request (binary)
+### 3.2 Image Fetch Request (`IR4` + binary)
+
+Text format:
+
+```text
+IR4:{sid}:{want}:{requesterKey6}
+```
Binary payload format:
```text
-[magic=0x69][sid:4B][flags:1B][requesterKey6:6B][ts:4B][missingCount:1B][missingIndices...]
+[magic=0x69][sid:4B][flags:1B][requesterKey6:6B][missingCount:1B][missingIndices...]
```
| Field | Value |
|------------------|--------------------------|
| `flags` | bit0=1 => request missing indices, else all |
| `requesterKey6` | 6-byte requester key prefix |
-| `ts` | unix timestamp seconds (u32) |
-
### 3.3 Raw Image Packet (data plane)
Binary payload structure:
- Byte 0: magic `0x49` (`'I'`)
- Bytes 1..4: session ID (4 bytes)
-- Byte 5: format ID
-- Byte 6: fragment index (0-based)
-- Byte 7: total fragments
-- Bytes 8..N: image data (max 152 bytes per fragment)
+- Byte 5: fragment index (0-based)
+- Bytes 6..N: image data (max 152 bytes per fragment)
-Header is 8 bytes — identical layout to `VoicePacket`.
+Header is 6 bytes. Image format and total fragment count come from the `IE4` envelope.
## 4. Compression Pipeline
@@ -152,11 +156,11 @@ only the shorter axis is padded — no cropping occurs.
7. Envelope sent via normal message path:
- Channel: `sendChannelMessage`
- Direct: `sendTextMessage`
-8. Local placeholder message added (`IE2:` text, `deliveryStatus.sending`).
+8. Local placeholder message added (`IE4:` text, `deliveryStatus.sending`).
## 6. Incoming Flow (Receive)
-### 6.1 `IE2` envelope received
+### 6.1 `IE4` envelope received
`AppProvider` calls `imageProvider.registerEnvelope()` and adds the message to
chat. The bubble shows a grey square placeholder with a download icon.
@@ -165,11 +169,21 @@ chat. The bubble shows a grey square placeholder with a download icon.
`AppProvider` treats it as control-plane only (not added to chat):
-- Validates requester key prefix.
- Resolves requester contact.
- Calls `imageProvider.serveSessionTo()` which streams all cached fragments.
-### 6.3 Raw packet received (`pushRawData`, magic `0x49`)
+### 6.3 Swarm control messages received
+
+`AppProvider` also handles shared raw swarm discovery payloads:
+
+- binary swarm requests advertise which image fragments are still missing
+- binary swarm availability responses advertise which fragments another peer can relay
+- swarm payloads arrive via `pushRawData` and are intercepted instead of being added to chat
+
+Shared discovery and responder semantics are documented in
+[Swarm Mode Technical Design](./swarm-mode-technical.md).
+
+### 6.4 Raw packet received (`pushRawData`, magic `0x49`)
`AppProvider.onRawDataReceived` parses `ImagePacket` binary and calls
`imageProvider.addFragment()`. When the session becomes complete, the bubble
@@ -188,6 +202,9 @@ When `cacheOutgoingSession()` is called it also writes all fragments into
`_sessions[sessionId]`, so the sender sees the image immediately in the bubble
(no tap-to-load required for own messages).
+If a peer later receives only part of an image session, those received fragments
+can also be served onward to another requester during swarm recovery.
+
## 8. Display
`ImageMessageBubble` (max width 256 px):
@@ -195,7 +212,8 @@ When `cacheOutgoingSession()` is called it also writes all fragments into
- **Complete session**: `AspectRatio(1.0)` → `AvifImage.memory(fit: cover)`
square thumbnail; tap → full-screen `InteractiveViewer` with fade transition.
- **Incomplete/missing**: grey square placeholder with download icon;
- tap → sends binary fetch request.
+ tap → sends binary fetch request, with raw swarm fallback if the original
+ sender path stalls.
- **Loading**: circular progress indicator showing `received/total` count.
- **Error**: broken-image icon.
@@ -213,12 +231,12 @@ Image bubbles and Message Technical Details show an **estimated transmit time**
The estimate is airtime-based (LoRa packet model), not just compressed image size:
- Source inputs:
- - `total` fragments and `bytes` from `IE2` envelope
+ - `total` fragments and `bytes` from `IE4` envelope
- all numeric envelope values are decoded from base36
- `pathLen` from message metadata
- current radio params from `deviceInfo`: `radioBw`, `radioSf`, `radioCr`
- Per-fragment payload model:
- - `meshHeader(2)` + `pathLen` + `imageHeader(8)` + `fragmentBytes`
+ - `meshHeader(2)` + `pathLen` + `imageHeader(6)` + `fragmentBytes`
- LoRa airtime:
- standard symbol-time formula (preamble + payload symbols)
- Mesh pacing/hops:
@@ -246,9 +264,12 @@ Fallback defaults are used when radio params are unavailable: `SF10`, `BW250kHz`
## 11. Operational Constraints
- No firmware changes required (reuses `cmdSendRawData` / `pushRawData`).
-- On-demand fetch works only if sender app is online and has cached session.
+- On-demand fetch prefers the original sender, but a partial image can also be
+ completed from alternate peers that already hold matching fragments.
- Raw return path requires a valid direct route to requester.
- Available on iOS and Android (`image_picker` + `flutter_avif`).
+- Swarm discovery uses the same `cmdSendRawData` / `pushRawData` path as image
+ fetch and fragment delivery.
### 11.1 Raw Binary Routing Semantics
@@ -260,7 +281,28 @@ Fallback defaults are used when radio params are unavailable: `SF10`, `BW250kHz`
- only nodes on that path relay it;
- it is **not** received by everyone in the mesh.
-## 12. High-Level Sequence
+## 12. Swarm Fallback Sequence
+
+```mermaid
+sequenceDiagram
+ participant A as Original Sender
+ participant P as Peer With Fragments
+ participant N as Reachable Peers
+ participant B as Receiver App
+
+ A->>M: Send IE4 envelope
+ M->>B: Deliver IE4
+ B->>A: Direct binary image fetch request
+ A->>B: Stream raw ImagePacket fragments (partial)
+ Note over A,B: Sender path stops responding
+ B->>N: Raw swarm requests with missing image fragment indices
+ P->>B: Raw swarm availability response
+ B->>P: Direct binary fetch request for missing subset
+ P->>B: Stream remaining raw ImagePacket fragments
+ B->>B: Reassemble completed image
+```
+
+## 13. High-Level Sequence
```mermaid
sequenceDiagram
@@ -272,8 +314,8 @@ sequenceDiagram
A->>A: Compress: contain resize → grayscale → PNG → AVIF
A->>A: Fragment into ≤152B packets
A->>A: Cache outgoing + populate local session (immediate display)
- A->>M: Send IE2 envelope (actual w×h, fragment count)
- M->>B: Deliver IE2
+ A->>M: Send IE4 envelope (actual w×h, fragment count)
+ M->>B: Deliver IE4
B->>B: Render grey placeholder bubble
B->>A: Tap → send binary fetch request
A->>B: Stream binary ImagePackets
diff --git a/docs/swarm-mode-technical.md b/docs/swarm-mode-technical.md
new file mode 100644
index 0000000..d945f6f
--- /dev/null
+++ b/docs/swarm-mode-technical.md
@@ -0,0 +1,148 @@
+# Swarm Mode Technical Design
+
+## 1. Overview
+
+Swarm mode is a shared media-recovery transport used by both voice and image
+sessions when the original sender path stops responding after some fragments
+have already propagated through the mesh.
+
+It adds a lightweight **swarm discovery plane** on top of the existing
+**direct raw-data transfer plane**:
+
+- **Discovery plane (raw custom control payloads):**
+ - `MediaSwarmRequest`
+ - `MediaSwarmAvailability`
+- **Transfer plane (direct raw binary):**
+ - existing `VoiceFetchRequest` / `ImageFetchRequest`
+ - existing `VoicePacket` / `ImagePacket`
+
+Swarm mode does not broadcast media payloads. It fans out raw control requests
+to reachable peers, collects raw availability responses, and then fetches media
+from the best responder.
+
+## 2. Problem It Solves
+
+Without swarm mode, media fetch is limited to the original sender's direct raw
+path. If that sender goes offline, moves, or stops responding, a receiver can
+be left with a partial session even when other peers already hold useful
+fragments.
+
+Swarm mode lets the receiver discover alternate peers and fetch the missing
+subset directly from them.
+
+## 3. Control Messages
+
+### 3.1 Media Swarm Request (binary)
+
+```text
+[magic=0x6d][kind=0x01][mediaType:1B][sessionId:4B][requesterKey6:6B][missingCount:1B][missingIndices...]
+```
+
+Fields:
+
+- `mediaType` — `voice` or `image`
+- `sessionId` — 8 hex chars
+- `requesterKey6` — 12 hex chars identifying the requesting device
+- `missingCount` — `0` means the requester needs all fragments
+- `missingIndices` — exact missing fragment indices when `missingCount > 0`
+
+Example:
+
+```text
+6d 01 02 de ad be ef aa bb cc dd ee ff 03 00 02 09
+```
+
+### 3.2 Media Swarm Availability (binary)
+
+```text
+[magic=0x6d][kind=0x02][mediaType:1B][sessionId:4B][requesterKey6:6B][responderKey6:6B][availableCount:1B][availableIndices...]
+```
+
+Fields:
+
+- `mediaType` — `voice` or `image`
+- `sessionId` — 8 hex chars
+- `requesterKey6` — copied from the swarm request
+- `responderKey6` — 12 hex chars identifying the responding peer
+- `availableCount` — `0` means the responder can satisfy the full request
+- `availableIndices` — exact fragment indices held when `availableCount > 0`
+
+Example:
+
+```text
+6d 02 02 de ad be ef aa bb cc dd ee ff 11 22 33 44 55 66 02 02 09
+```
+
+## 4. Requester Behavior
+
+When a voice or image session is incomplete:
+
+1. Prefer the original sender if its direct raw route is healthy.
+2. If the original sender path is unavailable or not responding, send a raw
+ swarm request to reachable peers with the exact missing fragment indices.
+3. Wait up to **10 seconds** for raw availability responses.
+4. Rank responders by overlap with the current missing set.
+5. Skip the original sender when choosing alternate peers.
+6. Send a direct binary fetch request to the best responder for only the
+ missing subset that responder advertised.
+
+Actual media transfer uses the same `cmdSendRawData` / `pushRawData` path as the
+swarm control messages.
+
+## 5. Responder Behavior
+
+A peer that receives a swarm request:
+
+- checks whether it has fragments for the requested media session
+- replies only if it has at least one requested fragment
+- advertises only fragments it actually holds
+- may reply from:
+ - its outgoing cache, or
+ - a partially/fully received incoming session
+
+This enables torrent-like relay behavior without requiring the peer to be the
+original sender.
+
+## 6. Visibility and Routing
+
+- Swarm control payloads are carried by `cmdSendRawData` and received through
+ `pushRawData`.
+- They are intercepted by the app and **must not be surfaced in chat**.
+- Discovery is a direct raw fan-out to reachable peers, not a public-channel
+ broadcast.
+- Media packets themselves remain direct-route raw packets.
+
+## 7. Constraints
+
+- No firmware changes are required.
+- Swarm mode only helps if at least one peer has already received some useful
+ fragments.
+- Peers can only relay fragments they actually have.
+- Alternate peers still need a valid direct raw route back to the requester.
+- Swarm mode improves recovery from sender-path failure, but it does not change
+ the underlying raw-packet size, airtime, or hop constraints.
+
+## 8. High-Level Sequence
+
+```mermaid
+sequenceDiagram
+ participant S as Original Sender
+ participant P as Peer With Fragments
+ participant N as Reachable Peers
+ participant R as Requester
+
+ S->>R: Direct raw fragments (partial)
+ Note over S,R: Original sender path stops responding
+ R->>N: Raw swarm requests with exact missing fragments
+ P->>R: Raw swarm availability response
+ R->>P: Direct binary fetch request for missing subset
+ P->>R: Direct raw fragments
+ R->>R: Reassemble completed session
+```
+
+## 9. Integration Points
+
+- Voice-specific behavior is summarized in `docs/voice-mode-technical.md`.
+- Image-specific behavior is summarized in `docs/image-mode-technical.md`.
+- This document is the shared source of truth for swarm discovery and fallback
+ semantics.
diff --git a/docs/voice-mode-technical.md b/docs/voice-mode-technical.md
index cce25cb..9861dae 100644
--- a/docs/voice-mode-technical.md
+++ b/docs/voice-mode-technical.md
@@ -2,10 +2,11 @@
## 1. Overview
-Voice mode uses a **two-plane architecture**:
+Voice mode uses a **two-plane architecture** with optional swarm-assisted
+recovery:
- **Control plane (text messages):**
- - `VE2:` voice envelope announces voice availability in chat.
+ - `VE3:` voice envelope announces voice availability in chat.
- **Control plane (raw binary request):**
- Binary voice fetch request (same raw route as voice packets).
- **Data plane (raw binary packets):**
@@ -13,11 +14,13 @@ Voice mode uses a **two-plane architecture**:
This design avoids broadcasting full voice payloads to channels/rooms. Chat carries only metadata; audio is fetched on demand when user presses play.
+Swarm fallback is documented in [Swarm Mode Technical Design](./swarm-mode-technical.md).
+
## 2. Key Modules
- `lib/utils/voice_message_parser.dart`
- - `VoicePacket` (legacy text + binary packet format)
- - `VoiceEnvelope` (`VE2`)
+ - `VoicePacket` (binary direct-packet format)
+ - `VoiceEnvelope` (`VE3`)
- `VoiceFetchRequest` (binary)
- `lib/screens/messages_tab.dart`
- Capture/encode voice, cache encoded packets, send envelope only
@@ -25,20 +28,20 @@ This design avoids broadcasting full voice payloads to channels/rooms. Chat carr
- Reassembly/playback sessions
- Outgoing session cache + deferred serving
- `lib/providers/app_provider.dart`
- - Incoming routing for `VE2` and binary voice fetch requests
+ - Incoming routing for `VE3`, binary voice fetch requests, and raw swarm control payloads
- Handles raw packet ingestion
- `lib/widgets/messages/voice_message_bubble.dart`
- Play behavior (immediate play if complete, otherwise fetch + auto-play)
- `lib/providers/messages_provider.dart`
- - Message-level voice detection (`VE2` + legacy `V:`)
+ - Message-level voice detection (`VE3`)
- `lib/services/message_storage_service.dart`
- Persists `isVoice` and `voiceId`
## 3. Wire Formats
-### 3.1 Voice Envelope (`VE2`)
+### 3.1 Voice Envelope (`VE3`)
-Prefix: `VE2:` + colon-delimited compact payload (base36 numeric fields)
+Prefix: `VE3:` + colon-delimited compact payload (base36 numeric fields)
Fields:
@@ -46,21 +49,19 @@ Fields:
- `mode` (base36): codec mode ID (`VoicePacketMode.id`)
- `total` (base36): packet count (1..255)
- `durS` (base36): estimated duration in seconds
-- `senderKey6` (string, 12 hex chars): sender public-key prefix (6 bytes)
-- `ts` (base36): unix timestamp seconds
`sid` is base36 on wire and expands to 8-hex internally.
Compact format:
```text
-VE2:{sid}:{mode}:{total}:{durS}:{senderKey6}:{ts}
+VE3:{sid}:{mode}:{total}:{durS}
```
Example:
```text
-VE2:a:1:4:4:aabbccddeeff:s44we8
+VE3:a:1:4:4
```
### 3.2 Voice Fetch Request (binary)
@@ -68,7 +69,7 @@ VE2:a:1:4:4:aabbccddeeff:s44we8
Binary payload format:
```text
-[magic=0x72][sid:4B][flags:1B][requesterKey6:6B][ts:4B][missingCount:1B][missingIndices...]
+[magic=0x72][sid:4B][flags:1B][requesterKey6:6B][missingCount:1B][missingIndices...]
```
### 3.3 Raw Voice Packet (data plane)
@@ -77,10 +78,10 @@ Binary payload structure:
- Byte 0: magic `0x56` (`'V'`)
- Bytes 1..4: session ID (4 bytes)
-- Byte 5: mode ID
-- Byte 6: packet index
-- Byte 7: total packets
-- Bytes 8..N: codec2 data
+- Byte 5: packet index
+- Bytes 6..N: codec2 data
+
+Header is 6 bytes. Mode and total packet count come from the `VE3` envelope.
## 4. Outgoing Flow (Send)
@@ -88,27 +89,38 @@ Binary payload structure:
2. Each chunk is codec2-encoded into `VoicePacket` objects.
3. Packets are cached in `VoiceProvider` outgoing cache (TTL 15 min).
4. Sender inserts local voice placeholder message (`isVoice=true`, `voiceId=sessionId`).
-5. Sender sends one envelope (`VE2`) through normal message path:
+5. Sender sends one envelope (`VE3`) through normal message path:
- channel/room: `sendChannelMessage`
- direct: `sendTextMessage`
6. **No raw audio packets are sent during initial send.**
## 5. Incoming Routing
-### 5.1 `VE2` envelope received
+### 5.1 `VE3` envelope received
-`AppProvider` marks message as voice (`isVoice`, `voiceId`) and adds it to chat.
+`AppProvider` records sender identity from message metadata, registers the voice
+session envelope, marks the message as voice (`isVoice`, `voiceId`), and adds it to chat.
### 5.2 Binary voice fetch request received
`AppProvider` treats it as control-plane only:
- request is not added to chat
-- validates requester prefix match against sender metadata
- resolves requester contact via key prefix
- calls `voiceProvider.serveSessionTo(...)`
-### 5.3 Raw packet received (`pushRawData`)
+### 5.3 Swarm control messages received
+
+`AppProvider` also handles raw swarm control payloads:
+
+- binary swarm requests advertise which voice fragments are still missing
+- binary swarm availability responses advertise which fragments a peer can relay
+- swarm control payloads arrive via `pushRawData` and are not added to chat history
+
+Swarm semantics are shared with image mode and documented in
+[Swarm Mode Technical Design](./swarm-mode-technical.md).
+
+### 5.4 Raw packet received (`pushRawData`)
`AppProvider.onRawDataReceived` parses `VoicePacket` binary and appends to session in `VoiceProvider`.
@@ -118,10 +130,15 @@ In `VoiceMessageBubble`:
- If session already complete: play immediately.
- If incomplete/missing:
- 1. Resolve sender contact (message sender prefix or `VE2.senderKey6` fallback)
- 2. Send direct binary fetch request
- 3. Show requesting state in UI
- 4. Auto-play when session becomes complete
+ 1. Resolve sender contact from message sender metadata
+ 2. Prefer a direct fetch from the original sender if its raw route is healthy
+ 3. If the sender path does not respond, fan out a raw swarm request with the
+ exact missing packet indices to reachable peers
+ 4. Wait up to 10 seconds for raw peer availability responses
+ 5. Send a direct binary fetch request to the best alternate peer for the
+ missing subset it advertised
+ 6. Show requesting state in UI
+ 7. Auto-play when session becomes complete
If sender cannot be resolved or request cannot be sent, bubble remains and shows: **"Voice unavailable right now"**.
@@ -136,10 +153,13 @@ If sender cannot be resolved or request cannot be sent, bubble remains and shows
Serving prerequisites:
-- session exists in cache
+- session exists in outgoing cache or already-received session state
- `sendRawPacketCallback` configured
- requester has direct path (`outPathLen >= 0`)
+Received partial sessions can therefore act as relay sources during swarm
+recovery.
+
## 8. Persistence
`MessageStorageService` now stores and restores:
@@ -167,13 +187,13 @@ Voice bubbles and Message Technical Details show an **estimated transmit time**
The estimate is airtime-based (LoRa packet model), not file-duration-only:
- Source inputs:
- - `packetCount` and `durationMs` from `VE2` envelope, or
+ - `packetCount` and `durationMs` from `VE3` envelope, or
- numeric envelope values decoded from base36
- actual received `VoicePacket.codec2Data.length` bytes when local session packets exist
- `pathLen` from message metadata
- current radio params from `deviceInfo`: `radioBw`, `radioSf`, `radioCr`
- Per-packet payload model:
- - `meshHeader(2)` + `pathLen` + `voiceHeader(8)` + `codec2Bytes`
+ - `meshHeader(2)` + `pathLen` + `voiceHeader(6)` + `codec2Bytes`
- LoRa airtime:
- standard symbol-time formula (preamble + payload symbols)
- Mesh pacing/hops:
@@ -192,9 +212,12 @@ Fallback defaults are used when radio params are unavailable: `SF10`, `BW250kHz`
## 11. Operational Constraints
- No firmware changes required.
-- On-demand fetch works only if sender app is online and has cached session.
+- On-demand fetch prefers the original sender, but a partial session can also be
+ completed from alternate peers that already hold packets.
- Raw return path needs a currently valid direct route to requester.
- Voice capture is available on iOS and Android (`Platform.isIOS || Platform.isAndroid`).
+- Swarm discovery uses the same `cmdSendRawData` / `pushRawData` path as voice
+ fetch and packet delivery.
### 11.1 Raw Binary Routing Semantics
@@ -206,26 +229,27 @@ Fallback defaults are used when radio params are unavailable: `SF10`, `BW250kHz`
- only nodes on that path relay it;
- it is **not** received by everyone in the mesh.
-## 12. Backward Compatibility
-
-- Legacy `V:` text packet parsing is still supported.
-- Message voice detection accepts `VE2` and legacy `V:` formats.
-
-## 13. High-Level Sequence
+## 12. High-Level Sequence
```mermaid
sequenceDiagram
participant A as Sender App
- participant M as Mesh Chat
+ participant P as Peer With Packets
+ participant N as Reachable Peers
participant B as Receiver App
A->>A: Record + encode voice packets
A->>A: Cache session packets (TTL 15m)
- A->>M: Send VE2 envelope
- M->>B: Deliver VE2
+ A->>M: Send VE3 envelope
+ M->>B: Deliver VE3
B->>B: Render voice bubble (metadata only)
B->>A: Send binary fetch request on Play
- A->>B: Stream raw VoicePacket packets
+ A->>B: Stream raw VoicePacket packets (partial)
+ Note over A,B: Sender path stops responding
+ B->>N: Raw swarm requests with missing voice packet indices
+ P->>B: Raw swarm availability response
+ B->>P: Direct binary fetch request for missing subset
+ P->>B: Stream remaining raw VoicePacket packets
B->>B: Reassemble session
B->>B: Auto-play when complete
```
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 333b0a2..3236bcb 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -171,7 +171,7 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/vibration/ios"
SPEC CHECKSUMS:
- audioplayers_darwin: 4f9ca89d92d3d21cec7ec580e78ca888e5fb68bd
+ audioplayers_darwin: 835ced6edd4c9fc8ebb0a7cc9e294a91d99917d5
codec2_flutter: 15e24fa897d9d903a2afb1cc5a17ae3ac88b6d6f
device_info_plus: 21fcca2080fbcd348be798aa36c3e5ed849eefbe
DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
index b73764d..e0378fc 100644
--- a/ios/Runner.xcodeproj/project.pbxproj
+++ b/ios/Runner.xcodeproj/project.pbxproj
@@ -489,7 +489,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -511,7 +511,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
@@ -530,7 +530,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
@@ -547,7 +547,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
GENERATE_INFOPLIST_FILE = YES;
MARKETING_VERSION = 1.0;
@@ -679,7 +679,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
@@ -702,7 +702,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
- CURRENT_PROJECT_VERSION = 94;
+ CURRENT_PROJECT_VERSION = 98;
DEVELOPMENT_TEAM = JND55328G8;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Runner/Info.plist;
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index f0915a9..e28e34f 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -43,7 +43,7 @@
CFBundleSignature
????
CFBundleVersion
- 94
+ 98
LSRequiresIPhoneOS
NSBluetoothAlwaysUsageDescription
diff --git a/ios/fastlane/report.xml b/ios/fastlane/report.xml
index 330f28d..fdb44e7 100644
--- a/ios/fastlane/report.xml
+++ b/ios/fastlane/report.xml
@@ -5,22 +5,22 @@
-
+
-
+
-
+
-
+
diff --git a/lib/main.dart b/lib/main.dart
index bab8edb..15d6e99 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -14,6 +14,7 @@ import 'providers/channels_provider.dart';
import 'providers/voice_provider.dart';
import 'providers/image_provider.dart' as ip;
import 'providers/app_provider.dart';
+import 'providers/sensors_provider.dart';
import 'services/voice_codec_service.dart';
import 'services/voice_player_service.dart';
import 'services/tile_cache_service.dart';
@@ -234,6 +235,7 @@ class _MeshCoreSarAppState extends State {
},
),
ChangeNotifierProvider(create: (_) => ChannelsProvider()),
+ ChangeNotifierProvider(create: (_) => SensorsProvider()),
// Voice provider (packet reassembly + playback)
ChangeNotifierProvider(
diff --git a/lib/models/contact.dart b/lib/models/contact.dart
index 50dd7f1..ce80b6d 100644
--- a/lib/models/contact.dart
+++ b/lib/models/contact.dart
@@ -1,10 +1,172 @@
export 'package:meshcore_client/meshcore_client.dart'
show Contact, ContactType, ContactTelemetry, AdvertLocation;
+import 'dart:math' as math;
+import 'dart:typed_data';
import 'package:flutter/material.dart';
import '../l10n/app_localizations.dart';
import 'package:meshcore_client/meshcore_client.dart';
+class ParsedContactRoute {
+ final String canonicalText;
+ final int hashSize;
+ final int hopCount;
+ final int encodedPathLen;
+ final int signedEncodedPathLen;
+ final Uint8List pathBytes;
+ final Uint8List paddedPathBytes;
+
+ const ParsedContactRoute({
+ required this.canonicalText,
+ required this.hashSize,
+ required this.hopCount,
+ required this.encodedPathLen,
+ required this.signedEncodedPathLen,
+ required this.pathBytes,
+ required this.paddedPathBytes,
+ });
+
+ int get byteLength => pathBytes.length;
+ String get summary => hopCount == 0
+ ? 'Direct'
+ : '$hopCount hop${hopCount == 1 ? '' : 's'} via $hashSize-byte hashes';
+}
+
+class ContactRouteFormatException implements Exception {
+ final String message;
+
+ const ContactRouteFormatException(this.message);
+
+ @override
+ String toString() => message;
+}
+
+class ContactRouteCodec {
+ static const int maxHashSize = 3;
+ static const int maxPathBytes = 64;
+ static const int _unknownDescriptor = 0xFF;
+
+ static ParsedContactRoute parse(String input) {
+ final normalized = input.trim().toUpperCase();
+ if (normalized.isEmpty) {
+ throw const ContactRouteFormatException('Route cannot be empty.');
+ }
+
+ final hopTokens = normalized
+ .split(',')
+ .map((token) => token.trim())
+ .toList();
+ if (hopTokens.any((token) => token.isEmpty)) {
+ throw const ContactRouteFormatException('Route contains an empty hop.');
+ }
+
+ final hopBytes = >[];
+ int? hashSize;
+ for (final token in hopTokens) {
+ final compact = token.replaceAll(':', '');
+ if (compact.isEmpty || !RegExp(r'^[0-9A-F]+$').hasMatch(compact)) {
+ throw ContactRouteFormatException('Invalid hop "$token".');
+ }
+ if (compact.length.isOdd) {
+ throw ContactRouteFormatException(
+ 'Hop "$token" must contain full bytes.',
+ );
+ }
+
+ final currentHashSize = compact.length ~/ 2;
+ if (currentHashSize < 1 || currentHashSize > maxHashSize) {
+ throw ContactRouteFormatException(
+ 'Hop "$token" must be 1, 2, or 3 bytes.',
+ );
+ }
+
+ hashSize ??= currentHashSize;
+ if (hashSize != currentHashSize) {
+ throw const ContactRouteFormatException(
+ 'All hops in a route must use the same hash size.',
+ );
+ }
+
+ final bytes = [];
+ for (var i = 0; i < compact.length; i += 2) {
+ bytes.add(int.parse(compact.substring(i, i + 2), radix: 16));
+ }
+ hopBytes.add(bytes);
+ }
+
+ final resolvedHashSize = hashSize ?? 1;
+ final flatBytes = Uint8List.fromList(
+ hopBytes.expand((hop) => hop).toList(),
+ );
+ if (flatBytes.length > maxPathBytes) {
+ throw const ContactRouteFormatException(
+ 'Route exceeds the 64-byte firmware limit.',
+ );
+ }
+
+ final encodedPathLen =
+ ((resolvedHashSize - 1) << 6) | (hopBytes.length & 0x3F);
+ final padded = Uint8List(maxPathBytes);
+ padded.setRange(0, flatBytes.length, flatBytes);
+
+ return ParsedContactRoute(
+ canonicalText: hopBytes
+ .map(
+ (hop) => hop
+ .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toUpperCase(),
+ )
+ .join(','),
+ hashSize: resolvedHashSize,
+ hopCount: hopBytes.length,
+ encodedPathLen: encodedPathLen,
+ signedEncodedPathLen: toSignedDescriptor(encodedPathLen),
+ pathBytes: flatBytes,
+ paddedPathBytes: padded,
+ );
+ }
+
+ static ParsedContactRoute? fromContact(Contact contact) {
+ if (!contact.routeHasPath || contact.routeHopCount == 0) {
+ return null;
+ }
+
+ return ParsedContactRoute(
+ canonicalText: contact.routeCanonicalText,
+ hashSize: contact.routeHashSize,
+ hopCount: contact.routeHopCount,
+ encodedPathLen: contact.routeEncodedPathLen,
+ signedEncodedPathLen: contact.routeSignedPathLen,
+ pathBytes: contact.routePathBytes,
+ paddedPathBytes: _padPath(contact.routePathBytes),
+ );
+ }
+
+ static Uint8List _padPath(Uint8List bytes) {
+ final padded = Uint8List(maxPathBytes);
+ padded.setRange(0, math.min(bytes.length, maxPathBytes), bytes);
+ return padded;
+ }
+
+ static int toSignedDescriptor(int encodedPathLen) =>
+ encodedPathLen > 127 ? encodedPathLen - 256 : encodedPathLen;
+
+ static int toUnsignedDescriptor(int signedPathLen) => signedPathLen & 0xFF;
+
+ static bool isUnknownDescriptor(int signedPathLen) =>
+ toUnsignedDescriptor(signedPathLen) == _unknownDescriptor;
+
+ static bool isValidDescriptor(int signedPathLen) {
+ final raw = toUnsignedDescriptor(signedPathLen);
+ if (raw == _unknownDescriptor) return false;
+ final hashSize = ((raw >> 6) + 1);
+ if (hashSize > maxHashSize) return false;
+ final hopCount = raw & 0x3F;
+ return hopCount * hashSize <= maxPathBytes;
+ }
+}
+
extension ContactLocalization on Contact {
/// Returns the localized display name for special contacts (e.g. Public Channel).
/// For all other contacts, returns [displayName].
@@ -14,4 +176,56 @@ extension ContactLocalization on Contact {
}
return displayName;
}
+
+ int get routeEncodedPathLen =>
+ ContactRouteCodec.toUnsignedDescriptor(outPathLen);
+
+ int get routeSignedPathLen =>
+ ContactRouteCodec.toSignedDescriptor(routeEncodedPathLen);
+
+ bool get routeIsUnknown => ContactRouteCodec.isUnknownDescriptor(outPathLen);
+
+ bool get routeHasPath =>
+ !routeIsUnknown && ContactRouteCodec.isValidDescriptor(outPathLen);
+
+ int get routeHashSize => routeHasPath ? ((routeEncodedPathLen >> 6) + 1) : 1;
+
+ int get routeHopCount => routeHasPath ? (routeEncodedPathLen & 0x3F) : -1;
+
+ int get routeByteLength => routeHasPath
+ ? math.min(routeHopCount * routeHashSize, outPath.length)
+ : 0;
+
+ Uint8List get routePathBytes => routeByteLength <= 0
+ ? Uint8List(0)
+ : Uint8List.fromList(outPath.sublist(0, routeByteLength));
+
+ String get routeCanonicalText {
+ if (!routeHasPath || routeHopCount <= 0) return '';
+ final bytes = routePathBytes;
+ final hops = [];
+ for (var i = 0; i < bytes.length; i += routeHashSize) {
+ hops.add(
+ bytes
+ .sublist(i, i + routeHashSize)
+ .map((byte) => byte.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toUpperCase(),
+ );
+ }
+ return hops.join(',');
+ }
+
+ String get routeSummary {
+ if (routeIsUnknown || !routeHasPath) {
+ return 'Flood/Unknown';
+ }
+ if (routeHopCount == 0) {
+ return 'Direct';
+ }
+ return '$routeHopCount hop${routeHopCount == 1 ? '' : 's'} via $routeHashSize-byte hashes';
+ }
+
+ bool get routeSupportsLegacyRawTransport =>
+ routeHasPath && routeSignedPathLen >= 0;
}
diff --git a/lib/models/message_reception_details.dart b/lib/models/message_reception_details.dart
new file mode 100644
index 0000000..40cc70d
--- /dev/null
+++ b/lib/models/message_reception_details.dart
@@ -0,0 +1,86 @@
+const int _transmitEstimateToleranceMs = 1500;
+
+int? sanitizeEstimatedTransmitMs({
+ required int? estimatedTransmitMs,
+ required int? senderToReceiptMs,
+}) {
+ if (estimatedTransmitMs == null || estimatedTransmitMs <= 0) {
+ return null;
+ }
+
+ if (senderToReceiptMs == null || senderToReceiptMs <= 0) {
+ return estimatedTransmitMs;
+ }
+
+ // Sender timestamps are second-granularity, so allow a small cushion before
+ // treating the estimate as impossible for the observed delivery time.
+ if (estimatedTransmitMs > senderToReceiptMs + _transmitEstimateToleranceMs) {
+ return null;
+ }
+
+ return estimatedTransmitMs;
+}
+
+class MessageReceptionDetails {
+ final DateTime capturedAt;
+ final DateTime? packetLoggedAt;
+ final int? rssiDbm;
+ final double? snrDb;
+ final List? pathBytes;
+ final int? senderToReceiptMs;
+ final int? estimatedTransmitMs;
+ final int? postTransmitDelayMs;
+
+ const MessageReceptionDetails({
+ required this.capturedAt,
+ this.packetLoggedAt,
+ this.rssiDbm,
+ this.snrDb,
+ this.pathBytes,
+ this.senderToReceiptMs,
+ this.estimatedTransmitMs,
+ this.postTransmitDelayMs,
+ });
+
+ String? get pathBytesHex => pathBytes == null || pathBytes!.isEmpty
+ ? null
+ : pathBytes!.map((b) => b.toRadixString(16).padLeft(2, '0')).join(':');
+
+ Map toJson() {
+ return {
+ 'capturedAtMillis': capturedAt.millisecondsSinceEpoch,
+ 'packetLoggedAtMillis': packetLoggedAt?.millisecondsSinceEpoch,
+ 'rssiDbm': rssiDbm,
+ 'snrDb': snrDb,
+ 'pathBytes': pathBytes,
+ 'senderToReceiptMs': senderToReceiptMs,
+ 'estimatedTransmitMs': estimatedTransmitMs,
+ 'postTransmitDelayMs': postTransmitDelayMs,
+ };
+ }
+
+ static MessageReceptionDetails? fromJson(Map json) {
+ final capturedAtMillis = json['capturedAtMillis'];
+ if (capturedAtMillis is! int) {
+ return null;
+ }
+
+ final pathBytes = json['pathBytes'];
+ return MessageReceptionDetails(
+ capturedAt: DateTime.fromMillisecondsSinceEpoch(capturedAtMillis),
+ packetLoggedAt: json['packetLoggedAtMillis'] is int
+ ? DateTime.fromMillisecondsSinceEpoch(
+ json['packetLoggedAtMillis'] as int,
+ )
+ : null,
+ rssiDbm: json['rssiDbm'] as int?,
+ snrDb: (json['snrDb'] as num?)?.toDouble(),
+ pathBytes: pathBytes is List
+ ? pathBytes.whereType().map((b) => b.toInt()).toList()
+ : null,
+ senderToReceiptMs: json['senderToReceiptMs'] as int?,
+ estimatedTransmitMs: json['estimatedTransmitMs'] as int?,
+ postTransmitDelayMs: json['postTransmitDelayMs'] as int?,
+ );
+ }
+}
diff --git a/lib/models/message_transfer_details.dart b/lib/models/message_transfer_details.dart
new file mode 100644
index 0000000..26659af
--- /dev/null
+++ b/lib/models/message_transfer_details.dart
@@ -0,0 +1,142 @@
+class MessageTransferDownloader {
+ final String requesterKey6;
+ final String? requesterName;
+ final int transferCount;
+ final DateTime lastTransferredAt;
+
+ const MessageTransferDownloader({
+ required this.requesterKey6,
+ this.requesterName,
+ required this.transferCount,
+ required this.lastTransferredAt,
+ });
+
+ MessageTransferDownloader copyWith({
+ String? requesterKey6,
+ String? requesterName,
+ int? transferCount,
+ DateTime? lastTransferredAt,
+ }) {
+ return MessageTransferDownloader(
+ requesterKey6: requesterKey6 ?? this.requesterKey6,
+ requesterName: requesterName ?? this.requesterName,
+ transferCount: transferCount ?? this.transferCount,
+ lastTransferredAt: lastTransferredAt ?? this.lastTransferredAt,
+ );
+ }
+
+ Map toJson() {
+ return {
+ 'requesterKey6': requesterKey6,
+ 'requesterName': requesterName,
+ 'transferCount': transferCount,
+ 'lastTransferredAtMillis': lastTransferredAt.millisecondsSinceEpoch,
+ };
+ }
+
+ static MessageTransferDownloader? fromJson(Map json) {
+ final requesterKey6 = json['requesterKey6'];
+ final transferCount = json['transferCount'];
+ final lastTransferredAtMillis = json['lastTransferredAtMillis'];
+ if (requesterKey6 is! String ||
+ transferCount is! int ||
+ lastTransferredAtMillis is! int) {
+ return null;
+ }
+
+ return MessageTransferDownloader(
+ requesterKey6: requesterKey6,
+ requesterName: json['requesterName'] as String?,
+ transferCount: transferCount,
+ lastTransferredAt: DateTime.fromMillisecondsSinceEpoch(
+ lastTransferredAtMillis,
+ ),
+ );
+ }
+}
+
+class MessageTransferDetails {
+ final int totalTransfers;
+ final List downloaders;
+
+ const MessageTransferDetails({
+ required this.totalTransfers,
+ required this.downloaders,
+ });
+
+ const MessageTransferDetails.empty()
+ : totalTransfers = 0,
+ downloaders = const [];
+
+ MessageTransferDetails registerTransfer({
+ required String requesterKey6,
+ String? requesterName,
+ DateTime? transferredAt,
+ }) {
+ final eventAt = transferredAt ?? DateTime.now();
+ final normalizedName = requesterName?.trim();
+ final updatedDownloaders = List.from(
+ downloaders,
+ );
+ final index = updatedDownloaders.indexWhere(
+ (entry) => entry.requesterKey6 == requesterKey6,
+ );
+
+ if (index == -1) {
+ updatedDownloaders.add(
+ MessageTransferDownloader(
+ requesterKey6: requesterKey6,
+ requesterName: normalizedName?.isEmpty ?? true
+ ? null
+ : normalizedName,
+ transferCount: 1,
+ lastTransferredAt: eventAt,
+ ),
+ );
+ } else {
+ final existing = updatedDownloaders[index];
+ updatedDownloaders[index] = existing.copyWith(
+ requesterName: normalizedName?.isEmpty ?? true
+ ? existing.requesterName
+ : normalizedName,
+ transferCount: existing.transferCount + 1,
+ lastTransferredAt: eventAt,
+ );
+ }
+
+ updatedDownloaders.sort(
+ (a, b) => b.lastTransferredAt.compareTo(a.lastTransferredAt),
+ );
+
+ return MessageTransferDetails(
+ totalTransfers: totalTransfers + 1,
+ downloaders: updatedDownloaders,
+ );
+ }
+
+ Map toJson() {
+ return {
+ 'totalTransfers': totalTransfers,
+ 'downloaders': downloaders.map((entry) => entry.toJson()).toList(),
+ };
+ }
+
+ static MessageTransferDetails? fromJson(Map json) {
+ final totalTransfers = json['totalTransfers'];
+ if (totalTransfers is! int) {
+ return null;
+ }
+
+ final rawDownloaders = json['downloaders'] as List? ?? const [];
+ final downloaders = rawDownloaders
+ .whereType>()
+ .map(MessageTransferDownloader.fromJson)
+ .whereType()
+ .toList();
+
+ return MessageTransferDetails(
+ totalTransfers: totalTransfers,
+ downloaders: downloaders,
+ );
+ }
+}
diff --git a/lib/providers/app_provider.dart b/lib/providers/app_provider.dart
index 7c38b3e..00fe3bb 100644
--- a/lib/providers/app_provider.dart
+++ b/lib/providers/app_provider.dart
@@ -1,4 +1,5 @@
import 'dart:async';
+import 'dart:math' as math;
import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'connection_provider.dart';
@@ -16,9 +17,13 @@ import '../services/packet_capture_storage_service.dart';
import '../models/contact.dart';
import '../models/message.dart';
import '../models/ble_packet_log.dart';
+import '../models/message_reception_details.dart';
import '../utils/drawing_message_parser.dart';
+import '../utils/raw_route_probe.dart';
import '../utils/voice_message_parser.dart';
import '../utils/image_message_parser.dart';
+import '../utils/media_swarm_protocol.dart';
+import '../utils/message_airtime_estimator.dart';
/// Main App Provider - coordinates all other providers
class AppProvider with ChangeNotifier {
@@ -46,6 +51,8 @@ class AppProvider with ChangeNotifier {
bool get isMapEnabled => _isMapEnabled;
bool _isContactsEnabled = true;
bool get isContactsEnabled => _isContactsEnabled;
+ bool _isSensorsEnabled = true;
+ bool get isSensorsEnabled => _isSensorsEnabled;
bool _isVoiceSilenceTrimmingEnabled = true;
bool get isVoiceSilenceTrimmingEnabled => _isVoiceSilenceTrimmingEnabled;
@@ -59,15 +66,19 @@ class AppProvider with ChangeNotifier {
bool get autoAddDiscoveredContacts => _autoAddDiscoveredContacts;
static const Duration _packetRetryDelay = Duration(milliseconds: 1200);
+ static const Duration _mediaSwarmResponseWindow = Duration(seconds: 10);
static const int _maxPacketRetryAttempts = 4;
final Map _voiceSessionSenderKey6 = {};
final Map _imageSessionSenderKey6 = {};
final Map _voiceMissingRetryTimers = {};
final Map _voiceMissingRetryAttempts = {};
- final FragmentAckWaitRegistry _voiceFragmentAckWaiters =
- FragmentAckWaitRegistry();
- final FragmentAckWaitRegistry _imageFragmentAckWaiters =
- FragmentAckWaitRegistry();
+ final Map _imageMissingRetryTimers = {};
+ final Map _imageMissingRetryAttempts = {};
+ final FragmentAckWaitRegistry _rawProbeWaiters = FragmentAckWaitRegistry();
+ final Map> _pendingRawRouteProbes = {};
+ final Map> _pendingMediaSwarmFetches = {};
+ final Map>
+ _pendingMediaSwarmResponses = {};
Timer? _packetCaptureFlushTimer;
String? _lastPersistedPacketSignature;
bool _isPersistingPacketCapture = false;
@@ -88,6 +99,7 @@ class AppProvider with ChangeNotifier {
_loadSimpleMode();
_loadMapEnabled();
_loadContactsEnabled();
+ _loadSensorsEnabled();
_loadVoiceSilenceTrimmingEnabled();
_loadVoiceBandPassFilterEnabled();
_loadVoiceCompressorEnabled();
@@ -179,12 +191,12 @@ class AppProvider with ChangeNotifier {
void _restoreSessionMetadataFromMessages() {
final restored = restoreSessionMetadataFromMessages(
- messagesProvider.messages.map((message) => message.text),
+ messagesProvider.messages,
);
_voiceSessionSenderKey6.addAll(restored.voiceSenderKeyBySession);
+ _imageSessionSenderKey6.addAll(restored.imageSenderKeyBySession);
for (final entry in restored.imageEnvelopeBySession.entries) {
- _imageSessionSenderKey6[entry.key] = entry.value.senderKey6.toLowerCase();
imageProvider.registerEnvelope(entry.value);
}
@@ -198,6 +210,21 @@ class AppProvider with ChangeNotifier {
}
}
+ String? _resolveContactNameForNotification(Uint8List? publicKey) {
+ if (publicKey == null || publicKey.isEmpty) return null;
+
+ Contact? contact;
+ if (publicKey.length >= 32) {
+ contact = contactsProvider.findContactByKey(publicKey);
+ }
+ contact ??= publicKey.length >= 6
+ ? contactsProvider.findContactByPrefix(
+ Uint8List.fromList(publicKey.sublist(0, 6)),
+ )
+ : null;
+ return contact?.advName;
+ }
+
/// Load simple mode setting from shared preferences
Future _loadSimpleMode() async {
try {
@@ -267,6 +294,29 @@ class AppProvider with ChangeNotifier {
}
}
+ /// Load sensors enabled setting from shared preferences
+ Future _loadSensorsEnabled() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ _isSensorsEnabled = prefs.getBool('sensors_enabled') ?? true;
+ notifyListeners();
+ } catch (e) {
+ debugPrint('Error loading sensors enabled setting: $e');
+ }
+ }
+
+ /// Toggle sensors tab on/off
+ Future toggleSensorsEnabled(bool enabled) async {
+ try {
+ _isSensorsEnabled = enabled;
+ final prefs = await SharedPreferences.getInstance();
+ await prefs.setBool('sensors_enabled', enabled);
+ notifyListeners();
+ } catch (e) {
+ debugPrint('Error saving sensors enabled setting: $e');
+ }
+ }
+
/// Load voice silence trimming setting from shared preferences.
Future _loadVoiceSilenceTrimmingEnabled() async {
try {
@@ -433,6 +483,10 @@ class AppProvider with ChangeNotifier {
void _setupCallbacks() {
// Monitor connection state changes to start/stop location tracking
connectionProvider.addListener(_handleConnectionStateChange);
+ messagesProvider.resolveContactNameCallback =
+ _resolveContactNameForNotification;
+ messagesProvider.resolveChannelNameCallback =
+ channelsProvider.getChannelDisplayName;
voiceProvider.sendRawPacketCallback =
({
@@ -460,27 +514,6 @@ class AppProvider with ChangeNotifier {
payload: payload,
);
};
- voiceProvider.waitForFragmentAckCallback =
- ({
- required sessionId,
- required index,
- timeout = const Duration(seconds: 8),
- }) => _waitForVoiceFragmentAck(
- sessionId: sessionId,
- index: index,
- timeout: timeout,
- );
- imageProvider.waitForFragmentAckCallback =
- ({
- required sessionId,
- required index,
- timeout = const Duration(seconds: 8),
- }) => _waitForImageFragmentAck(
- sessionId: sessionId,
- index: index,
- timeout: timeout,
- );
-
// When a contact is received from BLE
connectionProvider.onContactReceived = (contact) {
// Pass device public key to filter out our own contact
@@ -631,6 +664,9 @@ class AppProvider with ChangeNotifier {
capturedAt: enrichedMessage.receivedAt,
)
: null;
+ final receptionDetailsSnapshot = _buildReceptionDetailsSnapshot(
+ enrichedMessage,
+ );
// Check if message is a drawing broadcast
if (DrawingMessageParser.isDrawingMessage(enrichedMessage.text)) {
@@ -662,6 +698,7 @@ class AppProvider with ChangeNotifier {
updatedMessage,
contactLookup: (name) => '',
contactLocationSnapshot: contactLocationSnapshot,
+ receptionDetailsSnapshot: receptionDetailsSnapshot,
);
// Broadcast drawing message to SSE clients if server is running
@@ -675,9 +712,15 @@ class AppProvider with ChangeNotifier {
// Voice envelope message (new public/direct on-demand format).
final voiceEnvelope = VoiceEnvelope.tryParseText(enrichedMessage.text);
if (voiceEnvelope != null) {
- _voiceSessionSenderKey6[voiceEnvelope.sessionId] = voiceEnvelope
- .senderKey6
- .toLowerCase();
+ final senderPrefix = enrichedMessage.senderPublicKeyPrefix;
+ if (senderPrefix != null && senderPrefix.length >= 6) {
+ _voiceSessionSenderKey6[voiceEnvelope.sessionId] = senderPrefix
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toLowerCase();
+ }
+ voiceProvider.registerEnvelope(voiceEnvelope);
enrichedMessage = enrichedMessage.copyWith(
isVoice: true,
voiceId: voiceEnvelope.sessionId,
@@ -698,6 +741,7 @@ class AppProvider with ChangeNotifier {
}
},
contactLocationSnapshot: contactLocationSnapshot,
+ receptionDetailsSnapshot: receptionDetailsSnapshot,
);
connectionProvider.broadcastMessageToSseClients(enrichedMessage);
return;
@@ -706,9 +750,14 @@ class AppProvider with ChangeNotifier {
// Image envelope (IE1): announce image availability.
final imageEnvelope = ImageEnvelope.tryParse(enrichedMessage.text);
if (imageEnvelope != null) {
- _imageSessionSenderKey6[imageEnvelope.sessionId] = imageEnvelope
- .senderKey6
- .toLowerCase();
+ final senderPrefix = enrichedMessage.senderPublicKeyPrefix;
+ if (senderPrefix != null && senderPrefix.length >= 6) {
+ _imageSessionSenderKey6[imageEnvelope.sessionId] = senderPrefix
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toLowerCase();
+ }
imageProvider.registerEnvelope(imageEnvelope);
messagesProvider.addMessage(
enrichedMessage,
@@ -726,24 +775,12 @@ class AppProvider with ChangeNotifier {
}
},
contactLocationSnapshot: contactLocationSnapshot,
+ receptionDetailsSnapshot: receptionDetailsSnapshot,
);
connectionProvider.broadcastMessageToSseClients(enrichedMessage);
return;
}
- // If it's a text-format voice packet, feed it to VoiceProvider
- if (VoicePacket.isVoiceText(enrichedMessage.text)) {
- final pkt = VoicePacket.tryParseText(enrichedMessage.text);
- if (pkt != null) {
- voiceProvider.addPacket(pkt);
- // Mark the message with voice metadata before adding to chat
- enrichedMessage = enrichedMessage.copyWith(
- isVoice: true,
- voiceId: pkt.sessionId,
- );
- }
- }
-
// Pass contact lookup function to link channel messages with contacts
messagesProvider.addMessage(
enrichedMessage,
@@ -763,12 +800,16 @@ class AppProvider with ChangeNotifier {
}
},
contactLocationSnapshot: contactLocationSnapshot,
+ receptionDetailsSnapshot: receptionDetailsSnapshot,
);
// Broadcast message to SSE clients if server is running
connectionProvider.broadcastMessageToSseClients(enrichedMessage);
};
+ // Keep a compact receive-time snapshot because packet logs roll over.
+ // This lets the UI still show timing/link details after app restarts.
+
// When telemetry is received via PUSH_CODE_TELEMETRY_RESPONSE (0x8B)
// Used by older firmware versions for telemetry responses
connectionProvider.onTelemetryReceived = (publicKey, lppData) {
@@ -791,14 +832,48 @@ class AppProvider with ChangeNotifier {
};
// When raw binary data is received (PUSH_CODE_RAW_DATA 0x84)
- // Magic 0x72 'r' = voice fetch request; 0x69 'i' = image fetch request.
- // Magic 0x56 'V' = voice packet; magic 0x49 'I' = image packet.
+ // Magic 0x6d 'm' = swarm control; 0x72 'r' = voice fetch request.
+ // Magic 0x69 'i' = image fetch request; 0x56 'V' = voice packet.
+ // Magic 0x49 'I' = image packet.
connectionProvider.onRawDataReceived = (payload, snrRaw, rssiDbm) {
+ final rawProbeRequest = RawRouteProbeRequest.tryParseBinary(payload);
+ if (rawProbeRequest != null) {
+ debugPrint(
+ '📡 [AppProvider] Incoming raw route probe: nonce=${rawProbeRequest.nonce.toRadixString(16)} requester=${rawProbeRequest.requesterKey6}',
+ );
+ _handleRawRouteProbeRequest(rawProbeRequest);
+ return;
+ }
+
+ final rawProbeAck = RawRouteProbeAck.tryParseBinary(payload);
+ if (rawProbeAck != null) {
+ debugPrint(
+ '📡 [AppProvider] Incoming raw route probe ACK: nonce=${rawProbeAck.nonce.toRadixString(16)}',
+ );
+ _completeRawRouteProbeAck(rawProbeAck.nonce);
+ return;
+ }
+
+ final mediaSwarmRequest = MediaSwarmRequest.tryParseBinary(payload);
+ if (mediaSwarmRequest != null) {
+ _handleIncomingMediaSwarmRequest(mediaSwarmRequest);
+ return;
+ }
+
+ final mediaSwarmAvailability = MediaSwarmAvailability.tryParseBinary(
+ payload,
+ );
+ if (mediaSwarmAvailability != null) {
+ _handleIncomingMediaSwarmAvailability(mediaSwarmAvailability);
+ return;
+ }
+
final voiceFetchRequest = VoiceFetchRequest.tryParseBinary(payload);
if (voiceFetchRequest != null) {
- final requester = contactsProvider.findContactByPrefixHex(
- voiceFetchRequest.requesterKey6,
+ debugPrint(
+ '🎙️ [AppProvider] Incoming voice fetch request: session=${voiceFetchRequest.sessionId} want=${voiceFetchRequest.want} requester=${voiceFetchRequest.requesterKey6}',
);
+ final requester = _resolveVoiceFetchRequester(voiceFetchRequest);
if (requester == null) {
debugPrint(
'⚠️ [AppProvider] Voice fetch requester contact not found (binary)',
@@ -810,26 +885,34 @@ class AppProvider with ChangeNotifier {
);
return;
}
- if (requester.outPathLen > _maxDirectPayloadHops) {
+ if (requester.routeHopCount > _maxDirectPayloadHops) {
debugPrint(
- '⚠️ [AppProvider] Voice fetch requester too far: ${requester.outPathLen} hops',
+ '⚠️ [AppProvider] Voice fetch requester too far: ${requester.routeHopCount} hops',
);
messagesProvider.logSystemMessage(
text:
- 'Cannot fetch voice for ${requester.advName}: message is too far (${requester.outPathLen} hops, max $_maxDirectPayloadHops).',
+ 'Cannot fetch voice for ${requester.advName}: message is too far (${requester.routeHopCount} hops, max $_maxDirectPayloadHops).',
level: 'warning',
);
return;
}
- unawaited(
- voiceProvider.serveSessionTo(
+ unawaited(() async {
+ final served = await voiceProvider.serveSessionTo(
sessionId: voiceFetchRequest.sessionId,
requester: requester,
requestedIndices: voiceFetchRequest.want == 'missing'
? voiceFetchRequest.missingIndices.toSet()
: null,
- ),
- );
+ );
+ if (served) {
+ messagesProvider.recordMediaTransfer(
+ sessionId: voiceFetchRequest.sessionId,
+ mediaType: 'voice',
+ requesterKey6: voiceFetchRequest.requesterKey6,
+ requesterName: requester.advName,
+ );
+ }
+ }());
return;
}
@@ -849,44 +932,40 @@ class AppProvider with ChangeNotifier {
);
return;
}
- if (requester.outPathLen > _maxDirectPayloadHops) {
+ if (requester.routeHopCount > _maxDirectPayloadHops) {
debugPrint(
'⚠️ [AppProvider] Image fetch requester too far: '
- '${requester.outPathLen} hops for session '
+ '${requester.routeHopCount} hops for session '
'${imageFetchRequest.sessionId}',
);
messagesProvider.logSystemMessage(
text:
- 'Cannot fetch image for ${requester.advName}: message is too far (${requester.outPathLen} hops, max $_maxDirectPayloadHops).',
+ 'Cannot fetch image for ${requester.advName}: message is too far (${requester.routeHopCount} hops, max $_maxDirectPayloadHops).',
level: 'warning',
);
return;
}
debugPrint(
'📷 [AppProvider] Serving image session ${imageFetchRequest.sessionId} '
- 'to ${requester.advName} via ${requester.outPathLen} hop(s)',
+ 'to ${requester.advName} via ${requester.routeHopCount} hop(s)',
);
- unawaited(
- imageProvider.serveSessionTo(
+ unawaited(() async {
+ final served = await imageProvider.serveSessionTo(
sessionId: imageFetchRequest.sessionId,
requester: requester,
requestedIndices: imageFetchRequest.want == 'missing'
? imageFetchRequest.missingIndices.toSet()
: null,
- ),
- );
- return;
- }
-
- final voiceAck = VoiceFragmentAck.tryParseBinary(payload);
- if (voiceAck != null) {
- _completeVoiceFragmentAck(voiceAck.sessionId, voiceAck.index);
- return;
- }
-
- final imageAck = ImageFragmentAck.tryParseBinary(payload);
- if (imageAck != null) {
- _completeImageFragmentAck(imageAck.sessionId, imageAck.index);
+ );
+ if (served) {
+ messagesProvider.recordMediaTransfer(
+ sessionId: imageFetchRequest.sessionId,
+ mediaType: 'image',
+ requesterKey6: imageFetchRequest.requesterKey6,
+ requesterName: requester.advName,
+ );
+ }
+ }());
return;
}
@@ -895,12 +974,30 @@ class AppProvider with ChangeNotifier {
if (frag == null) return;
debugPrint('📷 [AppProvider] Binary image fragment received: $frag');
final session = imageProvider.session(frag.sessionId);
+ if (session == null && frag.total < 1) {
+ debugPrint(
+ '⚠️ [AppProvider] Dropping compact image fragment without envelope '
+ 'for session ${frag.sessionId}',
+ );
+ return;
+ }
imageProvider.addFragment(
- frag,
+ session == null
+ ? frag
+ : ImagePacket(
+ sessionId: frag.sessionId,
+ format: session.format,
+ index: frag.index,
+ total: session.total,
+ data: frag.data,
+ ),
width: session?.width ?? 0,
height: session?.height ?? 0,
);
- _sendImageFragmentAck(frag);
+ _scheduleImageMissingRetry(
+ frag.sessionId,
+ justComplete: imageProvider.isComplete(frag.sessionId),
+ );
return;
}
@@ -908,8 +1005,25 @@ class AppProvider with ChangeNotifier {
final pkt = VoicePacket.tryParseBinary(payload);
if (pkt == null) return;
debugPrint('🎙️ [AppProvider] Binary voice packet received: $pkt');
- final justComplete = voiceProvider.addPacket(pkt);
- _sendVoiceFragmentAck(pkt);
+ final session = voiceProvider.session(pkt.sessionId);
+ if (session == null && pkt.total < 1) {
+ debugPrint(
+ '⚠️ [AppProvider] Dropping compact voice packet without envelope '
+ 'for session ${pkt.sessionId}',
+ );
+ return;
+ }
+ final justComplete = voiceProvider.addPacket(
+ session == null
+ ? pkt
+ : VoicePacket(
+ sessionId: pkt.sessionId,
+ mode: session.mode,
+ index: pkt.index,
+ total: session.total,
+ codec2Data: pkt.codec2Data,
+ ),
+ );
_scheduleVoiceMissingRetry(pkt.sessionId, justComplete: justComplete);
// Insert or update the placeholder message in the chat list
_handleIncomingVoicePacket(pkt, justComplete: justComplete);
@@ -1268,15 +1382,51 @@ class AppProvider with ChangeNotifier {
return contactsProvider.findContactByPrefixHex(prefixHex.toLowerCase());
}
+ Contact? _resolveVoiceFetchRequester(VoiceFetchRequest request) {
+ final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
+ if (liveContact != null) {
+ return liveContact;
+ }
+
+ return _resolveRequesterFromSentMessages(
+ sessionId: request.sessionId,
+ requesterKey6: request.requesterKey6,
+ tryParseEnvelope: VoiceEnvelope.tryParseText,
+ mediaLabel: 'voice',
+ );
+ }
+
Contact? _resolveImageFetchRequester(ImageFetchRequest request) {
final liveContact = _resolveContactByPrefixHex(request.requesterKey6);
if (liveContact != null) {
return liveContact;
}
+ return _resolveRequesterFromSentMessages(
+ sessionId: request.sessionId,
+ requesterKey6: request.requesterKey6,
+ tryParseEnvelope: ImageEnvelope.tryParse,
+ mediaLabel: 'image',
+ );
+ }
+
+ Contact? _resolveRequesterFromSentMessages({
+ required String sessionId,
+ required String requesterKey6,
+ required T? Function(String text) tryParseEnvelope,
+ required String mediaLabel,
+ }) {
for (final message in messagesProvider.messages.reversed) {
- final envelope = ImageEnvelope.tryParse(message.text);
- if (envelope == null || envelope.sessionId != request.sessionId) {
+ final envelope = tryParseEnvelope(message.text);
+ if (envelope == null) {
+ continue;
+ }
+ final envelopeSessionId = switch (envelope) {
+ VoiceEnvelope voiceEnvelope => voiceEnvelope.sessionId,
+ ImageEnvelope imageEnvelope => imageEnvelope.sessionId,
+ _ => null,
+ };
+ if (envelopeSessionId != sessionId) {
continue;
}
final recipientKey = message.recipientPublicKey;
@@ -1291,12 +1441,13 @@ class AppProvider with ChangeNotifier {
.sublist(0, 6)
.map((b) => b.toRadixString(16).padLeft(2, '0'))
.join();
- if (recipientKey6 != request.requesterKey6) {
+ if (recipientKey6 != requesterKey6) {
continue;
}
debugPrint(
- '📷 [AppProvider] Resolved image requester from sent message metadata '
- 'for session ${request.sessionId}: ${recipient.advName}',
+ '${mediaLabel == 'voice' ? '🎙️' : '📷'} [AppProvider] Resolved '
+ '$mediaLabel requester from sent message metadata for session '
+ '$sessionId: ${recipient.advName}',
);
return recipient;
}
@@ -1304,13 +1455,301 @@ class AppProvider with ChangeNotifier {
return null;
}
+ String _mediaSwarmKey(String mediaType, String sessionId) =>
+ '$mediaType:$sessionId';
+
+ String? _deviceKey6Hex() {
+ final deviceKey = connectionProvider.deviceInfo.publicKey;
+ if (deviceKey == null || deviceKey.length < 6) {
+ return null;
+ }
+ return deviceKey
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join('');
+ }
+
+ List _availableIndicesForSession(String mediaType, String sessionId) {
+ return switch (mediaType) {
+ 'voice' => voiceProvider.availablePacketIndices(sessionId),
+ 'image' => imageProvider.availableFragmentIndices(sessionId),
+ _ => const [],
+ };
+ }
+
+ List _matchingAvailableIndices(MediaSwarmRequest request) {
+ final available = _availableIndicesForSession(
+ request.mediaType,
+ request.sessionId,
+ );
+ if (available.isEmpty) return const [];
+ if (request.requestsAll) return available;
+ final requested = request.missingIndices.toSet();
+ return available.where(requested.contains).toList()..sort();
+ }
+
+ List _eligibleSwarmPeers({String? excludeKey6}) {
+ final ownKey6 = _deviceKey6Hex();
+ return contactsProvider.contacts.where((contact) {
+ if (!contact.routeHasPath ||
+ contact.routeHopCount > _maxDirectPayloadHops ||
+ !contact.routeSupportsLegacyRawTransport ||
+ contact.outPath.isEmpty ||
+ contact.publicKey.length < 6) {
+ return false;
+ }
+ final key6 = contact.publicKey
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join();
+ if (key6 == ownKey6 || key6 == excludeKey6) {
+ return false;
+ }
+ return true;
+ }).toList();
+ }
+
+ void _handleIncomingMediaSwarmRequest(MediaSwarmRequest request) {
+ final ownKey6 = _deviceKey6Hex();
+ if (ownKey6 == null || request.requesterKey6 == ownKey6) {
+ return;
+ }
+
+ final available = _matchingAvailableIndices(request);
+ if (available.isEmpty) {
+ return;
+ }
+
+ final availability = MediaSwarmAvailability(
+ mediaType: request.mediaType,
+ sessionId: request.sessionId,
+ requesterKey6: request.requesterKey6,
+ responderKey6: ownKey6,
+ availableIndices: available,
+ );
+
+ debugPrint(
+ '🌐 [AppProvider] Media swarm availability for ${request.mediaType} '
+ '${request.sessionId}: ${available.length} fragment(s)',
+ );
+ final requester = _resolveContactByPrefixHex(request.requesterKey6);
+ if (requester == null ||
+ !requester.routeHasPath ||
+ requester.routeHopCount > _maxDirectPayloadHops ||
+ !requester.routeSupportsLegacyRawTransport ||
+ requester.outPath.isEmpty) {
+ return;
+ }
+ unawaited(
+ connectionProvider.sendRawVoicePacket(
+ contactPath: requester.outPath,
+ contactPathLen: requester.routeSignedPathLen,
+ payload: availability.encodeBinary(),
+ ),
+ );
+ }
+
+ void _handleIncomingMediaSwarmAvailability(
+ MediaSwarmAvailability availability,
+ ) {
+ final ownKey6 = _deviceKey6Hex();
+ if (ownKey6 == null || availability.requesterKey6 != ownKey6) {
+ return;
+ }
+
+ final key = _mediaSwarmKey(availability.mediaType, availability.sessionId);
+ final responses = _pendingMediaSwarmResponses[key];
+ if (responses == null) {
+ return;
+ }
+ responses[availability.responderKey6] = availability;
+ debugPrint(
+ '🌐 [AppProvider] Media swarm response for ${availability.mediaType} '
+ '${availability.sessionId} from ${availability.responderKey6} '
+ '(${availability.servesAll ? 'all' : availability.availableIndices.length})',
+ );
+ }
+
+ Future _requestMissingMediaViaSwarm({
+ required String mediaType,
+ required String sessionId,
+ required List missingIndices,
+ required String? originalSenderKey6,
+ }) async {
+ if (!connectionProvider.deviceInfo.isConnected || missingIndices.isEmpty) {
+ return false;
+ }
+
+ final key = _mediaSwarmKey(mediaType, sessionId);
+ final pending = _pendingMediaSwarmFetches[key];
+ if (pending != null) {
+ return pending;
+ }
+
+ final requesterKey6 = _deviceKey6Hex();
+ if (requesterKey6 == null) {
+ return false;
+ }
+
+ final future = () async {
+ final responses = {};
+ _pendingMediaSwarmResponses[key] = responses;
+
+ try {
+ final request = MediaSwarmRequest(
+ mediaType: mediaType,
+ sessionId: sessionId,
+ requesterKey6: requesterKey6,
+ missingIndices: missingIndices,
+ );
+ final peers = _eligibleSwarmPeers(excludeKey6: originalSenderKey6);
+ if (peers.isEmpty) {
+ return false;
+ }
+ debugPrint(
+ '🌐 [AppProvider] Media swarm request for $mediaType $sessionId '
+ '(${missingIndices.length} needed fragment(s), ${peers.length} peer(s))',
+ );
+ for (final peer in peers) {
+ await connectionProvider.sendRawVoicePacket(
+ contactPath: peer.outPath,
+ contactPathLen: peer.routeSignedPathLen,
+ payload: request.encodeBinary(),
+ );
+ }
+
+ await Future.delayed(_mediaSwarmResponseWindow);
+ final orderedResponses =
+ responses.values
+ .where(
+ (response) => response.responderKey6 != originalSenderKey6,
+ )
+ .toList()
+ ..sort((a, b) {
+ final aScore = _swarmResponseScore(a, missingIndices);
+ final bScore = _swarmResponseScore(b, missingIndices);
+ return bScore.compareTo(aScore);
+ });
+
+ for (final response in orderedResponses) {
+ final responder = _resolveContactByPrefixHex(response.responderKey6);
+ if (responder == null ||
+ !responder.routeHasPath ||
+ responder.routeHopCount > _maxDirectPayloadHops ||
+ !responder.routeSupportsLegacyRawTransport ||
+ responder.outPath.isEmpty) {
+ continue;
+ }
+
+ final requestedSubset = response.servesAll
+ ? missingIndices
+ : missingIndices
+ .where(response.availableIndices.toSet().contains)
+ .toList();
+ if (requestedSubset.isEmpty) {
+ continue;
+ }
+
+ final requestedSet = requestedSubset.toSet();
+ final sent = await _sendDirectMediaFetchRequest(
+ mediaType: mediaType,
+ sessionId: sessionId,
+ target: responder,
+ requesterKey6: requesterKey6,
+ missingIndices: requestedSet,
+ );
+ if (sent) {
+ debugPrint(
+ '🌐 [AppProvider] Requested $mediaType $sessionId '
+ 'from swarm peer ${responder.advName} '
+ '(${requestedSubset.length} fragment(s))',
+ );
+ return true;
+ }
+ }
+
+ return false;
+ } catch (e) {
+ debugPrint(
+ '⚠️ [AppProvider] Media swarm request failed for $mediaType '
+ '$sessionId: $e',
+ );
+ return false;
+ } finally {
+ _pendingMediaSwarmResponses.remove(key);
+ }
+ }();
+
+ _pendingMediaSwarmFetches[key] = future;
+ try {
+ return await future;
+ } finally {
+ _pendingMediaSwarmFetches.remove(key);
+ }
+ }
+
+ int _swarmResponseScore(
+ MediaSwarmAvailability response,
+ List missingIndices,
+ ) {
+ if (response.servesAll) {
+ return missingIndices.length;
+ }
+ final needed = missingIndices.toSet();
+ return response.availableIndices.where(needed.contains).length;
+ }
+
+ Future _sendDirectMediaFetchRequest({
+ required String mediaType,
+ required String sessionId,
+ required Contact target,
+ required String requesterKey6,
+ required Set missingIndices,
+ }) async {
+ try {
+ final payload = switch (mediaType) {
+ 'voice' => VoiceFetchRequest(
+ sessionId: sessionId,
+ want: missingIndices.isEmpty ? 'all' : 'missing',
+ missingIndices: missingIndices.toList()..sort(),
+ requesterKey6: requesterKey6,
+ ).encodeBinary(),
+ 'image' => ImageFetchRequest(
+ sessionId: sessionId,
+ want: missingIndices.isEmpty ? 'all' : 'missing',
+ missingIndices: missingIndices.toList()..sort(),
+ requesterKey6: requesterKey6,
+ ).encodeBinary(),
+ _ => null,
+ };
+ if (payload == null) {
+ return false;
+ }
+
+ await connectionProvider.sendRawVoicePacket(
+ contactPath: target.outPath,
+ contactPathLen: target.routeSignedPathLen,
+ payload: payload,
+ );
+ return true;
+ } catch (e) {
+ debugPrint(
+ '⚠️ [AppProvider] Direct $mediaType fetch via ${target.advName} failed: $e',
+ );
+ return false;
+ }
+ }
+
void _scheduleVoiceMissingRetry(
String sessionId, {
required bool justComplete,
}) {
+ if (voiceProvider.isReceiveCanceled(sessionId)) {
+ _clearVoiceMissingRetry(sessionId);
+ return;
+ }
if (justComplete || voiceProvider.isComplete(sessionId)) {
- _voiceMissingRetryTimers.remove(sessionId)?.cancel();
- _voiceMissingRetryAttempts.remove(sessionId);
+ _clearVoiceMissingRetry(sessionId);
return;
}
@@ -1321,10 +1760,43 @@ class AppProvider with ChangeNotifier {
});
}
+ void _scheduleImageMissingRetry(
+ String sessionId, {
+ required bool justComplete,
+ }) {
+ if (imageProvider.isReceiveCanceled(sessionId)) {
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+ if (justComplete || imageProvider.isComplete(sessionId)) {
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+
+ _imageMissingRetryAttempts[sessionId] = 0;
+ _imageMissingRetryTimers[sessionId]?.cancel();
+ _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
+ unawaited(_requestMissingImageFragments(sessionId));
+ });
+ }
+
+ void _clearVoiceMissingRetry(String sessionId) {
+ _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+ _voiceMissingRetryAttempts.remove(sessionId);
+ }
+
+ void _clearImageMissingRetry(String sessionId) {
+ _imageMissingRetryTimers.remove(sessionId)?.cancel();
+ _imageMissingRetryAttempts.remove(sessionId);
+ }
+
Future _requestMissingVoicePackets(String sessionId) async {
+ if (voiceProvider.isReceiveCanceled(sessionId)) {
+ _clearVoiceMissingRetry(sessionId);
+ return;
+ }
if (voiceProvider.isComplete(sessionId)) {
- _voiceMissingRetryTimers.remove(sessionId)?.cancel();
- _voiceMissingRetryAttempts.remove(sessionId);
+ _clearVoiceMissingRetry(sessionId);
return;
}
@@ -1333,44 +1805,44 @@ class AppProvider with ChangeNotifier {
debugPrint(
'⚠️ [AppProvider] Voice re-request limit reached for $sessionId',
);
- _voiceMissingRetryTimers.remove(sessionId)?.cancel();
+ _clearVoiceMissingRetry(sessionId);
return;
}
final senderKey6 = _voiceSessionSenderKey6[sessionId];
if (senderKey6 == null) return;
final sender = _resolveContactByPrefixHex(senderKey6);
- final deviceKey = connectionProvider.deviceInfo.publicKey;
- if (sender == null || deviceKey == null || deviceKey.length < 6) return;
+ final requesterKey6 = _deviceKey6Hex();
+ if (requesterKey6 == null) return;
final missing = voiceProvider.missingPacketIndices(sessionId);
if (missing.isEmpty) {
- _voiceMissingRetryTimers.remove(sessionId)?.cancel();
- _voiceMissingRetryAttempts.remove(sessionId);
+ _clearVoiceMissingRetry(sessionId);
return;
}
- final requesterKey6 = deviceKey
- .sublist(0, 6)
- .map((b) => b.toRadixString(16).padLeft(2, '0'))
- .join('');
-
- final request = VoiceFetchRequest(
- sessionId: sessionId,
- want: 'missing',
- missingIndices: missing,
- requesterKey6: requesterKey6,
- timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
- version: 2,
- );
-
- try {
- await connectionProvider.sendRawVoicePacket(
- contactPath: sender.outPath,
- contactPathLen: sender.outPathLen,
- payload: request.encodeBinary(),
+ var sent = false;
+ if (sender != null) {
+ final routeOk = await verifyRawTransportRoute(sender);
+ if (routeOk) {
+ sent = await _sendDirectMediaFetchRequest(
+ mediaType: 'voice',
+ sessionId: sessionId,
+ target: sender,
+ requesterKey6: requesterKey6,
+ missingIndices: missing.toSet(),
+ );
+ }
+ }
+ if (!sent) {
+ sent = await _requestMissingMediaViaSwarm(
+ mediaType: 'voice',
+ sessionId: sessionId,
+ missingIndices: missing,
+ originalSenderKey6: senderKey6,
);
- } catch (_) {
+ }
+ if (!sent) {
return;
}
@@ -1381,6 +1853,69 @@ class AppProvider with ChangeNotifier {
});
}
+ Future _requestMissingImageFragments(String sessionId) async {
+ if (imageProvider.isReceiveCanceled(sessionId)) {
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+ if (imageProvider.isComplete(sessionId)) {
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+
+ final attempt = _imageMissingRetryAttempts[sessionId] ?? 0;
+ if (attempt >= _maxPacketRetryAttempts) {
+ debugPrint(
+ '⚠️ [AppProvider] Image re-request limit reached for $sessionId',
+ );
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+
+ final senderKey6 = _imageSessionSenderKey6[sessionId];
+ if (senderKey6 == null) return;
+ final sender = _resolveContactByPrefixHex(senderKey6);
+ final requesterKey6 = _deviceKey6Hex();
+ if (requesterKey6 == null) return;
+
+ final missing = imageProvider.missingFragmentIndices(sessionId);
+ if (missing.isEmpty) {
+ _clearImageMissingRetry(sessionId);
+ return;
+ }
+
+ var sent = false;
+ if (sender != null) {
+ final routeOk = await verifyRawTransportRoute(sender);
+ if (routeOk) {
+ sent = await _sendDirectMediaFetchRequest(
+ mediaType: 'image',
+ sessionId: sessionId,
+ target: sender,
+ requesterKey6: requesterKey6,
+ missingIndices: missing.toSet(),
+ );
+ }
+ }
+ if (!sent) {
+ sent = await _requestMissingMediaViaSwarm(
+ mediaType: 'image',
+ sessionId: sessionId,
+ missingIndices: missing,
+ originalSenderKey6: senderKey6,
+ );
+ }
+ if (!sent) {
+ return;
+ }
+
+ _imageMissingRetryAttempts[sessionId] = attempt + 1;
+ _imageMissingRetryTimers[sessionId]?.cancel();
+ _imageMissingRetryTimers[sessionId] = Timer(_packetRetryDelay, () {
+ unawaited(_requestMissingImageFragments(sessionId));
+ });
+ }
+
/// Insert or update a voice placeholder message for binary raw-data packets.
///
/// Binary voice packets arrive without a chat message, so we synthesise one
@@ -1421,94 +1956,212 @@ class AppProvider with ChangeNotifier {
messagesProvider.addMessage(placeholder, contactLookup: (_) => '');
}
- String _fragmentAckKey(String sessionId, int index) => '$sessionId:$index';
+ String _rawProbeKey(int nonce) =>
+ nonce.toRadixString(16).padLeft(8, '0').toLowerCase();
- Future _waitForVoiceFragmentAck({
- required String sessionId,
- required int index,
+ Future verifyRawTransportRoute(
+ Contact target, {
Duration timeout = const Duration(seconds: 8),
- }) => _voiceFragmentAckWaiters.waitFor(
- _fragmentAckKey(sessionId, index),
- timeout: timeout,
- );
+ }) async {
+ if (!connectionProvider.deviceInfo.isConnected) {
+ return false;
+ }
+ if (!target.routeHasPath || target.routeHopCount > _maxDirectPayloadHops) {
+ return false;
+ }
+ if (!target.routeSupportsLegacyRawTransport) {
+ return false;
+ }
+ if (target.outPath.isEmpty) {
+ return false;
+ }
- void _completeVoiceFragmentAck(String sessionId, int index) {
- final completed = _voiceFragmentAckWaiters.complete(
- _fragmentAckKey(sessionId, index),
- );
- if (completed == 0) {
+ final probeKey = _routeProbeTargetKey(target);
+ final pendingProbe = _pendingRawRouteProbes[probeKey];
+ if (pendingProbe != null) {
+ return pendingProbe;
+ }
+
+ final deviceKey = connectionProvider.deviceInfo.publicKey;
+ if (deviceKey == null || deviceKey.length < 6) {
+ return false;
+ }
+
+ final requesterKey6 = deviceKey
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join();
+ final future = () async {
+ final nonce = math.Random.secure().nextInt(0x100000000);
+ final ackFuture = _rawProbeWaiters.waitFor(
+ _rawProbeKey(nonce),
+ timeout: timeout,
+ );
+
+ try {
+ debugPrint(
+ '📡 [AppProvider] Outgoing raw route probe: target=${target.advName} hops=${target.routeHopCount} nonce=${nonce.toRadixString(16)}',
+ );
+ await connectionProvider.sendRawVoicePacket(
+ contactPath: target.outPath,
+ contactPathLen: target.routeSignedPathLen,
+ payload: RawRouteProbeRequest(
+ nonce: nonce,
+ requesterKey6: requesterKey6,
+ ).encodeBinary(),
+ );
+ return await ackFuture;
+ } catch (e) {
+ debugPrint(
+ '⚠️ [AppProvider] Raw route probe failed for ${target.advName}: $e',
+ );
+ _rawProbeWaiters.complete(_rawProbeKey(nonce));
+ return false;
+ }
+ }();
+
+ _pendingRawRouteProbes[probeKey] = future;
+ try {
+ return await future;
+ } finally {
+ _pendingRawRouteProbes.remove(probeKey);
+ }
+ }
+
+ String _routeProbeTargetKey(Contact target) {
+ if (target.publicKeyHex.isNotEmpty) {
+ return 'pk:${target.publicKeyHex}';
+ }
+ return 'name:${target.advName}:${target.routeSignedPathLen}:${target.outPath.map((b) => b.toRadixString(16).padLeft(2, '0')).join()}';
+ }
+
+ void _handleRawRouteProbeRequest(RawRouteProbeRequest request) {
+ final requester = _resolveContactByPrefixHex(request.requesterKey6);
+ if (requester == null) {
debugPrint(
- 'ℹ️ [AppProvider] Voice fragment ACK had no waiter: $sessionId#$index',
+ '⚠️ [AppProvider] Raw route probe requester not found: ${request.requesterKey6}',
);
return;
}
- debugPrint(
- '✅ [AppProvider] Voice fragment ACK received for $sessionId#$index ($completed waiter(s))',
- );
- }
-
- Future _waitForImageFragmentAck({
- required String sessionId,
- required int index,
- Duration timeout = const Duration(seconds: 8),
- }) => _imageFragmentAckWaiters.waitFor(
- _fragmentAckKey(sessionId, index),
- timeout: timeout,
- );
-
- void _completeImageFragmentAck(String sessionId, int index) {
- final completed = _imageFragmentAckWaiters.complete(
- _fragmentAckKey(sessionId, index),
- );
- if (completed == 0) {
+ if (!requester.routeHasPath ||
+ requester.routeHopCount > _maxDirectPayloadHops) {
debugPrint(
- 'ℹ️ [AppProvider] Image fragment ACK had no waiter: $sessionId#$index',
+ '⚠️ [AppProvider] Raw route probe requester out of range: ${requester.routeHopCount}',
);
return;
}
- debugPrint(
- '✅ [AppProvider] Image fragment ACK received for $sessionId#$index ($completed waiter(s))',
- );
- }
-
- void _sendVoiceFragmentAck(VoicePacket packet) {
- final senderKey6 = _voiceSessionSenderKey6[packet.sessionId];
- if (senderKey6 == null) return;
- final sender = _resolveContactByPrefixHex(senderKey6);
- if (sender == null) return;
- if (sender.outPathLen < 0 || sender.outPathLen > _maxDirectPayloadHops) {
+ if (!requester.routeSupportsLegacyRawTransport) {
return;
}
+ if (requester.outPath.isEmpty) {
+ return;
+ }
+ debugPrint(
+ '📡 [AppProvider] Outgoing raw route probe ACK: requester=${requester.advName} hops=${requester.routeHopCount} nonce=${request.nonce.toRadixString(16)}',
+ );
unawaited(
connectionProvider.sendRawVoicePacket(
- contactPath: sender.outPath,
- contactPathLen: sender.outPathLen,
- payload: VoiceFragmentAck(
- sessionId: packet.sessionId,
- index: packet.index,
- ).encodeBinary(),
+ contactPath: requester.outPath,
+ contactPathLen: requester.routeSignedPathLen,
+ payload: RawRouteProbeAck(nonce: request.nonce).encodeBinary(),
),
);
}
- void _sendImageFragmentAck(ImagePacket fragment) {
- final senderKey6 = _imageSessionSenderKey6[fragment.sessionId];
- if (senderKey6 == null) return;
- final sender = _resolveContactByPrefixHex(senderKey6);
- if (sender == null) return;
- if (sender.outPathLen < 0 || sender.outPathLen > _maxDirectPayloadHops) {
- return;
- }
- unawaited(
- connectionProvider.sendRawVoicePacket(
- contactPath: sender.outPath,
- contactPathLen: sender.outPathLen,
- payload: ImageFragmentAck(
- sessionId: fragment.sessionId,
- index: fragment.index,
- ).encodeBinary(),
- ),
+ void _completeRawRouteProbeAck(int nonce) {
+ _rawProbeWaiters.complete(_rawProbeKey(nonce));
+ }
+
+ MessageReceptionDetails? _buildReceptionDetailsSnapshot(Message message) {
+ final matchedRxLog = _findBestMatchingRxLog(message);
+ final estimatedTx = estimateMessageTransmitDuration(
+ message,
+ radioBw: connectionProvider.deviceInfo.radioBw,
+ radioSf: connectionProvider.deviceInfo.radioSf,
+ radioCr: connectionProvider.deviceInfo.radioCr,
);
+ final senderToReceiptMs = _senderToReceiptMs(message);
+ final estimatedTransmitMs = sanitizeEstimatedTransmitMs(
+ estimatedTransmitMs: estimatedTx > Duration.zero
+ ? estimatedTx.inMilliseconds
+ : null,
+ senderToReceiptMs: senderToReceiptMs,
+ );
+ final postTransmitDelayMs =
+ senderToReceiptMs != null && estimatedTransmitMs != null
+ ? (senderToReceiptMs - estimatedTransmitMs).clamp(0, 86400000).toInt()
+ : null;
+
+ if (matchedRxLog == null &&
+ senderToReceiptMs == null &&
+ estimatedTransmitMs == null) {
+ return null;
+ }
+
+ return MessageReceptionDetails(
+ capturedAt: DateTime.now(),
+ packetLoggedAt: matchedRxLog?.timestamp,
+ rssiDbm: matchedRxLog?.logRxDataInfo?.rssiDbm,
+ snrDb: matchedRxLog?.logRxDataInfo?.snrDb,
+ pathBytes: _extractPathBytesFromLog(matchedRxLog),
+ senderToReceiptMs: senderToReceiptMs,
+ estimatedTransmitMs: estimatedTransmitMs,
+ postTransmitDelayMs: postTransmitDelayMs,
+ );
+ }
+
+ int? _senderToReceiptMs(Message message) {
+ if (message.senderTimestamp <= 0) return null;
+ final senderAt = DateTime.fromMillisecondsSinceEpoch(
+ message.senderTimestamp * 1000,
+ isUtc: true,
+ );
+ final deltaMs = message.receivedAt
+ .toUtc()
+ .difference(senderAt)
+ .inMilliseconds;
+ if (deltaMs < 0 || deltaMs > 86400000) return null;
+ return deltaMs;
+ }
+
+ BlePacketLog? _findBestMatchingRxLog(Message message) {
+ if (message.pathLen < 0 || message.pathLen >= 255) return null;
+ final expectedPayloadType = message.messageType == MessageType.channel
+ ? 0x05
+ : 0x02;
+ BlePacketLog? bestLog;
+ var bestDeltaMs = 999999999;
+
+ for (final log in connectionProvider.bleService.packetLogs) {
+ if (log.responseCode != 0x88) continue;
+ if (log.rawData.length < 6) continue;
+
+ final raw = log.rawData;
+ final payloadType = (raw[3] >> 2) & 0x0F;
+ final pathLen = raw[4];
+ if (payloadType != expectedPayloadType) continue;
+ if (pathLen != message.pathLen) continue;
+ if (raw.length < 5 + pathLen) continue;
+
+ final deltaMs =
+ (log.timestamp.difference(message.receivedAt).inMilliseconds).abs();
+ if (deltaMs < bestDeltaMs) {
+ bestDeltaMs = deltaMs;
+ bestLog = log;
+ }
+ }
+
+ if (bestDeltaMs > 30000) return null;
+ return bestLog;
+ }
+
+ List? _extractPathBytesFromLog(BlePacketLog? log) {
+ if (log == null) return null;
+ final raw = log.rawData;
+ if (raw.length < 6) return null;
+ final pathLen = raw[4];
+ if (pathLen <= 0 || raw.length < 5 + pathLen) return null;
+ return raw.sublist(5, 5 + pathLen);
}
// Removed _syncMessages() - messages are automatically synced via PUSH_CODE_MSG_WAITING events
@@ -1604,9 +2257,15 @@ class AppProvider with ChangeNotifier {
for (final timer in _voiceMissingRetryTimers.values) {
timer.cancel();
}
+ for (final timer in _imageMissingRetryTimers.values) {
+ timer.cancel();
+ }
_voiceMissingRetryTimers.clear();
_voiceMissingRetryAttempts.clear();
+ _imageMissingRetryTimers.clear();
+ _imageMissingRetryAttempts.clear();
_voiceSessionSenderKey6.clear();
+ _imageSessionSenderKey6.clear();
notifyListeners();
}
@@ -1640,6 +2299,9 @@ class AppProvider with ChangeNotifier {
for (final timer in _voiceMissingRetryTimers.values) {
timer.cancel();
}
+ for (final timer in _imageMissingRetryTimers.values) {
+ timer.cancel();
+ }
super.dispose();
}
}
diff --git a/lib/providers/connection_provider.dart b/lib/providers/connection_provider.dart
index b132d37..fa50f3c 100644
--- a/lib/providers/connection_provider.dart
+++ b/lib/providers/connection_provider.dart
@@ -4,10 +4,11 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/scheduler.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
import 'package:crypto/crypto.dart';
+import '../models/contact.dart';
import '../models/device_info.dart';
import '../models/room_login_state.dart';
import '../models/sse_server_config.dart';
-import 'package:meshcore_client/meshcore_client.dart';
+import 'package:meshcore_client/meshcore_client.dart' hide Contact;
import '../services/sse_server_service.dart';
import '../utils/sar_message_parser.dart';
import 'helpers/room_login_manager.dart';
@@ -146,11 +147,15 @@ class ConnectionProvider with ChangeNotifier {
final MessageDeliveryTracker _messageDeliveryTracker =
MessageDeliveryTracker();
final PingTracker _pingTracker = PingTracker();
+ final Map> _pendingSmartPings = {};
// Expose room login states
Map get roomLoginStates =>
_roomLoginManager.roomLoginStates;
+ bool isPingInProgress(Uint8List publicKey) =>
+ _pendingSmartPings.containsKey(_publicKeyToHex(publicKey));
+
// Callbacks for other providers
Function(Contact)? onContactReceived;
Function(List)? onContactsComplete;
@@ -1117,9 +1122,11 @@ class ConnectionProvider with ChangeNotifier {
);
}
debugPrint(' Type: ${contact.type.displayName}');
- debugPrint(' Path status: ${contact.pathDescription}');
- if (contact.hasPath) {
- debugPrint(' ✅ Using learned path (${contact.outPathLen} bytes)');
+ debugPrint(' Path status: ${contact.routeSummary}');
+ if (contact.routeHasPath) {
+ debugPrint(
+ ' ✅ Using learned path (${contact.routeHopCount} hop(s), ${contact.routeHashSize}-byte hashes)',
+ );
} else {
debugPrint(' ⚠️ No path available - will use flood mode');
}
@@ -1169,6 +1176,19 @@ class ConnectionProvider with ChangeNotifier {
attempt: retryAttempt,
);
+ if (messageId != null) {
+ Future.delayed(const Duration(milliseconds: 350), () {
+ if (_messageDeliveryTracker.hasAckForMessage(messageId)) {
+ return;
+ }
+
+ debugPrint(
+ 'ℹ️ [ConnectionProvider] Missing RESP_CODE_SENT for $messageId; promoting to sent via fallback',
+ );
+ onMessageSent?.call(messageId, 0, 0);
+ });
+ }
+
// Clear pending operation after successful send (no error)
// If ERR_CODE_NOT_FOUND occurs, the operation will be recovered automatically
if (contact != null) {
@@ -1316,6 +1336,34 @@ class ConnectionProvider with ChangeNotifier {
required Uint8List contactPublicKey,
required bool hasPath,
Function()? onRetryWithFlooding,
+ }) async {
+ final pingKey = _publicKeyToHex(contactPublicKey);
+ final pendingPing = _pendingSmartPings[pingKey];
+ if (pendingPing != null) {
+ debugPrint('ℹ️ [Provider] Joining in-flight ping for $pingKey');
+ return pendingPing;
+ }
+
+ final future = _runSmartPing(
+ contactPublicKey: contactPublicKey,
+ hasPath: hasPath,
+ onRetryWithFlooding: onRetryWithFlooding,
+ );
+ _pendingSmartPings[pingKey] = future;
+ notifyListeners();
+
+ try {
+ return await future;
+ } finally {
+ _pendingSmartPings.remove(pingKey);
+ notifyListeners();
+ }
+ }
+
+ Future _runSmartPing({
+ required Uint8List contactPublicKey,
+ required bool hasPath,
+ Function()? onRetryWithFlooding,
}) async {
if (!_activeService.isConnected) {
_error = 'Not connected to device';
@@ -1334,7 +1382,10 @@ class ConnectionProvider with ChangeNotifier {
);
// Send the ping
- await _activeService.requestTelemetry(contactPublicKey, zeroHop: true);
+ await _activeService.requestTelemetry(
+ contactPublicKey,
+ zeroHop: firstAttemptDirect,
+ );
// Wait for response or timeout
final bool gotResponse = await pingFuture;
@@ -1361,8 +1412,8 @@ class ConnectionProvider with ChangeNotifier {
wasDirectAttempt: false,
);
- // Retry with flooding (zeroHop=true acts as broadcast to neighbors)
- await _activeService.requestTelemetry(contactPublicKey, zeroHop: true);
+ // Retry with flooding.
+ await _activeService.requestTelemetry(contactPublicKey, zeroHop: false);
// Wait for response or timeout
final bool gotRetryResponse = await retryFuture;
@@ -1384,6 +1435,10 @@ class ConnectionProvider with ChangeNotifier {
}
}
+ String _publicKeyToHex(Uint8List publicKey) {
+ return publicKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join('');
+ }
+
/// Send binary request to contact (modern replacement for requestTelemetry)
///
/// Supports multiple request types:
@@ -1967,6 +2022,30 @@ class ConnectionProvider with ChangeNotifier {
}
}
+ Future setContactRoute(
+ Contact contact, {
+ required int signedEncodedPathLen,
+ required Uint8List paddedPathBytes,
+ }) async {
+ if (!_activeService.isConnected) {
+ _error = 'Not connected to device';
+ notifyListeners();
+ return;
+ }
+
+ try {
+ final updatedContact = contact.copyWith(
+ outPathLen: signedEncodedPathLen,
+ outPath: Uint8List.fromList(paddedPathBytes),
+ );
+ await _activeService.addOrUpdateContact(updatedContact);
+ } catch (e) {
+ _error = 'Failed to set route: $e';
+ notifyListeners();
+ rethrow;
+ }
+ }
+
/// Remove a contact from the companion radio
///
/// Deletes the contact from the device's internal contact table.
diff --git a/lib/providers/contacts_provider.dart b/lib/providers/contacts_provider.dart
index 8377885..f657cb0 100644
--- a/lib/providers/contacts_provider.dart
+++ b/lib/providers/contacts_provider.dart
@@ -423,9 +423,16 @@ class ContactsProvider with ChangeNotifier {
debugPrint(' Old lastAdvert: ${contact.lastAdvert}');
debugPrint(' New lastAdvert: $currentTimestamp');
+ final persistedGps = _getValidGpsOrNull(telemetry.gpsLocation);
final updatedContact = contact.copyWith(
telemetry: telemetry,
lastAdvert: currentTimestamp, // Update last seen time
+ advLat: persistedGps != null
+ ? _coordinateToAdvertMicrodegrees(persistedGps.latitude)
+ : contact.advLat,
+ advLon: persistedGps != null
+ ? _coordinateToAdvertMicrodegrees(persistedGps.longitude)
+ : contact.advLon,
);
_contacts[contact.publicKeyHex] = updatedContact;
debugPrint(' ✅ Updated contact in map (with new lastAdvert)');
@@ -476,6 +483,10 @@ class ContactsProvider with ChangeNotifier {
return incomingGps == null;
}
+ int _coordinateToAdvertMicrodegrees(double coordinate) {
+ return (coordinate * 1e6).round();
+ }
+
/// Find contact by public key prefix (6 bytes)
Contact? _findContactByPrefix(Uint8List prefix) {
if (prefix.length < 6) return null;
@@ -521,7 +532,39 @@ class ContactsProvider with ChangeNotifier {
/// prefer flood routing until the radio reports a fresh route.
void markPathUnhealthy(Uint8List publicKey) {
final contact = findContactByKey(publicKey);
- if (contact == null || !contact.hasPath) {
+ if (contact == null || !contact.routeHasPath) {
+ return;
+ }
+
+ _contacts[contact.publicKeyHex] = contact.copyWith(
+ outPathLen: -1,
+ outPath: Uint8List(0),
+ );
+ _persistContacts();
+ notifyListeners();
+ }
+
+ void setContactRouteLocal(
+ Uint8List publicKey, {
+ required int signedEncodedPathLen,
+ required Uint8List paddedPathBytes,
+ }) {
+ final contact = findContactByKey(publicKey);
+ if (contact == null) {
+ return;
+ }
+
+ _contacts[contact.publicKeyHex] = contact.copyWith(
+ outPathLen: signedEncodedPathLen,
+ outPath: Uint8List.fromList(paddedPathBytes),
+ );
+ _persistContacts();
+ notifyListeners();
+ }
+
+ void resetContactRouteLocal(Uint8List publicKey) {
+ final contact = findContactByKey(publicKey);
+ if (contact == null) {
return;
}
diff --git a/lib/providers/helpers/message_delivery_tracker.dart b/lib/providers/helpers/message_delivery_tracker.dart
index 9ebaba6..d91ea9b 100644
--- a/lib/providers/helpers/message_delivery_tracker.dart
+++ b/lib/providers/helpers/message_delivery_tracker.dart
@@ -98,6 +98,11 @@ class MessageDeliveryTracker {
return _ackTagToMessageId[ackCode];
}
+ /// Returns true once a message has been matched to a concrete ACK tag.
+ bool hasAckForMessage(String messageId) {
+ return _messageIdToAckTag.containsKey(messageId);
+ }
+
/// Remove ACK tag mapping after delivery confirmed or timeout
///
/// Cleans up both forward and reverse mappings.
diff --git a/lib/providers/helpers/message_retry_manager.dart b/lib/providers/helpers/message_retry_manager.dart
index a0b6228..c46a33d 100644
--- a/lib/providers/helpers/message_retry_manager.dart
+++ b/lib/providers/helpers/message_retry_manager.dart
@@ -1,5 +1,4 @@
import 'dart:convert';
-import 'dart:math' as math;
import '../../models/message.dart';
import '../../models/contact.dart';
@@ -55,8 +54,8 @@ class MessageRetryManager {
final payloadBytes = utf8.encode(text).length;
final airtimeMs = _estimateLoRaAirtimeMs(payloadBytes);
- final hopCount = contact?.hasPath == true
- ? math.max(contact!.outPathLen, 0)
+ final hopCount = contact?.routeHasPath == true
+ ? contact!.routeHopCount
: -1;
if (hopCount < 0) {
@@ -87,7 +86,7 @@ class MessageRetryManager {
// Only retry if contact has a learned path
// If no path, the device uses flood mode automatically - retrying won't help
- return contact.hasPath;
+ return contact.routeHasPath;
}
/// Check if should fall back to flood mode
@@ -101,7 +100,7 @@ class MessageRetryManager {
/// Contacts without paths already use flood mode automatically.
bool shouldUseFloodFallback(Message message, Contact contact) {
return message.retryAttempt >= 3 &&
- contact.hasPath && // ✅ FIXED: Flood fallback for failed direct paths
+ contact.routeHasPath &&
!message.usedFloodFallback;
}
diff --git a/lib/providers/helpers/ping_tracker.dart b/lib/providers/helpers/ping_tracker.dart
index 0bf51e5..cca4b21 100644
--- a/lib/providers/helpers/ping_tracker.dart
+++ b/lib/providers/helpers/ping_tracker.dart
@@ -46,8 +46,8 @@ class PingTracker {
/// Mark a ping as successful (response received)
/// Should be called when telemetry response arrives
void markPingSuccessful(Uint8List publicKey) {
- final String keyHex = _publicKeyToHex(publicKey);
- final request = _pendingPings.remove(keyHex);
+ final requestKey = _findMatchingPendingPingKey(publicKey);
+ final request = requestKey != null ? _pendingPings.remove(requestKey) : null;
if (request != null) {
request.cancel();
@@ -81,6 +81,23 @@ class PingTracker {
String _publicKeyToHex(Uint8List publicKey) {
return publicKey.map((b) => b.toRadixString(16).padLeft(2, '0')).join('');
}
+
+ String? _findMatchingPendingPingKey(Uint8List responseKey) {
+ final responseHex = _publicKeyToHex(responseKey);
+
+ if (_pendingPings.containsKey(responseHex)) {
+ return responseHex;
+ }
+
+ for (final entry in _pendingPings.entries) {
+ final pendingHex = entry.key;
+ if (pendingHex.startsWith(responseHex) || responseHex.startsWith(pendingHex)) {
+ return pendingHex;
+ }
+ }
+
+ return null;
+ }
}
/// Internal class to track a single ping request
diff --git a/lib/providers/helpers/raw_session_retransmit.dart b/lib/providers/helpers/raw_session_retransmit.dart
index fb8f1c5..1d22d8c 100644
--- a/lib/providers/helpers/raw_session_retransmit.dart
+++ b/lib/providers/helpers/raw_session_retransmit.dart
@@ -9,13 +9,6 @@ typedef RawPacketSender =
required Uint8List payload,
});
-typedef FragmentAckWaiter =
- Future Function({
- required String sessionId,
- required int index,
- Duration timeout,
- });
-
Future serveCachedSessionFragments({
required String providerLabel,
required String sessionId,
@@ -25,9 +18,7 @@ Future serveCachedSessionFragments({
required int Function(T fragment) indexOf,
required Uint8List Function(T fragment) encodeBinary,
required RawPacketSender? sendRawPacket,
- FragmentAckWaiter? waitForFragmentAck,
Set? requestedIndices,
- Duration ackTimeout = const Duration(seconds: 8),
}) async {
if (fragments.isEmpty) {
debugPrint('⚠️ [$providerLabel] No cached fragments for $sessionId');
@@ -37,13 +28,19 @@ Future serveCachedSessionFragments({
debugPrint('⚠️ [$providerLabel] sendRawPacketCallback not set');
return false;
}
- if (requester.outPathLen < 0) {
+ if (!requester.routeHasPath) {
debugPrint('⚠️ [$providerLabel] ${requester.advName} has no direct path');
return false;
}
- if (requester.outPathLen > maxDirectPayloadHops) {
+ if (requester.routeHopCount > maxDirectPayloadHops) {
debugPrint(
- '⚠️ [$providerLabel] ${requester.advName} is too far: ${requester.outPathLen} hops (max $maxDirectPayloadHops)',
+ '⚠️ [$providerLabel] ${requester.advName} is too far: ${requester.routeHopCount} hops (max $maxDirectPayloadHops)',
+ );
+ return false;
+ }
+ if (!requester.routeSupportsLegacyRawTransport) {
+ debugPrint(
+ '⚠️ [$providerLabel] ${requester.advName} route uses unsupported 3-byte raw transport on current client',
);
return false;
}
@@ -65,24 +62,12 @@ Future serveCachedSessionFragments({
continue;
}
try {
- final ackFuture = waitForFragmentAck?.call(
- sessionId: sessionId,
- index: index,
- timeout: ackTimeout,
- );
await sendRawPacket(
contactPath: requester.outPath,
- contactPathLen: requester.outPathLen,
+ contactPathLen: requester.routeSignedPathLen,
payload: encodeBinary(fragment),
);
servedCount++;
- if (ackFuture != null) {
- final acked = await ackFuture;
- if (!acked) {
- debugPrint('⚠️ [$providerLabel] ACK timeout for $sessionId#$index');
- return false;
- }
- }
} catch (e, st) {
debugPrint(
'❌ [$providerLabel] Serve error for $sessionId#$index: $e\n$st',
diff --git a/lib/providers/helpers/session_metadata_restore.dart b/lib/providers/helpers/session_metadata_restore.dart
index 892f946..9476867 100644
--- a/lib/providers/helpers/session_metadata_restore.dart
+++ b/lib/providers/helpers/session_metadata_restore.dart
@@ -1,38 +1,57 @@
+import '../../models/message.dart';
import '../../utils/image_message_parser.dart';
import '../../utils/voice_message_parser.dart';
class RestoredSessionMetadata {
final Map voiceSenderKeyBySession;
+ final Map imageSenderKeyBySession;
final Map imageEnvelopeBySession;
const RestoredSessionMetadata({
required this.voiceSenderKeyBySession,
+ required this.imageSenderKeyBySession,
required this.imageEnvelopeBySession,
});
}
RestoredSessionMetadata restoreSessionMetadataFromMessages(
- Iterable messageTexts,
+ Iterable messages,
) {
final voiceSenderKeyBySession = {};
+ final imageSenderKeyBySession = {};
final imageEnvelopeBySession = {};
- for (final text in messageTexts) {
+ for (final message in messages) {
+ final text = message.text;
final voiceEnvelope = VoiceEnvelope.tryParseText(text);
if (voiceEnvelope != null) {
- voiceSenderKeyBySession[voiceEnvelope.sessionId] = voiceEnvelope
- .senderKey6
- .toLowerCase();
+ final senderPrefix = message.senderPublicKeyPrefix;
+ if (senderPrefix != null && senderPrefix.length >= 6) {
+ voiceSenderKeyBySession[voiceEnvelope.sessionId] = senderPrefix
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toLowerCase();
+ }
}
final imageEnvelope = ImageEnvelope.tryParse(text);
if (imageEnvelope != null) {
imageEnvelopeBySession[imageEnvelope.sessionId] = imageEnvelope;
+ final senderPrefix = message.senderPublicKeyPrefix;
+ if (senderPrefix != null && senderPrefix.length >= 6) {
+ imageSenderKeyBySession[imageEnvelope.sessionId] = senderPrefix
+ .sublist(0, 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toLowerCase();
+ }
}
}
return RestoredSessionMetadata(
voiceSenderKeyBySession: voiceSenderKeyBySession,
+ imageSenderKeyBySession: imageSenderKeyBySession,
imageEnvelopeBySession: imageEnvelopeBySession,
);
}
diff --git a/lib/providers/image_provider.dart b/lib/providers/image_provider.dart
index 00a02a7..62a6c4c 100644
--- a/lib/providers/image_provider.dart
+++ b/lib/providers/image_provider.dart
@@ -70,12 +70,6 @@ class ImageProvider with ChangeNotifier {
required Uint8List payload,
})?
sendRawPacketCallback;
- Future Function({
- required String sessionId,
- required int index,
- Duration timeout,
- })?
- waitForFragmentAckCallback;
ImageProvider() {
_restore();
@@ -102,11 +96,28 @@ class ImageProvider with ChangeNotifier {
return missing;
}
+ List availableFragmentIndices(String sessionId) {
+ final outgoing = _outgoing[sessionId];
+ if (outgoing != null) {
+ return outgoing.fragments.map((fragment) => fragment.index).toList()
+ ..sort();
+ }
+
+ final session = _sessions[sessionId];
+ if (session == null) return const [];
+ final indices = [];
+ for (var i = 0; i < session.fragments.length; i++) {
+ if (session.fragments[i] != null) {
+ indices.add(i);
+ }
+ }
+ return indices;
+ }
+
// ── Incoming fragment reception ──────────────────────────────────────────
- /// Add a received [fragment]. Creates the session on first fragment using
- /// metadata from the fragment itself (requires envelope to have been
- /// announced first; if not, defaults width/height to 0 — corrected on save).
+ /// Add a received [fragment]. New compact fragments rely on prior envelope
+ /// metadata for total/format, while legacy fragments can still self-describe.
///
/// Returns true when the session just became complete.
bool addFragment(ImagePacket fragment, {int width = 0, int height = 0}) {
@@ -116,16 +127,20 @@ class ImageProvider with ChangeNotifier {
);
return false;
}
- _sessions.putIfAbsent(
- fragment.sessionId,
- () => ImageSession(
+ _sessions.putIfAbsent(fragment.sessionId, () {
+ if (fragment.total < 1) {
+ throw StateError(
+ 'Image envelope missing for compact fragment ${fragment.sessionId}',
+ );
+ }
+ return ImageSession(
sessionId: fragment.sessionId,
format: fragment.format,
total: fragment.total,
width: width,
height: height,
- ),
- );
+ );
+ });
final session = _sessions[fragment.sessionId]!;
if (fragment.index < session.total) {
@@ -250,21 +265,26 @@ class ImageProvider with ChangeNotifier {
required Contact requester,
Set? requestedIndices,
}) async {
- final cached = _outgoing[sessionId];
- if (cached == null) {
- debugPrint('⚠️ [ImageProvider] No cached session for $sessionId');
+ final outgoing = _outgoing[sessionId];
+ final fragments = outgoing != null
+ ? List.from(outgoing.fragments)
+ : _sessions[sessionId]?.fragments.whereType().toList() ??
+ const [];
+ if (fragments.isEmpty) {
+ debugPrint(
+ '⚠️ [ImageProvider] No cached or received session for $sessionId',
+ );
return false;
}
return serveCachedSessionFragments(
providerLabel: 'ImageProvider',
sessionId: sessionId,
requester: requester,
- fragments: cached.fragments,
+ fragments: fragments,
maxDirectPayloadHops: maxDirectPayloadHops,
indexOf: (fragment) => fragment.index,
encodeBinary: (fragment) => fragment.encodeBinary(),
sendRawPacket: sendRawPacketCallback,
- waitForFragmentAck: waitForFragmentAckCallback,
requestedIndices: requestedIndices,
);
}
diff --git a/lib/providers/messages_provider.dart b/lib/providers/messages_provider.dart
index 6e52aeb..f4bccea 100644
--- a/lib/providers/messages_provider.dart
+++ b/lib/providers/messages_provider.dart
@@ -3,6 +3,8 @@ import 'package:flutter/foundation.dart';
import '../models/message.dart';
import '../models/contact.dart';
import '../models/message_contact_location.dart';
+import '../models/message_reception_details.dart';
+import '../models/message_transfer_details.dart';
import '../models/sar_marker.dart';
import '../models/map_drawing.dart';
import '../services/message_storage_service.dart';
@@ -10,6 +12,7 @@ import '../services/notification_service.dart';
import '../utils/sar_message_parser.dart';
import '../utils/drawing_message_parser.dart';
import '../utils/voice_message_parser.dart';
+import '../utils/image_message_parser.dart';
import '../l10n/app_localizations.dart';
import 'helpers/message_retry_manager.dart';
@@ -22,6 +25,8 @@ class MessagesProvider with ChangeNotifier {
bool _isInitialized = false;
AppLocalizations? _localizations;
final Map _messageContactLocations = {};
+ final Map _messageReceptionDetails = {};
+ final Map _messageTransferDetails = {};
// Track pending sent messages by expected ACK/TAG
final Map _pendingSentMessages = {};
@@ -74,12 +79,12 @@ class MessagesProvider with ChangeNotifier {
})?
sendMessageCallback;
- Future Function({
- required Contact contact,
- required int failureStreak,
- })?
+ Future Function({required Contact contact, required int failureStreak})?
onDirectPathFailedCallback;
+ String? Function(Uint8List? publicKey)? resolveContactNameCallback;
+ String Function(int channelIdx)? resolveChannelNameCallback;
+
List get messages => List.unmodifiable(_messages);
List get contactMessages =>
@@ -115,6 +120,12 @@ class MessagesProvider with ChangeNotifier {
MessageContactLocation? getMessageContactLocation(String messageId) =>
_messageContactLocations[messageId];
+ MessageReceptionDetails? getMessageReceptionDetails(String messageId) =>
+ _messageReceptionDetails[messageId];
+
+ MessageTransferDetails? getMessageTransferDetails(String messageId) =>
+ _messageTransferDetails[messageId];
+
/// Set localizations for notifications
void setLocalizations(AppLocalizations localizations) {
_localizations = localizations;
@@ -145,9 +156,19 @@ class MessagesProvider with ChangeNotifier {
final storedMessages = await _storageService.loadMessages();
final storedContactLocations = await _storageService
.loadMessageContactLocations();
+ final storedReceptionDetails = await _storageService
+ .loadMessageReceptionDetails();
+ final storedTransferDetails = await _storageService
+ .loadMessageTransferDetails();
_messageContactLocations
..clear()
..addAll(storedContactLocations);
+ _messageReceptionDetails
+ ..clear()
+ ..addAll(storedReceptionDetails);
+ _messageTransferDetails
+ ..clear()
+ ..addAll(storedTransferDetails);
// Add stored messages with enhancement to ensure SAR detection
for (final message in storedMessages) {
@@ -187,14 +208,6 @@ class MessagesProvider with ChangeNotifier {
isVoice: true,
voiceId: envelope.sessionId,
);
- } else if (VoicePacket.isVoiceText(enhancedMessage.text)) {
- final pkt = VoicePacket.tryParseText(enhancedMessage.text);
- if (pkt != null) {
- enhancedMessage = enhancedMessage.copyWith(
- isVoice: true,
- voiceId: pkt.sessionId,
- );
- }
}
}
@@ -311,6 +324,7 @@ class MessagesProvider with ChangeNotifier {
Message message, {
String Function(String name)? contactLookup,
MessageContactLocation? contactLocationSnapshot,
+ MessageReceptionDetails? receptionDetailsSnapshot,
}) {
// Always enhance message with SAR parser to detect SAR markers
var enhancedMessage = SarMessageParser.enhanceMessage(message);
@@ -341,14 +355,6 @@ class MessagesProvider with ChangeNotifier {
isVoice: true,
voiceId: envelope.sessionId,
);
- } else if (VoicePacket.isVoiceText(enhancedMessage.text)) {
- final pkt = VoicePacket.tryParseText(enhancedMessage.text);
- if (pkt != null) {
- enhancedMessage = enhancedMessage.copyWith(
- isVoice: true,
- voiceId: pkt.sessionId,
- );
- }
}
}
@@ -397,6 +403,22 @@ class MessagesProvider with ChangeNotifier {
debugPrint(
' Text: ${finalMessage.text.substring(0, finalMessage.text.length > 50 ? 50 : finalMessage.text.length)}...',
);
+ final existingIndex = _messages.indexWhere(
+ (existing) =>
+ existing.messageType == finalMessage.messageType &&
+ existing.senderTimestamp == finalMessage.senderTimestamp &&
+ existing.text == finalMessage.text,
+ );
+ if (existingIndex != -1) {
+ final existingId = _messages[existingIndex].id;
+ if (contactLocationSnapshot != null) {
+ _messageContactLocations[existingId] = contactLocationSnapshot;
+ }
+ if (receptionDetailsSnapshot != null) {
+ _messageReceptionDetails[existingId] = receptionDetailsSnapshot;
+ }
+ _persistMessages();
+ }
return; // Skip duplicate
}
@@ -404,6 +426,9 @@ class MessagesProvider with ChangeNotifier {
if (contactLocationSnapshot != null) {
_messageContactLocations[finalMessage.id] = contactLocationSnapshot;
}
+ if (receptionDetailsSnapshot != null) {
+ _messageReceptionDetails[finalMessage.id] = receptionDetailsSnapshot;
+ }
// If it's a SAR marker message, extract and store the marker
if (finalMessage.isSarMarker) {
@@ -549,33 +574,31 @@ class MessagesProvider with ChangeNotifier {
/// Trigger notification for regular message
Future _triggerMessageNotification(Message message) async {
try {
- // Get sender name from message
- final senderName =
- message.senderName ?? message.senderKeyShort ?? 'Unknown';
-
- // Determine if it's a channel message
+ final senderName = _resolveParticipantName(
+ publicKey: message.senderPublicKeyPrefix,
+ fallback: message.senderName ?? message.senderKeyShort,
+ );
final isChannelMessage = message.isChannelMessage;
-
- // Get channel name if available
- String? channelName;
- if (isChannelMessage) {
- // You could map channelIdx to channel name here if needed
- // For now, use "Public" for channel 0
- channelName = message.channelIdx == 0
- ? 'Public'
- : 'Channel ${message.channelIdx}';
- }
+ final channelName = isChannelMessage
+ ? _resolveChannelName(message.channelIdx)
+ : null;
+ final messageText = _buildNotificationMessageText(
+ message,
+ senderName: senderName,
+ isChannelMessage: isChannelMessage,
+ channelName: channelName,
+ );
debugPrint('🔔 [MessagesProvider] Triggering message notification');
debugPrint(' Sender: $senderName');
debugPrint(' Type: ${isChannelMessage ? "Channel" : "Direct"}');
debugPrint(
- ' Message: ${message.text.substring(0, message.text.length > 50 ? 50 : message.text.length)}...',
+ ' Message: ${messageText.substring(0, messageText.length > 50 ? 50 : messageText.length)}...',
);
await _notificationService.showMessageNotification(
senderName: senderName,
- messageText: message.text,
+ messageText: messageText,
isChannelMessage: isChannelMessage,
channelName: channelName,
localizations: _localizations,
@@ -587,12 +610,84 @@ class MessagesProvider with ChangeNotifier {
}
}
+ String _resolveParticipantName({
+ required Uint8List? publicKey,
+ String? fallback,
+ }) {
+ final resolved = resolveContactNameCallback?.call(publicKey)?.trim();
+ if (resolved != null && resolved.isNotEmpty) {
+ return resolved;
+ }
+ final normalizedFallback = fallback?.trim();
+ if (normalizedFallback != null && normalizedFallback.isNotEmpty) {
+ return normalizedFallback;
+ }
+ return 'Unknown';
+ }
+
+ String _resolveChannelName(int? channelIdx) {
+ final idx = channelIdx ?? 0;
+ final resolved = resolveChannelNameCallback?.call(idx).trim();
+ if (resolved != null && resolved.isNotEmpty) {
+ return resolved;
+ }
+ return idx == 0 ? 'Public' : 'Channel $idx';
+ }
+
+ String _buildNotificationMessageText(
+ Message message, {
+ required String senderName,
+ required bool isChannelMessage,
+ String? channelName,
+ }) {
+ final voiceEnvelope = VoiceEnvelope.tryParseText(message.text);
+ if (voiceEnvelope != null) {
+ final seconds = (voiceEnvelope.durationMs / 1000).ceil();
+ final summary =
+ 'Voice message - ${voiceEnvelope.mode.label} - ${seconds}s - ${voiceEnvelope.total} packets';
+ return isChannelMessage ? '$senderName\n$summary' : summary;
+ }
+
+ final imageEnvelope = ImageEnvelope.tryParse(message.text);
+ if (imageEnvelope != null) {
+ final summary =
+ 'Image - ${imageEnvelope.format.label} - ${imageEnvelope.width}x${imageEnvelope.height} - ${_formatBytes(imageEnvelope.sizeBytes)}';
+ return isChannelMessage ? '$senderName\n$summary' : summary;
+ }
+
+ if (!isChannelMessage && message.recipientPublicKey != null) {
+ final recipientName = _resolveParticipantName(
+ publicKey: message.recipientPublicKey,
+ fallback: null,
+ );
+ if (recipientName != 'Unknown') {
+ return 'To: $recipientName\n${message.text}';
+ }
+ }
+
+ if (isChannelMessage) {
+ return '$senderName\n${message.text}';
+ }
+
+ return message.text;
+ }
+
+ String _formatBytes(int bytes) {
+ if (bytes < 1024) return '$bytes B';
+ final kib = bytes / 1024;
+ if (kib < 1024) return '${kib.toStringAsFixed(kib >= 10 ? 0 : 1)} KB';
+ final mib = kib / 1024;
+ return '${mib.toStringAsFixed(mib >= 10 ? 0 : 1)} MB';
+ }
+
/// Persist messages to storage (async, non-blocking)
Future _persistMessages() async {
try {
await _storageService.saveMessages(
_messages,
messageContactLocations: _messageContactLocations,
+ messageReceptionDetails: _messageReceptionDetails,
+ messageTransferDetails: _messageTransferDetails,
);
} catch (e) {
debugPrint('❌ [MessagesProvider] Error persisting messages: $e');
@@ -709,6 +804,8 @@ class MessagesProvider with ChangeNotifier {
_messageContactMap.remove(messageId);
_groupedMessageMapping.remove(messageId);
_messageContactLocations.remove(messageId);
+ _messageReceptionDetails.remove(messageId);
+ _messageTransferDetails.remove(messageId);
debugPrint('🗑️ [MessagesProvider] Message $messageId deleted');
@@ -738,6 +835,8 @@ class MessagesProvider with ChangeNotifier {
_messages.clear();
_sarMarkers.clear();
_messageContactLocations.clear();
+ _messageReceptionDetails.clear();
+ _messageTransferDetails.clear();
_persistMessages();
notifyListeners();
}
@@ -753,10 +852,70 @@ class MessagesProvider with ChangeNotifier {
_messages.clear();
_sarMarkers.clear();
_messageContactLocations.clear();
+ _messageReceptionDetails.clear();
+ _messageTransferDetails.clear();
_persistMessages();
notifyListeners();
}
+ int transferCountForSession({
+ String? voiceSessionId,
+ String? imageSessionId,
+ }) {
+ final messageId = _findMessageIdByMediaSession(
+ voiceSessionId: voiceSessionId,
+ imageSessionId: imageSessionId,
+ );
+ if (messageId == null) return 0;
+ return _messageTransferDetails[messageId]?.totalTransfers ?? 0;
+ }
+
+ void recordMediaTransfer({
+ required String sessionId,
+ required String mediaType,
+ required String requesterKey6,
+ String? requesterName,
+ }) {
+ final messageId = _findMessageIdByMediaSession(
+ voiceSessionId: mediaType == 'voice' ? sessionId : null,
+ imageSessionId: mediaType == 'image' ? sessionId : null,
+ );
+ if (messageId == null) {
+ debugPrint(
+ '⚠️ [MessagesProvider] No message found for $mediaType session $sessionId',
+ );
+ return;
+ }
+
+ final current =
+ _messageTransferDetails[messageId] ??
+ const MessageTransferDetails.empty();
+ _messageTransferDetails[messageId] = current.registerTransfer(
+ requesterKey6: requesterKey6,
+ requesterName: requesterName,
+ );
+ _persistMessages();
+ notifyListeners();
+ }
+
+ String? _findMessageIdByMediaSession({
+ String? voiceSessionId,
+ String? imageSessionId,
+ }) {
+ for (final message in _messages.reversed) {
+ if (voiceSessionId != null && message.voiceId == voiceSessionId) {
+ return message.id;
+ }
+ if (imageSessionId != null) {
+ final envelope = ImageEnvelope.tryParse(message.text);
+ if (envelope != null && envelope.sessionId == imageSessionId) {
+ return message.id;
+ }
+ }
+ }
+ return null;
+ }
+
/// Get storage statistics
Future> getStorageStats() async {
return await _storageService.getStorageStats();
@@ -852,14 +1011,6 @@ class MessagesProvider with ChangeNotifier {
isVoice: true,
voiceId: envelope.sessionId,
);
- } else if (VoicePacket.isVoiceText(enhancedMessage.text)) {
- final pkt = VoicePacket.tryParseText(enhancedMessage.text);
- if (pkt != null) {
- enhancedMessage = enhancedMessage.copyWith(
- isVoice: true,
- voiceId: pkt.sessionId,
- );
- }
}
}
@@ -1062,10 +1213,11 @@ class MessagesProvider with ChangeNotifier {
' Message text preview: ${message.text.substring(0, message.text.length > 30 ? 30 : message.text.length)}...',
);
+ // Once the device accepts a direct message and returns an ACK tag, the
+ // send itself succeeded locally even if end-to-end delivery confirmation
+ // may still arrive later. Keep ACK tracking, but stop showing "waiting".
final updatedMessage = message.copyWith(
- deliveryStatus: expectedAckTag > 0
- ? MessageDeliveryStatus.sending
- : MessageDeliveryStatus.sent,
+ deliveryStatus: MessageDeliveryStatus.sent,
expectedAckTag: expectedAckTag > 0 ? expectedAckTag : null,
suggestedTimeoutMs: expectedAckTag > 0 ? effectiveTimeout : null,
);
@@ -1522,7 +1674,7 @@ class MessagesProvider with ChangeNotifier {
debugPrint('❌ [MessagesProvider] Message $messageId timeout/failed');
debugPrint(' Retry attempt: ${message.retryAttempt}');
- debugPrint(' Contact has path: ${contact?.hasPath ?? false}');
+ debugPrint(' Contact has path: ${contact?.routeHasPath ?? false}');
debugPrint(' Used flood fallback: ${message.usedFloodFallback}');
// Decision tree for retry/flood/fail
@@ -1678,7 +1830,7 @@ class MessagesProvider with ChangeNotifier {
_retryManager.clearRetry(messageId);
final failedContact = _messageContactMap[messageId];
- if (failedContact != null && failedContact.hasPath) {
+ if (failedContact != null && failedContact.routeHasPath) {
final failureStreak = _retryManager.recordPathFailure(failedContact);
debugPrint(
' Path failure streak for ${failedContact.advName}: $failureStreak',
@@ -1698,8 +1850,69 @@ class MessagesProvider with ChangeNotifier {
}
}
+ /// Reset an existing failed message back into a sending state so a manual
+ /// retry can reuse the same record instead of appending a duplicate.
+ bool prepareMessageForRetry(String messageId) {
+ final index = _messages.indexWhere((m) => m.id == messageId);
+ if (index == -1) {
+ debugPrint(
+ '⚠️ [MessagesProvider] prepareMessageForRetry: Message not found: $messageId',
+ );
+ return false;
+ }
+
+ final message = _messages[index];
+
+ _timeoutTimers[message.id]?.cancel();
+ _timeoutTimers.remove(message.id);
+ if (message.expectedAckTag != null) {
+ _pendingSentMessages.remove(message.expectedAckTag);
+ }
+ _clearAckHistoryForMessage(messageId);
+ _retryManager.clearRetry(messageId);
+
+ _messages[index] = Message(
+ id: message.id,
+ messageType: message.messageType,
+ senderPublicKeyPrefix: message.senderPublicKeyPrefix,
+ channelIdx: message.channelIdx,
+ pathLen: message.pathLen,
+ textType: message.textType,
+ senderTimestamp: message.senderTimestamp,
+ text: message.text,
+ isSarMarker: message.isSarMarker,
+ sarGpsCoordinates: message.sarGpsCoordinates,
+ sarNotes: message.sarNotes,
+ sarCustomEmoji: message.sarCustomEmoji,
+ sarColorIndex: message.sarColorIndex,
+ receivedAt: message.receivedAt,
+ senderName: message.senderName,
+ deliveryStatus: MessageDeliveryStatus.sending,
+ recipientPublicKey: message.recipientPublicKey,
+ retryAttempt: 0,
+ lastRetryAt: DateTime.now(),
+ usedFloodFallback: false,
+ isRead: message.isRead,
+ echoCount: message.echoCount,
+ firstEchoAt: message.firstEchoAt,
+ lastEchoSnrRaw: message.lastEchoSnrRaw,
+ lastEchoRssiDbm: message.lastEchoRssiDbm,
+ lastEchoAt: message.lastEchoAt,
+ isDrawing: message.isDrawing,
+ drawingId: message.drawingId,
+ groupId: message.groupId,
+ recipients: message.recipients,
+ isVoice: message.isVoice,
+ voiceId: message.voiceId,
+ );
+
+ _persistMessages();
+ notifyListeners();
+ return true;
+ }
+
/// Resend a failed message
- Future resendMessage(String messageId) async {
+ Future resendMessage(String messageId, {Contact? contact}) async {
final index = _messages.indexWhere((m) => m.id == messageId);
if (index == -1) {
debugPrint(
@@ -1709,9 +1922,9 @@ class MessagesProvider with ChangeNotifier {
}
final message = _messages[index];
- final contact = _messageContactMap[messageId];
+ final resolvedContact = contact ?? _messageContactMap[messageId];
- if (contact == null) {
+ if (resolvedContact == null) {
debugPrint(
'⚠️ [MessagesProvider] Cannot resend: Contact not found for message $messageId',
);
@@ -1720,26 +1933,19 @@ class MessagesProvider with ChangeNotifier {
debugPrint('🔁 [MessagesProvider] Resending message $messageId');
- // Reset retry state
- _messages[index] = message.copyWith(
- retryAttempt: 0,
- usedFloodFallback: false,
- deliveryStatus: MessageDeliveryStatus.sending,
- lastRetryAt: DateTime.now(),
- );
-
- // Clear retry tracking
- _retryManager.clearRetry(messageId);
-
- notifyListeners();
+ _messageContactMap[messageId] = resolvedContact;
+ final prepared = prepareMessageForRetry(messageId);
+ if (!prepared) {
+ return;
+ }
// Send again
if (sendMessageCallback != null) {
final queued = await sendMessageCallback!(
- contactPublicKey: contact.publicKey,
+ contactPublicKey: resolvedContact.publicKey,
text: message.text,
messageId: messageId,
- contact: contact,
+ contact: resolvedContact,
retryAttempt: 0,
);
if (!queued) {
diff --git a/lib/providers/sensors_provider.dart b/lib/providers/sensors_provider.dart
new file mode 100644
index 0000000..95dacfc
--- /dev/null
+++ b/lib/providers/sensors_provider.dart
@@ -0,0 +1,233 @@
+import 'dart:async';
+import 'dart:convert';
+
+import 'package:flutter/foundation.dart';
+import 'package:shared_preferences/shared_preferences.dart';
+
+import '../models/contact.dart';
+import 'connection_provider.dart';
+import 'contacts_provider.dart';
+
+enum SensorRefreshState { idle, refreshing, success, timeout, unavailable }
+
+enum SensorMetric {
+ lastSeen,
+ voltage,
+ battery,
+ temperature,
+ humidity,
+ pressure,
+ gps,
+ updated,
+}
+
+class SensorsProvider with ChangeNotifier {
+ static const String _watchedSensorsKey = 'watched_sensor_keys';
+ static const String _visibleSensorMetricsKey = 'visible_sensor_metrics';
+ static const Set _defaultVisibleMetrics = {
+ SensorMetric.lastSeen,
+ SensorMetric.voltage,
+ SensorMetric.battery,
+ SensorMetric.temperature,
+ SensorMetric.humidity,
+ SensorMetric.pressure,
+ SensorMetric.gps,
+ SensorMetric.updated,
+ };
+
+ final List _watchedSensorKeys = [];
+ final Map _refreshStates =
+ {};
+ final Map> _visibleMetricsBySensor =
+ >{};
+ bool _isLoaded = false;
+ bool _isRefreshingAll = false;
+
+ SensorsProvider() {
+ unawaited(_loadWatchedSensors());
+ }
+
+ List get watchedSensorKeys => List.unmodifiable(_watchedSensorKeys);
+ bool get isLoaded => _isLoaded;
+ bool get isRefreshingAll => _isRefreshingAll;
+
+ SensorRefreshState stateFor(String publicKeyHex) =>
+ _refreshStates[publicKeyHex] ?? SensorRefreshState.idle;
+
+ Future _loadWatchedSensors() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ final stored = prefs.getStringList(_watchedSensorsKey) ?? [];
+ final storedMetricsJson = prefs.getString(_visibleSensorMetricsKey);
+ _watchedSensorKeys
+ ..clear()
+ ..addAll(stored);
+ _visibleMetricsBySensor.clear();
+ if (storedMetricsJson != null && storedMetricsJson.isNotEmpty) {
+ final decoded = jsonDecode(storedMetricsJson) as Map;
+ for (final entry in decoded.entries) {
+ final metricNames = (entry.value as List).cast();
+ _visibleMetricsBySensor[entry.key] = metricNames
+ .map(_metricFromName)
+ .whereType()
+ .toSet();
+ }
+ }
+ for (final key in _watchedSensorKeys) {
+ _visibleMetricsBySensor.putIfAbsent(
+ key,
+ () => Set.from(_defaultVisibleMetrics),
+ );
+ }
+ } catch (e) {
+ debugPrint('Error loading watched sensors: $e');
+ } finally {
+ _isLoaded = true;
+ notifyListeners();
+ }
+ }
+
+ Future _persistWatchedSensors() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ await prefs.setStringList(_watchedSensorsKey, _watchedSensorKeys);
+ } catch (e) {
+ debugPrint('Error saving watched sensors: $e');
+ }
+ }
+
+ Future _persistVisibleMetrics() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ final encoded = >{};
+ for (final entry in _visibleMetricsBySensor.entries) {
+ encoded[entry.key] = entry.value.map((metric) => metric.name).toList();
+ }
+ await prefs.setString(_visibleSensorMetricsKey, jsonEncode(encoded));
+ } catch (e) {
+ debugPrint('Error saving visible sensor metrics: $e');
+ }
+ }
+
+ Set visibleMetricsFor(String publicKeyHex) =>
+ Set.unmodifiable(
+ _visibleMetricsBySensor[publicKeyHex] ?? _defaultVisibleMetrics,
+ );
+
+ bool showsMetric(String publicKeyHex, SensorMetric metric) =>
+ visibleMetricsFor(publicKeyHex).contains(metric);
+
+ Future toggleMetric(
+ String publicKeyHex,
+ SensorMetric metric,
+ bool visible,
+ ) async {
+ final visibleMetrics = _visibleMetricsBySensor.putIfAbsent(
+ publicKeyHex,
+ () => Set.from(_defaultVisibleMetrics),
+ );
+ if (visible) {
+ visibleMetrics.add(metric);
+ } else {
+ if (visibleMetrics.length == 1 && visibleMetrics.contains(metric)) {
+ return;
+ }
+ visibleMetrics.remove(metric);
+ }
+ await _persistVisibleMetrics();
+ notifyListeners();
+ }
+
+ bool isWatched(String publicKeyHex) =>
+ _watchedSensorKeys.contains(publicKeyHex);
+
+ Future addSensor(Contact contact) async {
+ if (!contact.isChat && !contact.isRepeater) {
+ return;
+ }
+ if (_watchedSensorKeys.contains(contact.publicKeyHex)) {
+ return;
+ }
+
+ _watchedSensorKeys.add(contact.publicKeyHex);
+ await _persistWatchedSensors();
+ _visibleMetricsBySensor[contact.publicKeyHex] = Set.from(
+ _defaultVisibleMetrics,
+ );
+ await _persistVisibleMetrics();
+ notifyListeners();
+ }
+
+ Future removeSensor(String publicKeyHex) async {
+ _watchedSensorKeys.remove(publicKeyHex);
+ _refreshStates.remove(publicKeyHex);
+ _visibleMetricsBySensor.remove(publicKeyHex);
+ await _persistWatchedSensors();
+ await _persistVisibleMetrics();
+ notifyListeners();
+ }
+
+ List availableCandidates(ContactsProvider contactsProvider) {
+ final candidates = [
+ ...contactsProvider.chatContacts,
+ ...contactsProvider.repeaters,
+ ];
+ candidates.removeWhere((contact) => isWatched(contact.publicKeyHex));
+ candidates.sort((a, b) => b.lastSeenTime.compareTo(a.lastSeenTime));
+ return candidates;
+ }
+
+ Future refreshAll({
+ required ContactsProvider contactsProvider,
+ required ConnectionProvider connectionProvider,
+ }) async {
+ if (_isRefreshingAll || _watchedSensorKeys.isEmpty) {
+ return;
+ }
+
+ _isRefreshingAll = true;
+ notifyListeners();
+
+ try {
+ for (final key in _watchedSensorKeys) {
+ Contact? contact;
+ for (final entry in contactsProvider.contacts) {
+ if (entry.publicKeyHex == key) {
+ contact = entry;
+ break;
+ }
+ }
+ if (contact == null) {
+ _refreshStates[key] = SensorRefreshState.unavailable;
+ notifyListeners();
+ continue;
+ }
+
+ _refreshStates[key] = SensorRefreshState.refreshing;
+ notifyListeners();
+
+ final result = await connectionProvider.smartPing(
+ contactPublicKey: contact.publicKey,
+ hasPath: contact.hasPath,
+ );
+
+ _refreshStates[key] = result.success
+ ? SensorRefreshState.success
+ : SensorRefreshState.timeout;
+ notifyListeners();
+ }
+ } finally {
+ _isRefreshingAll = false;
+ notifyListeners();
+ }
+ }
+
+ SensorMetric? _metricFromName(String name) {
+ for (final metric in SensorMetric.values) {
+ if (metric.name == name) {
+ return metric;
+ }
+ }
+ return null;
+ }
+}
diff --git a/lib/providers/voice_provider.dart b/lib/providers/voice_provider.dart
index 96bde9c..adcd223 100644
--- a/lib/providers/voice_provider.dart
+++ b/lib/providers/voice_provider.dart
@@ -71,12 +71,6 @@ class VoiceProvider with ChangeNotifier {
required Uint8List payload,
})?
sendRawPacketCallback;
- Future Function({
- required String sessionId,
- required int index,
- Duration timeout,
- })?
- waitForFragmentAckCallback;
final Map _outgoingSessions = {};
@@ -131,6 +125,23 @@ class VoiceProvider with ChangeNotifier {
return missing;
}
+ List availablePacketIndices(String sessionId) {
+ final outgoing = _outgoingSessions[sessionId];
+ if (outgoing != null) {
+ return outgoing.packets.map((packet) => packet.index).toList()..sort();
+ }
+
+ final session = _sessions[sessionId];
+ if (session == null) return const [];
+ final indices = [];
+ for (var i = 0; i < session.packets.length; i++) {
+ if (session.packets[i] != null) {
+ indices.add(i);
+ }
+ }
+ return indices;
+ }
+
// ── Packet reception ─────────────────────────────────────────────────────
/// Add an incoming [packet] to its session. Creates the session on first packet.
@@ -142,14 +153,18 @@ class VoiceProvider with ChangeNotifier {
);
return false;
}
- _sessions.putIfAbsent(
- packet.sessionId,
- () => VoiceSession(
+ _sessions.putIfAbsent(packet.sessionId, () {
+ if (packet.total < 1) {
+ throw StateError(
+ 'Voice envelope missing for compact packet ${packet.sessionId}',
+ );
+ }
+ return VoiceSession(
sessionId: packet.sessionId,
mode: packet.mode,
total: packet.total,
- ),
- );
+ );
+ });
final session = _sessions[packet.sessionId]!;
if (packet.index < session.total) {
@@ -185,6 +200,47 @@ class VoiceProvider with ChangeNotifier {
}
}
+ void registerEnvelope(VoiceEnvelope envelope) {
+ if (_ignoredIncomingSessions.contains(envelope.sessionId)) {
+ return;
+ }
+ final existing = _sessions[envelope.sessionId];
+ if (existing == null) {
+ _sessions[envelope.sessionId] = VoiceSession(
+ sessionId: envelope.sessionId,
+ mode: envelope.mode,
+ total: envelope.total,
+ );
+ _persistVoiceData();
+ notifyListeners();
+ return;
+ }
+
+ final needsMerge =
+ existing.total != envelope.total || existing.mode != envelope.mode;
+ if (!needsMerge) {
+ notifyListeners();
+ return;
+ }
+
+ final merged = VoiceSession(
+ sessionId: envelope.sessionId,
+ mode: envelope.mode,
+ total: envelope.total,
+ );
+ merged.firstPacketAt = existing.firstPacketAt;
+ merged.lastPacketAt = existing.lastPacketAt;
+ for (final packet in existing.packets) {
+ if (packet == null) continue;
+ if (packet.index < merged.total) {
+ merged.packets[packet.index] = packet;
+ }
+ }
+ _sessions[envelope.sessionId] = merged;
+ _persistVoiceData();
+ notifyListeners();
+ }
+
/// Cache encoded packets for deferred voice serving.
void cacheOutgoingSession(String sessionId, List packets) {
if (packets.isEmpty) return;
@@ -201,10 +257,14 @@ class VoiceProvider with ChangeNotifier {
required Contact requester,
Set? requestedIndices,
}) async {
- final cached = _outgoingSessions[sessionId];
- if (cached == null) {
+ final outgoing = _outgoingSessions[sessionId];
+ final packets = outgoing != null
+ ? List.from(outgoing.packets)
+ : _sessions[sessionId]?.packets.whereType().toList() ??
+ const [];
+ if (packets.isEmpty) {
debugPrint(
- '⚠️ [VoiceProvider] No cached outgoing session for $sessionId',
+ '⚠️ [VoiceProvider] No cached or received session for $sessionId',
);
return false;
}
@@ -212,12 +272,11 @@ class VoiceProvider with ChangeNotifier {
providerLabel: 'VoiceProvider',
sessionId: sessionId,
requester: requester,
- fragments: cached.packets,
+ fragments: packets,
maxDirectPayloadHops: maxDirectPayloadHops,
indexOf: (packet) => packet.index,
encodeBinary: (packet) => packet.encodeBinary(),
sendRawPacket: sendRawPacketCallback,
- waitForFragmentAck: waitForFragmentAckCallback,
requestedIndices: requestedIndices,
);
}
diff --git a/lib/screens/contacts_tab.dart b/lib/screens/contacts_tab.dart
index fd3ec98..3dd82b7 100644
--- a/lib/screens/contacts_tab.dart
+++ b/lib/screens/contacts_tab.dart
@@ -3,6 +3,7 @@ import 'package:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:geolocator/geolocator.dart';
import '../l10n/app_localizations.dart';
+import '../models/contact.dart';
import '../providers/contacts_provider.dart';
import '../providers/app_provider.dart';
import '../providers/connection_provider.dart';
@@ -119,6 +120,43 @@ class _ContactsTabState extends State {
return l10n.daysAgo(diff.inDays);
}
+ List _sortContactsByDistance(List contacts) {
+ final sorted = List.from(contacts);
+
+ sorted.sort((a, b) {
+ final distanceA = _distanceFromCurrentPosition(a);
+ final distanceB = _distanceFromCurrentPosition(b);
+
+ if (distanceA != null && distanceB != null) {
+ final distanceCompare = distanceA.compareTo(distanceB);
+ if (distanceCompare != 0) return distanceCompare;
+ } else if (distanceA != null) {
+ return -1;
+ } else if (distanceB != null) {
+ return 1;
+ }
+
+ return b.lastSeenTime.compareTo(a.lastSeenTime);
+ });
+
+ return sorted;
+ }
+
+ double? _distanceFromCurrentPosition(Contact contact) {
+ final currentPosition = _currentPosition;
+ final contactLocation = contact.displayLocation;
+ if (currentPosition == null || contactLocation == null) {
+ return null;
+ }
+
+ return _calculateDistanceInMeters(
+ currentPosition.latitude,
+ currentPosition.longitude,
+ contactLocation.latitude,
+ contactLocation.longitude,
+ );
+ }
+
/// Show the add channel dialog
Future _showAddChannelDialog(BuildContext context) async {
final l10n = AppLocalizations.of(context)!;
@@ -165,10 +203,12 @@ class _ContactsTabState extends State {
return Scaffold(
body: Consumer(
builder: (context, contactsProvider, child) {
- final chatContacts = contactsProvider.chatContacts;
- final repeaters = contactsProvider.repeaters;
- final rooms = contactsProvider.rooms;
- final channels = contactsProvider.channels;
+ final chatContacts = _sortContactsByDistance(
+ contactsProvider.chatContacts,
+ );
+ final repeaters = _sortContactsByDistance(contactsProvider.repeaters);
+ final rooms = _sortContactsByDistance(contactsProvider.rooms);
+ final channels = _sortContactsByDistance(contactsProvider.channels);
final pendingAdverts = contactsProvider.pendingAdverts;
// Check if there are any displayable contacts (excluding channels)
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 999e565..8b28e10 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -12,6 +12,7 @@ import '../providers/contacts_provider.dart';
import '../theme/app_theme.dart';
import 'messages_tab.dart';
import 'contacts_tab.dart';
+import 'sensors_tab.dart';
import 'map_tab.dart';
import 'map_management_screen.dart';
import 'settings_screen.dart';
@@ -24,7 +25,7 @@ import '../widgets/permission_request_dialog.dart';
import '../widgets/connection_dialog.dart';
import '../utils/battery_display_helper.dart';
-enum _HomeTab { messages, contacts, map }
+enum _HomeTab { messages, contacts, sensors, map }
class HomeScreen extends StatefulWidget {
final Function(AppThemeMode) onThemeChanged;
@@ -54,11 +55,13 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
bool _showRxTxIndicators = true;
bool _isMapEnabled = true;
bool _isContactsEnabled = true;
+ bool _isSensorsEnabled = false;
List<_HomeTab> get _enabledTabs {
return [
_HomeTab.messages,
if (_isContactsEnabled) _HomeTab.contacts,
+ if (_isSensorsEnabled) _HomeTab.sensors,
if (_isMapEnabled) _HomeTab.map,
];
}
@@ -77,6 +80,7 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
_appProvider = context.read();
_isMapEnabled = _appProvider.isMapEnabled;
_isContactsEnabled = _appProvider.isContactsEnabled;
+ _isSensorsEnabled = _appProvider.isSensorsEnabled;
_appProvider.addListener(_handleAppProviderChanged);
// Initialize synchronously so first build always has a valid controller.
@@ -106,6 +110,7 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
_updateTabController(
mapEnabled: _appProvider.isMapEnabled,
contactsEnabled: _appProvider.isContactsEnabled,
+ sensorsEnabled: _appProvider.isSensorsEnabled,
);
}
@@ -129,8 +134,11 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
void _updateTabController({
required bool mapEnabled,
required bool contactsEnabled,
+ required bool sensorsEnabled,
}) {
- if (_isMapEnabled == mapEnabled && _isContactsEnabled == contactsEnabled) {
+ if (_isMapEnabled == mapEnabled &&
+ _isContactsEnabled == contactsEnabled &&
+ _isSensorsEnabled == sensorsEnabled) {
return;
}
@@ -147,6 +155,7 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
// Update state
_isMapEnabled = mapEnabled;
_isContactsEnabled = contactsEnabled;
+ _isSensorsEnabled = sensorsEnabled;
if (!_isMapEnabled) {
_isMapFullscreen = false;
}
@@ -183,6 +192,8 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
case _HomeTab.contacts:
context.read().markAllAsViewed();
break;
+ case _HomeTab.sensors:
+ break;
case _HomeTab.map:
break;
}
@@ -471,6 +482,8 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
? () => _navigateToTab(_HomeTab.map)
: null,
);
+ case _HomeTab.sensors:
+ return const SensorsTab();
case _HomeTab.map:
return MapTab(
onFullscreenChanged: (isFullscreen) {
@@ -502,6 +515,13 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
),
child: TabBar(
controller: _tabController,
+ onTap: (index) {
+ final tabs = _enabledTabs;
+ if (index < 0 || index >= tabs.length) {
+ return;
+ }
+ _handleTabActivated(tabs[index]);
+ },
tabs: enabledTabs.map((tab) {
switch (tab) {
case _HomeTab.messages:
@@ -525,6 +545,11 @@ class _HomeScreenState extends State with TickerProviderStateMixin {
icon: const Icon(Icons.map),
text: AppLocalizations.of(context)!.map,
);
+ case _HomeTab.sensors:
+ return const Tab(
+ icon: Icon(Icons.sensors),
+ text: 'Sensors',
+ );
}
}).toList(),
),
diff --git a/lib/screens/map_tab.dart b/lib/screens/map_tab.dart
index edf86a0..be80c18 100644
--- a/lib/screens/map_tab.dart
+++ b/lib/screens/map_tab.dart
@@ -76,6 +76,7 @@ class _MapTabState extends State with AutomaticKeepAliveClientMixin {
final BackgroundLocationService _backgroundLocationService =
BackgroundLocationService();
bool _isDisposing = false; // Flag to prevent updates during disposal
+ MapProvider? _mapProvider;
// MBTiles layers
List _mbtilesLayers = [];
@@ -129,6 +130,7 @@ class _MapTabState extends State with AutomaticKeepAliveClientMixin {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return; // Check if widget is still mounted
final mapProvider = context.read();
+ _mapProvider = mapProvider;
mapProvider.addListener(_handleMapNavigation);
// Load WMS overlay state
mapProvider.loadOverlayState();
@@ -438,8 +440,7 @@ class _MapTabState extends State with AutomaticKeepAliveClientMixin {
// Save map position before disposing
_saveMapPosition();
- final mapProvider = context.read();
- mapProvider.removeListener(_handleMapNavigation);
+ _mapProvider?.removeListener(_handleMapNavigation);
// DO NOT stop location tracking - it's managed by AppProvider
// Restore the original callback instead of setting to null
diff --git a/lib/screens/messages_tab.dart b/lib/screens/messages_tab.dart
index e3b4056..2380efd 100644
--- a/lib/screens/messages_tab.dart
+++ b/lib/screens/messages_tab.dart
@@ -19,7 +19,9 @@ import '../models/message.dart';
import '../models/contact.dart';
import '../widgets/messages/sar_update_sheet.dart';
import '../widgets/messages/recipient_selector_sheet.dart';
-import '../widgets/messages/message_bubble.dart';
+import '../widgets/messages/messages_composer.dart';
+import '../widgets/messages/messages_content.dart';
+import '../widgets/common/contact_avatar.dart';
import '../services/message_destination_preferences.dart';
import '../services/voice_bitrate_preferences.dart';
import '../services/voice_recorder_service.dart';
@@ -47,6 +49,7 @@ class MessagesTab extends StatefulWidget {
class _MessagesTabState extends State {
static const int _maxContactMessageBytes = 156;
static const int _maxChannelMessageBytes = 127;
+ static const double _composerOverlayHeight = 148;
final TextEditingController _textController = TextEditingController();
final FocusNode _focusNode = FocusNode();
@@ -314,20 +317,6 @@ class _MessagesTabState extends State {
}
}
- /// Get tooltip for destination button
- String _getDestinationTooltip() {
- if (_destinationType ==
- MessageDestinationPreferences.destinationTypeChannel &&
- _selectedRecipient != null) {
- final channelName = _selectedRecipient!.getLocalizedDisplayName(context);
- return '$channelName (tap to change)';
- } else if (_selectedRecipient != null) {
- final recipientName = _selectedRecipient!.displayName;
- return '$recipientName (tap to change)';
- }
- return 'Select recipient';
- }
-
String _getDestinationLabel() {
if (_destinationType ==
MessageDestinationPreferences.destinationTypeChannel &&
@@ -466,10 +455,7 @@ class _MessagesTabState extends State {
);
// Add to messages list with "sending" status
- messagesProvider.addSentMessage(
- sentMessage,
- contact: _selectedRecipient,
- );
+ messagesProvider.addSentMessage(sentMessage, contact: _selectedRecipient);
// Send message to selected recipient
final sentSuccessfully = await connectionProvider.sendTextMessage(
@@ -589,9 +575,9 @@ class _MessagesTabState extends State {
if (_destinationType ==
MessageDestinationPreferences.destinationTypeContact &&
_selectedRecipient != null &&
- _selectedRecipient!.outPathLen >= 0) {
+ _selectedRecipient!.routeHasPath) {
imageDataBytesPerFragment = safeImageDataBytesForPath(
- _selectedRecipient!.outPathLen,
+ _selectedRecipient!.routeHopCount,
);
}
@@ -615,11 +601,6 @@ class _MessagesTabState extends State {
ToastLogger.error(context, 'Device key unavailable');
return;
}
- final senderKey6 = deviceKey
- .sublist(0, 6)
- .map((b) => b.toRadixString(16).padLeft(2, '0'))
- .join();
-
final envelope = ImageEnvelope(
sessionId: sessionId,
format: ImageFormat.avif,
@@ -627,8 +608,6 @@ class _MessagesTabState extends State {
width: result.width,
height: result.height,
sizeBytes: compressed.length,
- senderKey6: senderKey6,
- timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
);
if (!mounted) return;
@@ -929,9 +908,6 @@ class _MessagesTabState extends State {
return;
}
- final senderKey6 = senderPublicKeyPrefix
- .map((b) => b.toRadixString(16).padLeft(2, '0'))
- .join('');
final durationMs = encodedPackets.fold(
0,
(sum, p) => sum + p.durationMs,
@@ -941,9 +917,7 @@ class _MessagesTabState extends State {
mode: mode,
total: encodedPackets.length,
durationMs: durationMs,
- senderKey6: senderKey6,
- timestampSec: DateTime.now().millisecondsSinceEpoch ~/ 1000,
- version: 1,
+ version: 3,
);
final envelopeText = envelope.encodeText();
@@ -1115,6 +1089,16 @@ class _MessagesTabState extends State {
);
}
+ Future _runAfterSheetDismissal(
+ BuildContext sheetContext,
+ Future Function() action,
+ ) async {
+ Navigator.pop(sheetContext);
+ await Future.delayed(const Duration(milliseconds: 180));
+ if (!mounted) return;
+ await action();
+ }
+
void _showComposerActions() {
showModalBottomSheet(
context: context,
@@ -1126,9 +1110,10 @@ class _MessagesTabState extends State {
ListTile(
leading: const Icon(Icons.add_location_alt),
title: Text(AppLocalizations.of(context)!.sendSarMarker),
- onTap: () {
- Navigator.pop(sheetContext);
- _showSarDialog();
+ onTap: () async {
+ await _runAfterSheetDismissal(sheetContext, () async {
+ _showSarDialog();
+ });
},
),
if (_voiceSupported)
@@ -1138,13 +1123,14 @@ class _MessagesTabState extends State {
title: Text(_isRecording ? 'Stop recording' : 'Record voice'),
onTap: _isSendingVoice
? null
- : () {
- Navigator.pop(sheetContext);
- if (_isRecording) {
- _stopAndSendVoice();
- } else {
- _startVoiceRecording();
- }
+ : () async {
+ await _runAfterSheetDismissal(sheetContext, () async {
+ if (_isRecording) {
+ await _stopAndSendVoice();
+ } else {
+ await _startVoiceRecording();
+ }
+ });
},
),
ListTile(
@@ -1153,9 +1139,10 @@ class _MessagesTabState extends State {
title: const Text('Send image from gallery'),
onTap: _isSendingImage
? null
- : () {
- Navigator.pop(sheetContext);
- _pickAndSendImage(source: ImageSource.gallery);
+ : () async {
+ await _runAfterSheetDismissal(sheetContext, () async {
+ await _pickAndSendImage(source: ImageSource.gallery);
+ });
},
),
ListTile(
@@ -1164,18 +1151,20 @@ class _MessagesTabState extends State {
title: const Text('Take photo'),
onTap: _isSendingImage
? null
- : () {
- Navigator.pop(sheetContext);
- _pickAndSendImage(source: ImageSource.camera);
+ : () async {
+ await _runAfterSheetDismissal(sheetContext, () async {
+ await _pickAndSendImage(source: ImageSource.camera);
+ });
},
),
ListTile(
leading: const Icon(Icons.grid_3x3),
title: const Text('Start Tic-Tac-Toe'),
subtitle: const Text('DM only'),
- onTap: () {
- Navigator.pop(sheetContext);
- _startTicTacToeGame();
+ onTap: () async {
+ await _runAfterSheetDismissal(sheetContext, () async {
+ await _startTicTacToeGame();
+ });
},
),
],
@@ -1185,6 +1174,23 @@ class _MessagesTabState extends State {
);
}
+ Widget _buildDestinationAvatar(BuildContext context) {
+ final recipient = _selectedRecipient;
+ if (recipient != null) {
+ return ContactAvatar(
+ contact: recipient,
+ radius: 14,
+ displayName: _getDestinationLabel(),
+ );
+ }
+
+ return Icon(
+ _getDestinationIcon(),
+ size: 17,
+ color: Theme.of(context).colorScheme.onSurfaceVariant,
+ );
+ }
+
Future _sendSarMessage(
String emoji,
String name,
@@ -1496,6 +1502,28 @@ class _MessagesTabState extends State {
return filteredMessages;
}
+ void _handleMessageTap(Message message) {
+ if (widget.onNavigateToMap == null) return;
+
+ if (message.isSarMarker && message.sarGpsCoordinates != null) {
+ final mapProvider = context.read();
+ mapProvider.navigateToLocation(
+ location: message.sarGpsCoordinates!,
+ zoom: 15.0,
+ );
+ widget.onNavigateToMap?.call();
+ return;
+ }
+
+ if (message.isDrawing && message.drawingId != null) {
+ debugPrint('🗺️ [MessagesTab] Drawing tapped! ID: ${message.drawingId}');
+ final mapProvider = context.read();
+ final drawingProvider = context.read();
+ mapProvider.navigateToDrawing(message.drawingId!, drawingProvider);
+ widget.onNavigateToMap?.call();
+ }
+ }
+
@override
Widget build(BuildContext context) {
return Consumer(
@@ -1507,552 +1535,41 @@ class _MessagesTabState extends State {
return GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () => FocusScope.of(context).unfocus(),
- child: Column(
+ child: Stack(
children: [
- // Messages list with pull-to-refresh
- Expanded(
- child: RefreshIndicator(
+ Positioned.fill(
+ child: MessagesContent(
+ messages: messages,
+ scrollController: _scrollController,
+ highlightedMessageId: _highlightedMessageId,
+ bottomContentPadding:
+ _composerOverlayHeight + composerBottomPadding,
onRefresh: _handleRefresh,
- child: messages.isEmpty
- ? LayoutBuilder(
- builder: (context, constraints) =>
- SingleChildScrollView(
- keyboardDismissBehavior:
- ScrollViewKeyboardDismissBehavior.onDrag,
- physics:
- const AlwaysScrollableScrollPhysics(),
- child: ConstrainedBox(
- constraints: BoxConstraints(
- minHeight: constraints.maxHeight,
- ),
- child: Center(
- child: Column(
- mainAxisAlignment:
- MainAxisAlignment.center,
- children: [
- Icon(
- Icons.message_outlined,
- size: 64,
- color: Theme.of(
- context,
- ).disabledColor,
- ),
- const SizedBox(height: 16),
- Text(
- AppLocalizations.of(
- context,
- )!.noMessagesYet,
- style: Theme.of(
- context,
- ).textTheme.titleLarge,
- ),
- const SizedBox(height: 8),
- Text(
- AppLocalizations.of(
- context,
- )!.pullDownToSync,
- style: Theme.of(
- context,
- ).textTheme.bodyMedium,
- textAlign: TextAlign.center,
- ),
- ],
- ),
- ),
- ),
- ),
- )
- : ListView.builder(
- controller: _scrollController,
- keyboardDismissBehavior:
- ScrollViewKeyboardDismissBehavior.onDrag,
- reverse: true,
- padding: const EdgeInsets.all(8),
- itemCount: messages.length,
- itemBuilder: (context, index) {
- final message = messages[index];
- final isHighlighted =
- message.id == _highlightedMessageId;
-
- return MessageBubble(
- key: ValueKey(message.id),
- message: message,
- isHighlighted: isHighlighted,
- onNavigateToMap: widget.onNavigateToMap,
- onTap:
- widget.onNavigateToMap != null &&
- message.isSarMarker &&
- message.sarGpsCoordinates != null
- ? () {
- final mapProvider = context
- .read();
- mapProvider.navigateToLocation(
- location: message.sarGpsCoordinates!,
- zoom: 15.0,
- );
- widget.onNavigateToMap?.call();
- }
- : widget.onNavigateToMap != null &&
- message.isDrawing &&
- message.drawingId != null
- ? () {
- debugPrint(
- '🗺️ [MessagesTab] Drawing tapped! ID: ${message.drawingId}',
- );
- final mapProvider = context
- .read();
- final drawingProvider = context
- .read();
- mapProvider.navigateToDrawing(
- message.drawingId!,
- drawingProvider,
- );
- widget.onNavigateToMap?.call();
- }
- : null,
- );
- },
- ),
+ onNavigateToMap: widget.onNavigateToMap,
+ onMessageTap: _handleMessageTap,
),
),
-
- // Message input area
- Container(
- decoration: BoxDecoration(
- color: Theme.of(context).colorScheme.surface,
- ),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- SafeArea(
- top: false,
- child: Padding(
- padding: EdgeInsets.fromLTRB(
- 10,
- 10,
- 10,
- composerBottomPadding,
- ),
- child: Container(
- decoration: BoxDecoration(
- color: Theme.of(
- context,
- ).colorScheme.surfaceContainerLow,
- borderRadius: BorderRadius.circular(28),
- border: Border.all(
- color: Theme.of(
- context,
- ).dividerColor.withValues(alpha: 0.35),
- ),
- boxShadow: [
- BoxShadow(
- color: Colors.black.withValues(alpha: 0.05),
- blurRadius: 18,
- offset: const Offset(0, 6),
- ),
- ],
- ),
- child: Padding(
- padding: const EdgeInsets.fromLTRB(10, 10, 10, 8),
- child: Column(
- mainAxisSize: MainAxisSize.min,
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- Row(
- children: [
- Container(
- width: 42,
- height: 42,
- decoration: BoxDecoration(
- color: Theme.of(
- context,
- ).colorScheme.surface,
- shape: BoxShape.circle,
- border: Border.all(
- color: Theme.of(
- context,
- ).dividerColor.withValues(alpha: 0.35),
- ),
- ),
- child: IconButton(
- icon: Icon(
- _isRecording ? Icons.stop : Icons.add,
- size: 22,
- ),
- tooltip: _isRecording
- ? 'Stop recording'
- : 'More actions',
- onPressed: _isRecording
- ? _stopAndSendVoice
- : _showComposerActions,
- color: _isRecording
- ? Colors.red
- : Theme.of(
- context,
- ).colorScheme.primary,
- ),
- ),
- const SizedBox(width: 8),
- Expanded(
- child: Material(
- color: Colors.transparent,
- child: InkWell(
- borderRadius: BorderRadius.circular(20),
- onTap: _showRecipientSelector,
- child: Ink(
- height: 42,
- decoration: BoxDecoration(
- color: Theme.of(
- context,
- ).colorScheme.surface,
- borderRadius: BorderRadius.circular(
- 20,
- ),
- border: Border.all(
- color: Theme.of(context)
- .dividerColor
- .withValues(alpha: 0.35),
- ),
- ),
- child: Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 14,
- ),
- child: Row(
- children: [
- Icon(
- _getDestinationIcon(),
- size: 17,
- color: Theme.of(context)
- .colorScheme
- .onSurfaceVariant,
- ),
- const SizedBox(width: 10),
- Expanded(
- child: Text(
- _getDestinationLabel(),
- overflow:
- TextOverflow.ellipsis,
- style: TextStyle(
- fontSize: 15,
- fontWeight:
- FontWeight.w600,
- color: Theme.of(
- context,
- ).colorScheme.onSurface,
- ),
- ),
- ),
- Icon(
- Icons.expand_more_rounded,
- size: 20,
- color: Theme.of(context)
- .colorScheme
- .onSurfaceVariant,
- ),
- ],
- ),
- ),
- ),
- ),
- ),
- ),
- ],
- ),
- const SizedBox(height: 8),
- Row(
- crossAxisAlignment: CrossAxisAlignment.center,
- children: [
- Expanded(
- child: AnimatedContainer(
- duration: const Duration(
- milliseconds: 180,
- ),
- constraints: const BoxConstraints(
- minHeight: 46,
- maxHeight: 132,
- ),
- decoration: BoxDecoration(
- color: Theme.of(
- context,
- ).colorScheme.surface,
- borderRadius: BorderRadius.circular(24),
- border: Border.all(
- color: _focusNode.hasFocus
- ? Theme.of(
- context,
- ).colorScheme.primary
- : Theme.of(context).dividerColor
- .withValues(alpha: 0.35),
- width: _focusNode.hasFocus ? 1.4 : 1,
- ),
- boxShadow: _focusNode.hasFocus
- ? [
- BoxShadow(
- color: Theme.of(context)
- .colorScheme
- .primary
- .withValues(alpha: 0.10),
- blurRadius: 12,
- offset: const Offset(0, 4),
- ),
- ]
- : null,
- ),
- child: Padding(
- padding: const EdgeInsets.symmetric(
- horizontal: 16,
- vertical: 12,
- ),
- child: TextField(
- controller: _textController,
- focusNode: _focusNode,
- minLines: 1,
- maxLines: 4,
- keyboardType: TextInputType.multiline,
- inputFormatters: [
- _messageByteLimiter,
- ],
- style: const TextStyle(fontSize: 15),
- textAlignVertical:
- TextAlignVertical.center,
- decoration: InputDecoration(
- hintText: AppLocalizations.of(
- context,
- )!.typeYourMessage,
- hintStyle: TextStyle(
- fontSize: 15,
- color: Theme.of(context)
- .colorScheme
- .onSurfaceVariant
- .withValues(alpha: 0.9),
- ),
- filled: false,
- fillColor: Colors.transparent,
- border: InputBorder.none,
- isCollapsed: true,
- ),
- textInputAction:
- TextInputAction.newline,
- ),
- ),
- ),
- ),
- const SizedBox(width: 8),
- Builder(
- builder: (context) {
- final canSendText =
- !_isRecording &&
- !_isSendingVoice &&
- _textController.text
- .trim()
- .isNotEmpty;
- final semanticsLabel = _isRecording
- ? 'Recording... release to send voice'
- : (_isSendingVoice
- ? 'Sending voice...'
- : _voiceSupported
- ? 'Send (long press to record voice)'
- : 'Send');
-
- return Semantics(
- button: true,
- enabled:
- canSendText ||
- (_voiceSupported &&
- !_isSendingVoice),
- label: semanticsLabel,
- onTap: canSendText
- ? _sendMessage
- : null,
- onLongPress:
- (_voiceSupported &&
- !_isSendingVoice)
- ? () {
- if (_isRecording) {
- _stopAndSendVoice();
- return;
- }
- _startVoiceRecording();
- }
- : null,
- child: Tooltip(
- message: semanticsLabel,
- excludeFromSemantics: true,
- child: GestureDetector(
- excludeFromSemantics: true,
- onTap: canSendText
- ? () {
- debugPrint(
- '👆 [MessagesTab] Send button tapped '
- '(canSendText=$canSendText, '
- 'textLength=${_textController.text.trim().length}, '
- 'recording=$_isRecording, '
- 'sendingVoice=$_isSendingVoice)',
- );
- _sendMessage();
- }
- : null,
- onLongPressStart:
- (_voiceSupported &&
- !_isSendingVoice)
- ? (_) {
- debugPrint(
- '🎙️ [MessagesTab] Send button long-press start '
- '(voiceSupported=$_voiceSupported, '
- 'sendingVoice=$_isSendingVoice, '
- 'recording=$_isRecording)',
- );
- _startVoiceRecording();
- }
- : null,
- onLongPressEnd:
- (_voiceSupported &&
- _isRecording)
- ? (_) {
- debugPrint(
- '🎙️ [MessagesTab] Send button long-press end '
- '(recording=$_isRecording)',
- );
- _stopAndSendVoice();
- }
- : null,
- onLongPressCancel:
- (_voiceSupported &&
- _isRecording)
- ? () {
- debugPrint(
- '🎙️ [MessagesTab] Send button long-press cancel '
- '(recording=$_isRecording)',
- );
- _stopAndSendVoice();
- }
- : null,
- child: Column(
- mainAxisSize: MainAxisSize.min,
- children: [
- AnimatedContainer(
- duration: const Duration(
- milliseconds: 180,
- ),
- width: 46,
- height: 46,
- decoration: BoxDecoration(
- color:
- canSendText ||
- _isRecording
- ? Theme.of(
- context,
- ).colorScheme.primary
- : Theme.of(
- context,
- ).colorScheme.surface,
- shape: BoxShape.circle,
- border: Border.all(
- color:
- canSendText ||
- _isRecording
- ? Colors.transparent
- : Theme.of(context)
- .dividerColor
- .withValues(
- alpha: 0.35,
- ),
- ),
- boxShadow:
- canSendText ||
- _isRecording
- ? [
- BoxShadow(
- color:
- Theme.of(
- context,
- )
- .colorScheme
- .primary
- .withValues(
- alpha:
- 0.22,
- ),
- blurRadius: 14,
- offset:
- const Offset(
- 0,
- 6,
- ),
- ),
- ]
- : null,
- ),
- child: _isSendingVoice
- ? Center(
- child: CircularProgressIndicator(
- strokeWidth: 2,
- color:
- Theme.of(
- context,
- )
- .colorScheme
- .onPrimary,
- ),
- )
- : Icon(
- _isRecording
- ? Icons
- .mic_rounded
- : Icons
- .send_rounded,
- size: 22,
- color:
- canSendText ||
- _isRecording
- ? Theme.of(
- context,
- )
- .colorScheme
- .onPrimary
- : Theme.of(
- context,
- )
- .colorScheme
- .onSurfaceVariant,
- ),
- ),
- const SizedBox(height: 4),
- Text(
- '$_messageByteCount/$_maxMessageBytes',
- style: TextStyle(
- fontSize: 11,
- fontWeight: FontWeight.w500,
- color:
- _messageByteCount >
- _maxMessageBytes *
- 0.9
- ? Colors.orange.shade800
- : Theme.of(context)
- .colorScheme
- .onSurfaceVariant
- .withValues(
- alpha: 0.9,
- ),
- ),
- ),
- ],
- ),
- ),
- ),
- );
- },
- ),
- ],
- ),
- ],
- ),
- ),
- ),
- ),
- ),
- ],
+ Positioned(
+ left: 0,
+ right: 0,
+ bottom: 0,
+ child: MessagesComposer(
+ textController: _textController,
+ focusNode: _focusNode,
+ messageByteLimiter: _messageByteLimiter,
+ messageByteCount: _messageByteCount,
+ maxMessageBytes: _maxMessageBytes,
+ isRecording: _isRecording,
+ isSendingVoice: _isSendingVoice,
+ voiceSupported: _voiceSupported,
+ bottomPadding: composerBottomPadding,
+ destinationLabel: _getDestinationLabel(),
+ destinationAvatar: _buildDestinationAvatar(context),
+ onShowComposerActions: _showComposerActions,
+ onShowRecipientSelector: _showRecipientSelector,
+ onStartVoiceRecording: _startVoiceRecording,
+ onStopAndSendVoice: _stopAndSendVoice,
+ onSendMessage: _sendMessage,
),
),
],
diff --git a/lib/screens/packet_log_screen.dart b/lib/screens/packet_log_screen.dart
index ec05782..25e607c 100644
--- a/lib/screens/packet_log_screen.dart
+++ b/lib/screens/packet_log_screen.dart
@@ -1,10 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
+import 'package:provider/provider.dart';
import 'package:share_plus/share_plus.dart';
import 'dart:io';
import 'package:path_provider/path_provider.dart';
import 'package:meshcore_client/meshcore_client.dart';
import '../l10n/app_localizations.dart';
+import '../providers/connection_provider.dart';
+import '../providers/contacts_provider.dart';
+import '../utils/log_rx_route_decoder.dart';
class PacketLogScreen extends StatefulWidget {
final MeshCoreBleService bleService;
@@ -456,6 +460,26 @@ class _PacketLogCard extends StatelessWidget {
final isRx = log.direction == PacketDirection.rx;
final directionColor = isRx ? Colors.green : Colors.blue;
final rxInfo = log.logRxDataInfo;
+ final contacts = context.watch().contacts;
+ final connectionProvider = context.watch();
+ final decodedRoute = LogRxRouteDecoder.decode(log.rawData);
+ final ownPublicKey = connectionProvider.deviceInfo.publicKey;
+ final ownName =
+ connectionProvider.deviceInfo.selfName ??
+ connectionProvider.deviceInfo.displayName;
+ final resolvedPath = decodedRoute?.pathHashes
+ .map(
+ (hash) => LogRxRouteDecoder.resolveHash(
+ hash,
+ contacts: contacts,
+ ownPublicKey: ownPublicKey,
+ ownName: ownName,
+ ),
+ )
+ .toList();
+ final originalSender = resolvedPath != null && resolvedPath.isNotEmpty
+ ? resolvedPath.first
+ : null;
return Card(
margin: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
@@ -580,6 +604,14 @@ class _PacketLogCard extends StatelessWidget {
),
),
],
+ if (isRx && decodedRoute != null) ...[
+ const SizedBox(height: 12),
+ _RouteSection(
+ route: decodedRoute,
+ path: resolvedPath ?? const [],
+ originalSender: originalSender,
+ ),
+ ],
const SizedBox(height: 12),
Container(
padding: const EdgeInsets.all(12),
@@ -723,6 +755,162 @@ class _PacketLogCard extends StatelessWidget {
}
}
+class _RouteSection extends StatelessWidget {
+ final DecodedLogRxRoute route;
+ final List path;
+ final ResolvedNodeHash? originalSender;
+
+ const _RouteSection({
+ required this.route,
+ required this.path,
+ required this.originalSender,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ padding: const EdgeInsets.all(12),
+ decoration: BoxDecoration(
+ color: Theme.of(
+ context,
+ ).colorScheme.surfaceContainerHighest.withValues(alpha: 0.5),
+ borderRadius: BorderRadius.circular(10),
+ ),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ const Row(
+ children: [
+ Icon(Icons.alt_route, size: 16),
+ SizedBox(width: 6),
+ Text(
+ 'Mesh Route',
+ style: TextStyle(fontWeight: FontWeight.w700, fontSize: 12),
+ ),
+ ],
+ ),
+ const SizedBox(height: 10),
+ Wrap(
+ spacing: 10,
+ runSpacing: 10,
+ children: [
+ _FactCard(
+ icon: Icons.route,
+ label: 'Payload',
+ value: _payloadTypeLabel(route.payloadType),
+ ),
+ _FactCard(
+ icon: Icons.hub,
+ label: 'Hops',
+ value: '${route.pathHashes.length}',
+ ),
+ if (originalSender != null)
+ _FactCard(
+ icon: Icons.person_pin_circle,
+ label: 'Original sender',
+ value: _nodeLabel(originalSender!),
+ ),
+ ],
+ ),
+ const SizedBox(height: 12),
+ if (path.isEmpty)
+ Text(
+ 'Direct packet, no hop path attached.',
+ style: TextStyle(fontSize: 12, color: Colors.grey[700]),
+ )
+ else
+ Wrap(
+ spacing: 6,
+ runSpacing: 6,
+ children: [
+ for (var i = 0; i < path.length; i++) ...[
+ _RouteHopChip(index: i + 1, node: path[i]),
+ if (i < path.length - 1)
+ const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 2),
+ child: Icon(Icons.arrow_right_alt, size: 16),
+ ),
+ ],
+ ],
+ ),
+ ],
+ ),
+ );
+ }
+
+ static String _payloadTypeLabel(int payloadType) {
+ switch (payloadType) {
+ case 0x00:
+ return 'REQ';
+ case 0x01:
+ return 'RESP';
+ case 0x02:
+ return 'TXT';
+ case 0x03:
+ return 'ACK';
+ case 0x04:
+ return 'ADVERT';
+ case 0x05:
+ return 'GRP_TXT';
+ case 0x06:
+ return 'GRP_DATA';
+ case 0x07:
+ return 'ANON_REQ';
+ case 0x08:
+ return 'PATH';
+ case 0x09:
+ return 'TRACE';
+ case 0x0A:
+ return 'MULTIPART';
+ case 0x0B:
+ return 'CONTROL';
+ default:
+ return '0x${payloadType.toRadixString(16).padLeft(2, '0')}';
+ }
+ }
+
+ static String _nodeLabel(ResolvedNodeHash node) {
+ if (node.isOwnNode) {
+ return '${node.label} (${node.hexLabel})';
+ }
+ if (node.matchCount == 0) {
+ return node.hexLabel;
+ }
+ if (node.isUniqueMatch) {
+ return '${node.label} (${node.hexLabel})';
+ }
+ return '${node.label} (${node.hexLabel}, ${node.matchCount} matches)';
+ }
+}
+
+class _RouteHopChip extends StatelessWidget {
+ final int index;
+ final ResolvedNodeHash node;
+
+ const _RouteHopChip({required this.index, required this.node});
+
+ @override
+ Widget build(BuildContext context) {
+ final color = node.isOwnNode
+ ? Colors.blue
+ : node.isUniqueMatch
+ ? Colors.green
+ : Colors.orange;
+ return Container(
+ padding: const EdgeInsets.symmetric(horizontal: 10, vertical: 8),
+ decoration: BoxDecoration(
+ color: color.withValues(alpha: 0.12),
+ borderRadius: BorderRadius.circular(999),
+ border: Border.all(color: color.withValues(alpha: 0.35)),
+ ),
+ child: Text(
+ '$index. ${_RouteSection._nodeLabel(node)}',
+ style: const TextStyle(fontSize: 12, fontWeight: FontWeight.w600),
+ ),
+ );
+ }
+}
+
class _FactCard extends StatelessWidget {
final IconData icon;
final String label;
diff --git a/lib/screens/sensors_tab.dart b/lib/screens/sensors_tab.dart
new file mode 100644
index 0000000..dd8ed3e
--- /dev/null
+++ b/lib/screens/sensors_tab.dart
@@ -0,0 +1,735 @@
+import 'package:flutter/material.dart';
+import 'package:provider/provider.dart';
+
+import '../l10n/app_localizations.dart';
+import '../models/contact.dart';
+import '../providers/connection_provider.dart';
+import '../providers/contacts_provider.dart';
+import '../providers/sensors_provider.dart';
+
+class SensorsTab extends StatelessWidget {
+ const SensorsTab({super.key});
+
+ Future _showAddSensorSheet(BuildContext context) async {
+ final sensorsProvider = context.read();
+ final contactsProvider = context.read();
+ final candidates = sensorsProvider.availableCandidates(contactsProvider);
+
+ await showModalBottomSheet(
+ context: context,
+ showDragHandle: true,
+ builder: (sheetContext) {
+ if (candidates.isEmpty) {
+ return const SafeArea(
+ child: Padding(
+ padding: EdgeInsets.all(24),
+ child: Text(
+ 'No eligible nodes available. Discover a relay or node first.',
+ ),
+ ),
+ );
+ }
+
+ return SafeArea(
+ child: ListView(
+ shrinkWrap: true,
+ padding: const EdgeInsets.only(bottom: 20),
+ children: [
+ const ListTile(
+ title: Text(
+ 'Add sensor node',
+ style: TextStyle(fontWeight: FontWeight.bold),
+ ),
+ subtitle: Text('Pick a relay or node to watch in Sensors.'),
+ ),
+ ...candidates.map(
+ (contact) => ListTile(
+ contentPadding: const EdgeInsets.symmetric(
+ horizontal: 20,
+ vertical: 4,
+ ),
+ leading: CircleAvatar(
+ radius: 24,
+ backgroundColor: const Color(0xFFDDEAF8),
+ child: Icon(
+ _typeIcon(contact),
+ color: const Color(0xFF1E4F7A),
+ ),
+ ),
+ title: Text(contact.displayName),
+ subtitle: _SensorCandidatePreview(contact: contact),
+ isThreeLine: true,
+ onTap: () async {
+ await sensorsProvider.addSensor(contact);
+ if (!sheetContext.mounted) return;
+ Navigator.of(sheetContext).pop();
+ ScaffoldMessenger.of(context).showSnackBar(
+ SnackBar(
+ content: Text(
+ '${contact.displayName} added to Sensors',
+ ),
+ ),
+ );
+ },
+ ),
+ ),
+ ],
+ ),
+ );
+ },
+ );
+ }
+
+ Future _showMetricSelector(
+ BuildContext context,
+ String publicKeyHex,
+ ) async {
+ await showModalBottomSheet(
+ context: context,
+ showDragHandle: true,
+ builder: (sheetContext) => Consumer(
+ builder: (context, sensorsProvider, child) {
+ final visibleMetrics = sensorsProvider.visibleMetricsFor(
+ publicKeyHex,
+ );
+ return SafeArea(
+ child: ListView(
+ shrinkWrap: true,
+ padding: const EdgeInsets.fromLTRB(20, 0, 20, 24),
+ children: [
+ Text(
+ 'Visible fields',
+ style: Theme.of(context).textTheme.titleLarge,
+ ),
+ const SizedBox(height: 8),
+ Text(
+ 'Choose which values appear on sensor cards.',
+ style: Theme.of(context).textTheme.bodyMedium,
+ ),
+ const SizedBox(height: 20),
+ Wrap(
+ spacing: 10,
+ runSpacing: 10,
+ children: SensorMetric.values.map((metric) {
+ final visible = visibleMetrics.contains(metric);
+ return FilterChip(
+ selected: visible,
+ label: Text(_metricLabel(metric)),
+ onSelected: (value) {
+ sensorsProvider.toggleMetric(
+ publicKeyHex,
+ metric,
+ value,
+ );
+ },
+ );
+ }).toList(),
+ ),
+ ],
+ ),
+ );
+ },
+ ),
+ );
+ }
+
+ Future _refreshAll(BuildContext context) async {
+ await context.read().refreshAll(
+ contactsProvider: context.read(),
+ connectionProvider: context.read(),
+ );
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Scaffold(
+ floatingActionButton: FloatingActionButton(
+ onPressed: () => _showAddSensorSheet(context),
+ child: const Icon(Icons.add),
+ ),
+ body: Consumer2(
+ builder: (context, sensorsProvider, contactsProvider, child) {
+ final watchedKeys = sensorsProvider.watchedSensorKeys;
+
+ return RefreshIndicator(
+ onRefresh: () => _refreshAll(context),
+ child: ListView(
+ padding: const EdgeInsets.fromLTRB(16, 16, 16, 96),
+ children: [
+ if (watchedKeys.isEmpty)
+ const _EmptySensorsState()
+ else
+ ...watchedKeys.map((key) {
+ Contact? contact;
+ for (final entry in contactsProvider.contacts) {
+ if (entry.publicKeyHex == key) {
+ contact = entry;
+ break;
+ }
+ }
+ return _SensorCard(
+ contact: contact,
+ state: sensorsProvider.stateFor(key),
+ visibleMetrics: sensorsProvider.visibleMetricsFor(key),
+ onRemove: () async {
+ await sensorsProvider.removeSensor(key);
+ },
+ onCustomize: () => _showMetricSelector(context, key),
+ );
+ }),
+ ],
+ ),
+ );
+ },
+ ),
+ );
+ }
+}
+
+class _SensorCandidatePreview extends StatelessWidget {
+ final Contact contact;
+
+ const _SensorCandidatePreview({required this.contact});
+
+ @override
+ Widget build(BuildContext context) {
+ final telemetry = contact.telemetry;
+ final previewLines = [
+ '${contact.type.displayName} • ${contact.publicKeyShort}',
+ if (telemetry?.batteryPercentage != null)
+ 'Battery ${telemetry!.batteryPercentage!.toStringAsFixed(0)}% • '
+ 'Temp ${telemetry.temperature?.toStringAsFixed(1) ?? '--'}°C',
+ if (telemetry?.gpsLocation != null)
+ 'GPS ${telemetry!.gpsLocation!.latitude.toStringAsFixed(3)}, '
+ '${telemetry.gpsLocation!.longitude.toStringAsFixed(3)}',
+ ];
+
+ if (previewLines.length == 1) {
+ previewLines.add('No telemetry preview available yet');
+ }
+
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ mainAxisSize: MainAxisSize.min,
+ children: previewLines
+ .take(3)
+ .map(
+ (line) => Text(line, maxLines: 1, overflow: TextOverflow.ellipsis),
+ )
+ .toList(),
+ );
+ }
+}
+
+class _EmptySensorsState extends StatelessWidget {
+ const _EmptySensorsState();
+
+ @override
+ Widget build(BuildContext context) {
+ return Padding(
+ padding: const EdgeInsets.symmetric(vertical: 64),
+ child: Column(
+ children: [
+ Container(
+ width: 84,
+ height: 84,
+ decoration: const BoxDecoration(
+ color: Color(0xFFDDEAF8),
+ shape: BoxShape.circle,
+ ),
+ child: const Icon(
+ Icons.sensors_outlined,
+ size: 40,
+ color: Color(0xFF1E4F7A),
+ ),
+ ),
+ const SizedBox(height: 20),
+ Text(
+ 'No sensor nodes added',
+ style: Theme.of(context).textTheme.titleLarge,
+ ),
+ const SizedBox(height: 10),
+ const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 24),
+ child: Text(
+ 'Use + to add discovered relays or nodes. Pull down to refresh telemetry after adding them.',
+ textAlign: TextAlign.center,
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
+
+class _SensorCard extends StatelessWidget {
+ final Contact? contact;
+ final SensorRefreshState state;
+ final Set visibleMetrics;
+ final Future Function() onRemove;
+ final VoidCallback onCustomize;
+
+ const _SensorCard({
+ required this.contact,
+ required this.state,
+ required this.visibleMetrics,
+ required this.onRemove,
+ required this.onCustomize,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ final l10n = AppLocalizations.of(context)!;
+ final telemetry = contact?.telemetry;
+ final theme = Theme.of(context);
+ final metrics = contact == null || telemetry == null
+ ? const <_MetricCardData>[]
+ : _buildMetricCards(l10n, telemetry, contact!);
+
+ return Container(
+ margin: const EdgeInsets.only(bottom: 16),
+ decoration: BoxDecoration(
+ color: theme.colorScheme.surface,
+ borderRadius: BorderRadius.circular(28),
+ border: Border.all(
+ color: theme.colorScheme.outline.withValues(alpha: 0.14),
+ ),
+ boxShadow: [
+ BoxShadow(
+ color: Colors.black.withValues(alpha: 0.04),
+ blurRadius: 18,
+ offset: const Offset(0, 8),
+ ),
+ ],
+ ),
+ child: Padding(
+ padding: const EdgeInsets.all(18),
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Wrap(
+ spacing: 8,
+ runSpacing: 6,
+ crossAxisAlignment: WrapCrossAlignment.center,
+ children: [
+ Text(
+ contact?.displayName ?? 'Unavailable node',
+ style: theme.textTheme.titleSmall?.copyWith(
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ if (state == SensorRefreshState.timeout)
+ const _InlineAlertBadge(label: 'No response'),
+ ],
+ ),
+ if (telemetry != null) ...[
+ const SizedBox(height: 2),
+ Text(
+ '${_formatTelemetryDateTime(telemetry.timestamp)} • ${_formatTelemetryTime(telemetry.timestamp)}',
+ style: theme.textTheme.bodySmall?.copyWith(
+ color: theme.colorScheme.onSurfaceVariant,
+ ),
+ ),
+ ],
+ ],
+ ),
+ ),
+ PopupMenuButton(
+ onSelected: (value) async {
+ if (value == 'remove') {
+ await onRemove();
+ } else if (value == 'customize') {
+ onCustomize();
+ }
+ },
+ itemBuilder: (context) => const [
+ PopupMenuItem(
+ value: 'customize',
+ child: Text('Customize fields'),
+ ),
+ PopupMenuItem(
+ value: 'remove',
+ child: Text('Remove'),
+ ),
+ ],
+ ),
+ ],
+ ),
+ const SizedBox(height: 12),
+ if (((state != SensorRefreshState.idle &&
+ state != SensorRefreshState.timeout) ||
+ state == SensorRefreshState.unavailable) ||
+ (contact != null &&
+ visibleMetrics.contains(SensorMetric.lastSeen)))
+ Padding(
+ padding: const EdgeInsets.only(bottom: 12),
+ child: Wrap(
+ spacing: 10,
+ runSpacing: 10,
+ children: [
+ if (state != SensorRefreshState.idle &&
+ state != SensorRefreshState.timeout)
+ _StatusPill(state: state),
+ if (contact != null &&
+ visibleMetrics.contains(SensorMetric.lastSeen))
+ _InfoPill(
+ icon: Icons.schedule,
+ label:
+ '${l10n.lastSeen}: ${contact!.timeSinceLastSeen}',
+ ),
+ ],
+ ),
+ ),
+ if (contact == null)
+ const Text(
+ 'This node is no longer available in the contact list.',
+ )
+ else if (telemetry == null)
+ const Text('No telemetry received yet. Pull down to fetch it.')
+ else if (metrics.isEmpty)
+ const Text(
+ 'All fields are hidden. Use Visible fields to choose what to show.',
+ )
+ else
+ Wrap(
+ spacing: 12,
+ runSpacing: 12,
+ children: metrics
+ .map((metric) => _MetricTile(data: metric))
+ .toList(),
+ ),
+ ],
+ ),
+ ),
+ );
+ }
+
+ List<_MetricCardData> _buildMetricCards(
+ AppLocalizations l10n,
+ dynamic telemetry,
+ Contact contact,
+ ) {
+ final items = <_MetricCardData>[];
+
+ if (visibleMetrics.contains(SensorMetric.voltage) &&
+ telemetry.batteryMilliVolts != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.bolt,
+ label: l10n.voltage,
+ value: '${(telemetry.batteryMilliVolts! / 1000).toStringAsFixed(3)}V',
+ accent: const Color(0xFF0A7D61),
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.battery) &&
+ telemetry.batteryPercentage != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.battery_5_bar,
+ label: l10n.battery,
+ value: '${telemetry.batteryPercentage!.toStringAsFixed(0)}%',
+ accent: const Color(0xFF4B8E2F),
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.temperature) &&
+ telemetry.temperature != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.thermostat,
+ label: l10n.temperature,
+ value: '${telemetry.temperature!.toStringAsFixed(1)}°C',
+ accent: const Color(0xFFC76821),
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.humidity) &&
+ telemetry.humidity != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.water_drop,
+ label: l10n.humidity,
+ value: '${telemetry.humidity!.toStringAsFixed(1)}%',
+ accent: const Color(0xFF246BB2),
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.pressure) &&
+ telemetry.pressure != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.compress,
+ label: l10n.pressure,
+ value: '${telemetry.pressure!.toStringAsFixed(1)} hPa',
+ accent: const Color(0xFF6B4BAE),
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.gps) &&
+ telemetry.gpsLocation != null) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.place,
+ label: l10n.gpsTelemetry,
+ value:
+ '${telemetry.gpsLocation!.latitude.toStringAsFixed(5)}, ${telemetry.gpsLocation!.longitude.toStringAsFixed(5)}',
+ accent: const Color(0xFFAA3F57),
+ wide: true,
+ ),
+ );
+ }
+ if (visibleMetrics.contains(SensorMetric.updated)) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.update,
+ label: l10n.updated,
+ value: _formatTelemetryTime(telemetry.timestamp),
+ accent: const Color(0xFF6C727F),
+ ),
+ );
+ }
+ if (telemetry.extraSensorData != null) {
+ for (final entry in telemetry.extraSensorData!.entries) {
+ items.add(
+ _MetricCardData(
+ icon: Icons.sensors,
+ label: entry.key,
+ value: '${entry.value}',
+ accent: const Color(0xFF3E657C),
+ ),
+ );
+ }
+ }
+
+ return items;
+ }
+
+ String _formatTelemetryTime(DateTime timestamp) {
+ final diff = DateTime.now().difference(timestamp);
+ if (diff.inMinutes < 1) return 'just now';
+ if (diff.inMinutes < 60) return '${diff.inMinutes}m ago';
+ if (diff.inHours < 24) return '${diff.inHours}h ago';
+ return '${diff.inDays}d ago';
+ }
+
+ String _formatTelemetryDateTime(DateTime timestamp) {
+ final local = timestamp.toLocal();
+ final year = local.year.toString().padLeft(4, '0');
+ final month = local.month.toString().padLeft(2, '0');
+ final day = local.day.toString().padLeft(2, '0');
+ final hour = local.hour.toString().padLeft(2, '0');
+ final minute = local.minute.toString().padLeft(2, '0');
+ return '$year-$month-$day $hour:$minute';
+ }
+}
+
+class _StatusPill extends StatelessWidget {
+ final SensorRefreshState state;
+
+ const _StatusPill({required this.state});
+
+ @override
+ Widget build(BuildContext context) {
+ final (label, color, icon) = switch (state) {
+ SensorRefreshState.idle => (
+ 'Idle',
+ const Color(0xFF5D7185),
+ Icons.sensors,
+ ),
+ SensorRefreshState.refreshing => (
+ 'Refreshing',
+ const Color(0xFF266AC2),
+ Icons.sync,
+ ),
+ SensorRefreshState.success => (
+ 'Updated',
+ const Color(0xFF218B63),
+ Icons.check_circle,
+ ),
+ SensorRefreshState.timeout => (
+ 'No response',
+ const Color(0xFFC17B1D),
+ Icons.schedule,
+ ),
+ SensorRefreshState.unavailable => (
+ 'Unavailable',
+ const Color(0xFFB13B55),
+ Icons.error_outline,
+ ),
+ };
+
+ return _InfoPill(
+ icon: icon,
+ label: label,
+ foreground: color,
+ background: color.withValues(alpha: 0.10),
+ );
+ }
+}
+
+class _InfoPill extends StatelessWidget {
+ final IconData icon;
+ final String label;
+ final Color? foreground;
+ final Color? background;
+
+ const _InfoPill({
+ required this.icon,
+ required this.label,
+ this.foreground,
+ this.background,
+ });
+
+ @override
+ Widget build(BuildContext context) {
+ final color = foreground ?? Theme.of(context).colorScheme.onSurfaceVariant;
+ return Container(
+ padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 11),
+ decoration: BoxDecoration(
+ color:
+ background ?? Theme.of(context).colorScheme.surfaceContainerHighest,
+ borderRadius: BorderRadius.circular(18),
+ ),
+ child: Row(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ Icon(icon, size: 18, color: color),
+ const SizedBox(width: 8),
+ Text(
+ label,
+ style: TextStyle(color: color, fontWeight: FontWeight.w600),
+ ),
+ ],
+ ),
+ );
+ }
+}
+
+class _InlineAlertBadge extends StatelessWidget {
+ final String label;
+
+ const _InlineAlertBadge({required this.label});
+
+ @override
+ Widget build(BuildContext context) {
+ return Container(
+ padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 3),
+ decoration: BoxDecoration(
+ color: const Color(0xFFC17B1D).withValues(alpha: 0.12),
+ borderRadius: BorderRadius.circular(999),
+ ),
+ child: Text(
+ label,
+ style: Theme.of(context).textTheme.labelSmall?.copyWith(
+ color: const Color(0xFFC17B1D),
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ );
+ }
+}
+
+class _MetricTile extends StatelessWidget {
+ final _MetricCardData data;
+
+ const _MetricTile({required this.data});
+
+ @override
+ Widget build(BuildContext context) {
+ final width = data.wide ? 320.0 : 168.0;
+
+ return Container(
+ width: width,
+ padding: const EdgeInsets.all(14),
+ decoration: BoxDecoration(
+ color: data.accent.withValues(alpha: 0.08),
+ borderRadius: BorderRadius.circular(22),
+ border: Border.all(color: data.accent.withValues(alpha: 0.14)),
+ ),
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Container(
+ width: 36,
+ height: 36,
+ decoration: BoxDecoration(
+ color: data.accent.withValues(alpha: 0.14),
+ borderRadius: BorderRadius.circular(12),
+ ),
+ child: Icon(data.icon, color: data.accent, size: 20),
+ ),
+ const SizedBox(width: 12),
+ Expanded(
+ child: Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ Text(
+ data.label,
+ style: Theme.of(context).textTheme.labelMedium?.copyWith(
+ color: data.accent,
+ fontWeight: FontWeight.w700,
+ ),
+ ),
+ const SizedBox(height: 6),
+ Text(
+ data.value,
+ style: Theme.of(context).textTheme.titleLarge?.copyWith(
+ fontWeight: FontWeight.w700,
+ height: 1.1,
+ ),
+ ),
+ ],
+ ),
+ ),
+ ],
+ ),
+ );
+ }
+}
+
+class _MetricCardData {
+ final IconData icon;
+ final String label;
+ final String value;
+ final Color accent;
+ final bool wide;
+
+ const _MetricCardData({
+ required this.icon,
+ required this.label,
+ required this.value,
+ required this.accent,
+ this.wide = false,
+ });
+}
+
+String _metricLabel(SensorMetric metric) {
+ return switch (metric) {
+ SensorMetric.lastSeen => 'Last seen',
+ SensorMetric.voltage => 'Voltage',
+ SensorMetric.battery => 'Battery',
+ SensorMetric.temperature => 'Temperature',
+ SensorMetric.humidity => 'Humidity',
+ SensorMetric.pressure => 'Pressure',
+ SensorMetric.gps => 'GPS',
+ SensorMetric.updated => 'Updated',
+ };
+}
+
+IconData _typeIcon(Contact contact) {
+ if (contact.isRepeater) {
+ return Icons.router;
+ }
+ if (contact.isChat) {
+ return Icons.sensors;
+ }
+ return Icons.device_hub;
+}
diff --git a/lib/screens/settings_screen.dart b/lib/screens/settings_screen.dart
index 15d282c..f43c0cf 100644
--- a/lib/screens/settings_screen.dart
+++ b/lib/screens/settings_screen.dart
@@ -737,6 +737,19 @@ class _SettingsScreenState extends State {
},
),
),
+ Consumer(
+ builder: (context, appProvider, child) => SwitchListTile(
+ secondary: const Icon(Icons.sensors),
+ title: const Text('Enable Sensors tab'),
+ subtitle: const Text(
+ 'Show a dedicated tab for watched relay and node telemetry',
+ ),
+ value: appProvider.isSensorsEnabled,
+ onChanged: (value) async {
+ await appProvider.toggleSensorsEnabled(value);
+ },
+ ),
+ ),
ListTile(
leading: const Icon(Icons.language),
title: Text(AppLocalizations.of(context)!.language),
diff --git a/lib/services/map_marker_service.dart b/lib/services/map_marker_service.dart
index 88839b6..5ea3f0c 100644
--- a/lib/services/map_marker_service.dart
+++ b/lib/services/map_marker_service.dart
@@ -5,6 +5,7 @@ import 'package:latlong2/latlong.dart';
import 'package:geolocator/geolocator.dart';
import '../models/contact.dart';
import '../models/sar_marker.dart';
+import '../widgets/common/contact_avatar.dart';
import '../widgets/map/location_pointer.dart';
/// Centralized service for map marker management.
@@ -77,9 +78,15 @@ class MapMarkerService {
// Marker icon
Container(
decoration: BoxDecoration(
- color: getContactMarkerColor(contact, context),
- shape: BoxShape.circle,
- border: Border.all(color: Colors.white, width: 2),
+ color: Colors.white,
+ shape: contact.type == ContactType.channel ||
+ contact.type == ContactType.room
+ ? BoxShape.rectangle
+ : BoxShape.circle,
+ borderRadius: contact.type == ContactType.channel ||
+ contact.type == ContactType.room
+ ? BorderRadius.circular(14)
+ : null,
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.3),
@@ -88,17 +95,8 @@ class MapMarkerService {
),
],
),
- padding: const EdgeInsets.all(6),
- child: contact.roleEmoji != null
- ? Text(
- contact.roleEmoji!,
- style: const TextStyle(fontSize: 18),
- )
- : Icon(
- getContactMarkerIcon(contact),
- color: Colors.white,
- size: 18,
- ),
+ padding: const EdgeInsets.all(2),
+ child: ContactAvatar(contact: contact, radius: 16),
),
const SizedBox(height: 2),
// Name label (without emoji)
diff --git a/lib/services/mesh_map_nodes_service.dart b/lib/services/mesh_map_nodes_service.dart
index 4b5cccb..0d41ca3 100644
--- a/lib/services/mesh_map_nodes_service.dart
+++ b/lib/services/mesh_map_nodes_service.dart
@@ -35,6 +35,7 @@ class MeshMapNodesService {
'https://api.meshcore.nz/api/v1/map/nodes';
static const Duration _cacheTtl = Duration(minutes: 2);
static const Duration traceCacheTtl = Duration(minutes: 10);
+ static const Duration traceTimeout = Duration(seconds: 30);
static List? _cachedNodes;
static DateTime? _cachedAt;
@@ -52,7 +53,7 @@ class MeshMapNodesService {
final response = await http
.get(Uri.parse(_nodesEndpoint))
- .timeout(const Duration(seconds: 12));
+ .timeout(traceTimeout);
if (response.statusCode < 200 || response.statusCode >= 300) {
throw Exception('Map nodes API returned ${response.statusCode}');
}
diff --git a/lib/services/message_storage_service.dart b/lib/services/message_storage_service.dart
index 04a2728..32858ed 100644
--- a/lib/services/message_storage_service.dart
+++ b/lib/services/message_storage_service.dart
@@ -3,6 +3,8 @@ import 'package:flutter/foundation.dart';
import 'package:shared_preferences/shared_preferences.dart';
import '../models/message.dart';
import '../models/message_contact_location.dart';
+import '../models/message_reception_details.dart';
+import '../models/message_transfer_details.dart';
import 'package:latlong2/latlong.dart';
/// Service for persisting messages to local storage
@@ -10,12 +12,18 @@ class MessageStorageService {
static const String _messagesKey = 'stored_messages';
static const String _messageContactLocationsKey =
'stored_message_contact_locations';
+ static const String _messageReceptionDetailsKey =
+ 'stored_message_reception_details';
+ static const String _messageTransferDetailsKey =
+ 'stored_message_transfer_details';
static const int _maxStoredMessages = 1000; // Store up to 1000 messages
/// Save messages to persistent storage
Future saveMessages(
List messages, {
Map messageContactLocations = const {},
+ Map messageReceptionDetails = const {},
+ Map messageTransferDetails = const {},
}) async {
try {
final prefs = await SharedPreferences.getInstance();
@@ -34,15 +42,35 @@ class MessageStorageService {
.map((entry) => entry['id'] as String)
.toSet();
final locationJson = {};
+ final receptionJson = {};
+ final transferJson = {};
for (final entry in messageContactLocations.entries) {
if (retainedMessageIds.contains(entry.key)) {
locationJson[entry.key] = entry.value.toJson();
}
}
+ for (final entry in messageReceptionDetails.entries) {
+ if (retainedMessageIds.contains(entry.key)) {
+ receptionJson[entry.key] = entry.value.toJson();
+ }
+ }
+ for (final entry in messageTransferDetails.entries) {
+ if (retainedMessageIds.contains(entry.key)) {
+ transferJson[entry.key] = entry.value.toJson();
+ }
+ }
await prefs.setString(
_messageContactLocationsKey,
jsonEncode(locationJson),
);
+ await prefs.setString(
+ _messageReceptionDetailsKey,
+ jsonEncode(receptionJson),
+ );
+ await prefs.setString(
+ _messageTransferDetailsKey,
+ jsonEncode(transferJson),
+ );
debugPrint(
'✅ [MessageStorage] Saved ${limitedList.length} messages to storage',
@@ -52,8 +80,8 @@ class MessageStorageService {
}
}
- Future> loadMessageContactLocations()
- async {
+ Future>
+ loadMessageContactLocations() async {
try {
final prefs = await SharedPreferences.getInstance();
final jsonString = prefs.getString(_messageContactLocationsKey);
@@ -82,6 +110,66 @@ class MessageStorageService {
}
}
+ Future>
+ loadMessageReceptionDetails() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ final jsonString = prefs.getString(_messageReceptionDetailsKey);
+ if (jsonString == null || jsonString.isEmpty) {
+ return const {};
+ }
+
+ final decoded = jsonDecode(jsonString);
+ if (decoded is! Map) {
+ return const {};
+ }
+
+ final result = {};
+ for (final entry in decoded.entries) {
+ final value = entry.value;
+ if (value is! Map) continue;
+ final snapshot = MessageReceptionDetails.fromJson(value);
+ if (snapshot != null) {
+ result[entry.key] = snapshot;
+ }
+ }
+ return result;
+ } catch (e) {
+ debugPrint('❌ [MessageStorage] Error loading reception details: $e');
+ return const {};
+ }
+ }
+
+ Future>
+ loadMessageTransferDetails() async {
+ try {
+ final prefs = await SharedPreferences.getInstance();
+ final jsonString = prefs.getString(_messageTransferDetailsKey);
+ if (jsonString == null || jsonString.isEmpty) {
+ return const {};
+ }
+
+ final decoded = jsonDecode(jsonString);
+ if (decoded is! Map) {
+ return const {};
+ }
+
+ final result = {};
+ for (final entry in decoded.entries) {
+ final value = entry.value;
+ if (value is! Map) continue;
+ final details = MessageTransferDetails.fromJson(value);
+ if (details != null) {
+ result[entry.key] = details;
+ }
+ }
+ return result;
+ } catch (e) {
+ debugPrint('❌ [MessageStorage] Error loading transfer details: $e');
+ return const {};
+ }
+ }
+
/// Load messages from persistent storage
Future> loadMessages() async {
try {
@@ -116,6 +204,8 @@ class MessageStorageService {
final prefs = await SharedPreferences.getInstance();
await prefs.remove(_messagesKey);
await prefs.remove(_messageContactLocationsKey);
+ await prefs.remove(_messageReceptionDetailsKey);
+ await prefs.remove(_messageTransferDetailsKey);
debugPrint('✅ [MessageStorage] Cleared all stored messages');
} catch (e) {
debugPrint('❌ [MessageStorage] Error clearing messages: $e');
diff --git a/lib/services/voice_recorder_service.dart b/lib/services/voice_recorder_service.dart
index f2ad576..fe378b7 100644
--- a/lib/services/voice_recorder_service.dart
+++ b/lib/services/voice_recorder_service.dart
@@ -18,7 +18,7 @@ class VoiceRecorderService {
/// Request microphone permission. Returns true if granted.
Future requestPermission() async {
- return _recorder.hasPermission();
+ return _recorder.hasPermission(request: true);
}
/// Start capturing PCM audio.
@@ -38,9 +38,7 @@ class VoiceRecorderService {
throw StateError('VoiceRecorderService: already recording');
}
- _controller = StreamController(
- onCancel: () => _stopInternal(),
- );
+ _controller = StreamController(onCancel: () => _stopInternal());
_isRecording = true;
_startRecording(
@@ -167,17 +165,17 @@ class _VoiceDynamicsProcessor {
required int sampleRate,
required bool enableCompressor,
required bool enableLimiter,
- }) : _enableCompressor = enableCompressor,
- _enableLimiter = enableLimiter,
- _compressor = _SimpleCompressor(
- sampleRate: sampleRate.toDouble(),
- thresholdDb: -18.0,
- ratio: 2.5,
- attackMs: 8.0,
- releaseMs: 120.0,
- makeupGainDb: 4.0,
- ),
- _limiter = _PeakLimiter(ceilingDb: -1.0);
+ }) : _enableCompressor = enableCompressor,
+ _enableLimiter = enableLimiter,
+ _compressor = _SimpleCompressor(
+ sampleRate: sampleRate.toDouble(),
+ thresholdDb: -18.0,
+ ratio: 2.5,
+ attackMs: 8.0,
+ releaseMs: 120.0,
+ makeupGainDb: 4.0,
+ ),
+ _limiter = _PeakLimiter(ceilingDb: -1.0);
Int16List process(Int16List input) {
final output = Int16List(input.length);
@@ -214,11 +212,11 @@ class _SimpleCompressor {
required double attackMs,
required double releaseMs,
required double makeupGainDb,
- }) : _thresholdDb = thresholdDb,
- _ratio = ratio,
- _makeupGain = math.pow(10.0, makeupGainDb / 20.0).toDouble(),
- _attackCoeff = math.exp(-1.0 / (sampleRate * (attackMs / 1000.0))),
- _releaseCoeff = math.exp(-1.0 / (sampleRate * (releaseMs / 1000.0)));
+ }) : _thresholdDb = thresholdDb,
+ _ratio = ratio,
+ _makeupGain = math.pow(10.0, makeupGainDb / 20.0).toDouble(),
+ _attackCoeff = math.exp(-1.0 / (sampleRate * (attackMs / 1000.0))),
+ _releaseCoeff = math.exp(-1.0 / (sampleRate * (releaseMs / 1000.0)));
double process(double x) {
final absX = x.abs();
@@ -266,14 +264,14 @@ class _VoiceBandPassFilter {
required int sampleRate,
required double lowCutHz,
required double highCutHz,
- }) : _highPass = _BiquadFilter.highPass(
- sampleRate: sampleRate.toDouble(),
- cutoffHz: lowCutHz,
- ),
- _lowPass = _BiquadFilter.lowPass(
- sampleRate: sampleRate.toDouble(),
- cutoffHz: highCutHz,
- );
+ }) : _highPass = _BiquadFilter.highPass(
+ sampleRate: sampleRate.toDouble(),
+ cutoffHz: lowCutHz,
+ ),
+ _lowPass = _BiquadFilter.lowPass(
+ sampleRate: sampleRate.toDouble(),
+ cutoffHz: highCutHz,
+ );
Int16List process(Int16List input) {
final output = Int16List(input.length);
@@ -306,11 +304,11 @@ class _BiquadFilter {
required double b2,
required double a1,
required double a2,
- }) : _b0 = b0,
- _b1 = b1,
- _b2 = b2,
- _a1 = a1,
- _a2 = a2;
+ }) : _b0 = b0,
+ _b1 = b1,
+ _b2 = b2,
+ _a1 = a1,
+ _a2 = a2;
factory _BiquadFilter.lowPass({
required double sampleRate,
diff --git a/lib/utils/image_message_parser.dart b/lib/utils/image_message_parser.dart
index 16bbe68..a0f26ef 100644
--- a/lib/utils/image_message_parser.dart
+++ b/lib/utils/image_message_parser.dart
@@ -4,7 +4,7 @@ const int _maxCompanionFrameBytes = 172; // MeshCore MAX_FRAME_SIZE
const int _cmdSendRawDataOverheadBytes = 2; // cmd + pathLen
const int _maxMeshPacketPayloadBytes = 184; // MeshCore MAX_PACKET_PAYLOAD
const int _meshPacketHeaderBytes = 2; // mesh header bytes before path/payload
-const int _imagePacketHeaderBytes = 8; // image packet binary header in payload
+const int _imagePacketHeaderBytes = 6; // image packet binary header in payload
const int _defaultLoRaSf = 10; // MeshCore companion defaults (SF10)
const int _defaultLoRaCr = 5; // MeshCore companion defaults (4/5)
const int _defaultLoRaBwHz = 250000; // MeshCore companion defaults (250kHz)
@@ -31,7 +31,7 @@ enum ImageFormat {
/// A single binary fragment of a compressed image.
///
/// Binary format (direct contacts, via pushRawData / cmdSendRawData):
-/// [0x49 'I'][sessionId:4B][fmt:1B][idx:1B][total:1B][imageData...]
+/// [0x49 'I'][sessionId:4B][idx:1B][imageData...]
///
/// Legacy default is 152 data bytes per fragment.
class ImagePacket {
@@ -50,7 +50,7 @@ class ImagePacket {
});
static const int _magic = 0x49; // 'I'
- static const int _headerLen = 8; // magic(1)+session(4)+fmt(1)+idx(1)+total(1)
+ static const int _headerLen = 6; // magic(1)+session(4)+idx(1)
static const int maxDataBytes =
152; // Conservative default for compatibility.
@@ -65,16 +65,14 @@ class ImagePacket {
.sublist(1, 5)
.map((b) => b.toRadixString(16).padLeft(2, '0'))
.join();
- final fmtId = payload[5];
- final index = payload[6];
- final total = payload[7];
- if (total < 1) return null;
+ final index = payload[5];
+ final data = payload.sublist(_headerLen);
return ImagePacket(
sessionId: sessionId,
- format: ImageFormat.fromId(fmtId),
+ format: ImageFormat.avif,
index: index,
- total: total,
- data: payload.sublist(_headerLen),
+ total: 0,
+ data: data,
);
} catch (_) {
return null;
@@ -92,16 +90,16 @@ class ImagePacket {
final out = Uint8List(_headerLen + data.length);
out[0] = _magic;
out.setRange(1, 5, sessionBytes);
- out[5] = format.id;
- out[6] = index;
- out[7] = total;
+ out[5] = index;
out.setRange(_headerLen, out.length, data);
return out;
}
@override
- String toString() =>
- 'ImagePacket($sessionId ${format.label} [$index/${total - 1}] ${data.length}B)';
+ String toString() {
+ final suffix = total > 0 ? ' ${format.label} [$index/${total - 1}]' : ' [$index]';
+ return 'ImagePacket($sessionId$suffix ${data.length}B)';
+ }
}
/// Compute the maximum safe image data bytes for a direct route path.
@@ -246,11 +244,11 @@ int _resolveBandwidthHz(int? rawBw) {
/// Envelope announcing image availability (control plane).
///
/// Text format:
-/// IE2:{sid}:{fmt}:{total}:{w}:{h}:{bytes}:{senderKey6}:{ts}
+/// IE4:{sid}:{fmt}:{total}:{w}:{h}:{bytes}
/// Example:
-/// IE2:deadbeef:0:7:3k:3k:t6:aabbccddeeff:s44we8
+/// IE4:deadbeef:0:7:3k:3k:t6
class ImageEnvelope {
- static const String _prefix = 'IE2:';
+ static const String _prefixV4 = 'IE4:';
final String sessionId; // 8 hex chars
final ImageFormat format;
@@ -258,8 +256,6 @@ class ImageEnvelope {
final int width;
final int height;
final int sizeBytes; // total compressed image size
- final String senderKey6; // 12 hex chars (6 bytes)
- final int timestampSec;
final int version;
const ImageEnvelope({
@@ -269,18 +265,16 @@ class ImageEnvelope {
required this.width,
required this.height,
required this.sizeBytes,
- required this.senderKey6,
- required this.timestampSec,
- this.version = 2,
+ this.version = 4,
});
- static bool isEnvelope(String text) => text.startsWith(_prefix);
+ static bool isEnvelope(String text) => text.startsWith(_prefixV4);
static ImageEnvelope? tryParse(String text) {
if (!isEnvelope(text)) return null;
- final body = text.substring(_prefix.length);
+ final body = text.substring(_prefixV4.length);
final parts = body.split(':');
- if (parts.length != 8) return null;
+ if (parts.length != 6) return null;
try {
final sid = _decodeSessionId(parts[0]);
final fmtId = _parseInt(parts[1], base36: true);
@@ -288,16 +282,12 @@ class ImageEnvelope {
final w = _parseInt(parts[3], base36: true);
final h = _parseInt(parts[4], base36: true);
final bytes = _parseInt(parts[5], base36: true);
- final senderKey6 = parts[6];
- final ts = _parseInt(parts[7], base36: true);
if (sid == null) return null;
if (fmtId == null) return null;
if (total == null || total < 1 || total > 255) return null;
if (w == null || h == null || w < 1 || h < 1) return null;
if (bytes == null || bytes < 1) return null;
- if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(senderKey6)) return null;
- if (ts == null || ts <= 0) return null;
return ImageEnvelope(
sessionId: sid,
@@ -306,9 +296,7 @@ class ImageEnvelope {
width: w,
height: h,
sizeBytes: bytes,
- senderKey6: senderKey6.toLowerCase(),
- timestampSec: ts,
- version: 2,
+ version: 4,
);
} catch (_) {
return null;
@@ -316,27 +304,25 @@ class ImageEnvelope {
}
String encode() =>
- '$_prefix${_encodeSessionId(sessionId)}:'
+ '$_prefixV4${_encodeSessionId(sessionId)}:'
'${_toBase36(format.id)}:${_toBase36(total)}:${_toBase36(width)}:'
- '${_toBase36(height)}:${_toBase36(sizeBytes)}:'
- '${senderKey6.toLowerCase()}:${_toBase36(timestampSec)}';
+ '${_toBase36(height)}:${_toBase36(sizeBytes)}';
}
/// Direct request to fetch image fragments (control plane).
///
/// Text format:
-/// IR2:{sid}:{want}:{requesterKey6}:{ts}
+/// IR4:{sid}:{want}:{requesterKey6}
/// Example:
-/// IR2:deadbeef:a:aabbccddeeff:s44wea
+/// IR4:deadbeef:a:aabbccddeeff
class ImageFetchRequest {
- static const String _prefix = 'IR2:';
+ static const String _prefixV4 = 'IR4:';
static const int _binaryMagic = 0x69; // 'i'
final String sessionId;
final String want; // 'all' or 'missing'
final List missingIndices;
final String requesterKey6; // 12 hex chars
- final int timestampSec;
final int version;
const ImageFetchRequest({
@@ -344,24 +330,22 @@ class ImageFetchRequest {
this.want = 'all',
this.missingIndices = const [],
required this.requesterKey6,
- required this.timestampSec,
- this.version = 2,
+ this.version = 4,
});
- static bool isRequest(String text) => text.startsWith(_prefix);
+ static bool isRequest(String text) => text.startsWith(_prefixV4);
static bool isRequestBinary(Uint8List payload) =>
payload.isNotEmpty && payload[0] == _binaryMagic;
static ImageFetchRequest? tryParse(String text) {
if (!isRequest(text)) return null;
- final body = text.substring(_prefix.length);
+ final body = text.substring(_prefixV4.length);
final parts = body.split(':');
- if (parts.length != 4) return null;
+ if (parts.length != 3) return null;
try {
final sid = _decodeSessionId(parts[0]);
final wantToken = parts[1];
final requesterKey6 = parts[2];
- final ts = _parseInt(parts[3], base36: true);
final normalizedWant = wantToken == 'a'
? 'all'
: ((wantToken.startsWith('m')) ? 'missing' : wantToken);
@@ -377,15 +361,13 @@ class ImageFetchRequest {
return null;
}
if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(requesterKey6)) return null;
- if (ts == null || ts <= 0) return null;
return ImageFetchRequest(
sessionId: sid,
want: normalizedWant,
missingIndices: missingIndices,
requesterKey6: requesterKey6.toLowerCase(),
- timestampSec: ts,
- version: 2,
+ version: 4,
);
} catch (_) {
return null;
@@ -394,7 +376,7 @@ class ImageFetchRequest {
static ImageFetchRequest? tryParseBinary(Uint8List payload) {
if (!isRequestBinary(payload)) return null;
- if (payload.length < 17) return null; // magic+sid+flags+key6+ts+count
+ if (payload.length < 13) return null; // magic+sid+flags+key6+count
try {
final sid = payload
.sublist(1, 5)
@@ -407,25 +389,19 @@ class ImageFetchRequest {
.map((b) => b.toRadixString(16).padLeft(2, '0'))
.join()
.toLowerCase();
- final ts =
- (payload[12] << 24) |
- (payload[13] << 16) |
- (payload[14] << 8) |
- payload[15];
- final missingCount = payload[16];
- if (payload.length != 17 + missingCount) return null;
+ final missingCount = payload[12];
+ if (payload.length != 13 + missingCount) return null;
final wantMissing = (flags & 0x01) == 0x01;
final missing = [];
for (var i = 0; i < missingCount; i++) {
- missing.add(payload[17 + i]);
+ missing.add(payload[13 + i]);
}
return ImageFetchRequest(
sessionId: sid,
want: wantMissing ? 'missing' : 'all',
missingIndices: missing,
requesterKey6: requesterKey6,
- timestampSec: ts,
- version: 2,
+ version: 4,
);
} catch (_) {
return null;
@@ -436,7 +412,7 @@ class ImageFetchRequest {
final wantToken = want == 'missing' && missingIndices.isNotEmpty
? 'm${_encodeMissingIndicesCompact(missingIndices)}'
: (want == 'all' ? 'a' : want);
- return '$_prefix${_encodeSessionId(sessionId)}:$wantToken:${requesterKey6.toLowerCase()}:${_toBase36(timestampSec)}';
+ return '$_prefixV4${_encodeSessionId(sessionId)}:$wantToken:${requesterKey6.toLowerCase()}';
}
Uint8List encodeBinary() {
@@ -455,7 +431,7 @@ class ImageFetchRequest {
? missingIndices.where((v) => v >= 0 && v <= 254).toList()
: [];
- final out = Uint8List(17 + missing.length);
+ final out = Uint8List(13 + missing.length);
out[0] = _binaryMagic;
for (var i = 0; i < 4; i++) {
out[1 + i] = int.parse(sessionId.substring(i * 2, i * 2 + 2), radix: 16);
@@ -467,13 +443,9 @@ class ImageFetchRequest {
radix: 16,
);
}
- out[12] = (timestampSec >> 24) & 0xFF;
- out[13] = (timestampSec >> 16) & 0xFF;
- out[14] = (timestampSec >> 8) & 0xFF;
- out[15] = timestampSec & 0xFF;
- out[16] = missing.length;
+ out[12] = missing.length;
for (var i = 0; i < missing.length; i++) {
- out[17 + i] = missing[i];
+ out[13 + i] = missing[i];
}
return out;
}
diff --git a/lib/utils/location_formats.dart b/lib/utils/location_formats.dart
new file mode 100644
index 0000000..8956cf4
--- /dev/null
+++ b/lib/utils/location_formats.dart
@@ -0,0 +1,25 @@
+String formatPlusCode(double lat, double lon) {
+ const base = '23456789CFGHJMPQRVWX';
+
+ var normalizedLat = (lat + 90) / 180;
+ var normalizedLon = (lon + 180) / 360;
+
+ final buffer = StringBuffer();
+ for (var i = 0; i < 8; i++) {
+ if (i == 4) {
+ buffer.write('+');
+ }
+
+ final latDigit = (normalizedLat * 20).floor() % 20;
+ final lonDigit = (normalizedLon * 20).floor() % 20;
+
+ buffer
+ ..write(base[latDigit])
+ ..write(base[lonDigit]);
+
+ normalizedLat = (normalizedLat * 20) % 1;
+ normalizedLon = (normalizedLon * 20) % 1;
+ }
+
+ return buffer.toString();
+}
diff --git a/lib/utils/log_rx_route_decoder.dart b/lib/utils/log_rx_route_decoder.dart
new file mode 100644
index 0000000..006829c
--- /dev/null
+++ b/lib/utils/log_rx_route_decoder.dart
@@ -0,0 +1,129 @@
+import 'dart:typed_data';
+
+import '../models/contact.dart';
+
+class DecodedLogRxRoute {
+ final int payloadType;
+ final List pathHashes;
+
+ const DecodedLogRxRoute({
+ required this.payloadType,
+ required this.pathHashes,
+ });
+
+ int? get originalSenderHash => pathHashes.isEmpty ? null : pathHashes.first;
+}
+
+class ResolvedNodeHash {
+ final int hash;
+ final String label;
+ final bool isOwnNode;
+ final bool isUniqueMatch;
+ final int matchCount;
+
+ const ResolvedNodeHash({
+ required this.hash,
+ required this.label,
+ required this.isOwnNode,
+ required this.isUniqueMatch,
+ required this.matchCount,
+ });
+
+ String get hexLabel => '0x${hash.toRadixString(16).padLeft(2, '0')}';
+}
+
+class LogRxRouteDecoder {
+ const LogRxRouteDecoder._();
+
+ static DecodedLogRxRoute? decode(Uint8List rawData) {
+ if (rawData.length < 5 || rawData[0] != 0x88) return null;
+
+ final rawPacketData = rawData.sublist(3);
+ if (rawPacketData.length < 2) return null;
+
+ final header = rawPacketData[0];
+ final routeType = header & 0x03;
+ final payloadType = (header >> 2) & 0x0F;
+
+ var index = 1;
+ if (routeType == 0x00 || routeType == 0x03) {
+ if (rawPacketData.length < index + 5) return null;
+ index += 4;
+ }
+
+ if (rawPacketData.length <= index) return null;
+ final pathLen = rawPacketData[index++];
+ if (rawPacketData.length < index + pathLen) return null;
+
+ return DecodedLogRxRoute(
+ payloadType: payloadType,
+ pathHashes: rawPacketData.sublist(index, index + pathLen),
+ );
+ }
+
+ static ResolvedNodeHash resolveHash(
+ int hash, {
+ required Iterable contacts,
+ Uint8List? ownPublicKey,
+ String? ownName,
+ }) {
+ final ownHash = ownPublicKey != null && ownPublicKey.isNotEmpty
+ ? ownPublicKey.first
+ : null;
+ if (ownHash == hash) {
+ final ownLabel = (ownName != null && ownName.trim().isNotEmpty)
+ ? '$ownName (you)'
+ : 'You';
+ return ResolvedNodeHash(
+ hash: hash,
+ label: ownLabel,
+ isOwnNode: true,
+ isUniqueMatch: true,
+ matchCount: 1,
+ );
+ }
+
+ final matches = contacts.where((contact) {
+ return contact.publicKey.isNotEmpty && contact.publicKey.first == hash;
+ }).toList();
+
+ if (matches.isEmpty) {
+ return ResolvedNodeHash(
+ hash: hash,
+ label: 'Unknown',
+ isOwnNode: false,
+ isUniqueMatch: false,
+ matchCount: 0,
+ );
+ }
+
+ if (matches.length == 1) {
+ return ResolvedNodeHash(
+ hash: hash,
+ label: matches.first.displayName,
+ isOwnNode: false,
+ isUniqueMatch: true,
+ matchCount: 1,
+ );
+ }
+
+ final candidateNames = matches
+ .map((contact) => contact.displayName)
+ .where((name) => name.trim().isNotEmpty)
+ .take(2)
+ .join(', ');
+ final extraCount = matches.length - 2;
+ final label = candidateNames.isEmpty
+ ? '${matches.length} contacts'
+ : extraCount > 0
+ ? '$candidateNames +$extraCount'
+ : candidateNames;
+ return ResolvedNodeHash(
+ hash: hash,
+ label: label,
+ isOwnNode: false,
+ isUniqueMatch: false,
+ matchCount: matches.length,
+ );
+ }
+}
diff --git a/lib/utils/media_swarm_protocol.dart b/lib/utils/media_swarm_protocol.dart
new file mode 100644
index 0000000..70191c5
--- /dev/null
+++ b/lib/utils/media_swarm_protocol.dart
@@ -0,0 +1,168 @@
+import 'dart:typed_data';
+
+const int _swarmMagic = 0x6d; // 'm'
+const int _swarmKindRequest = 0x01;
+const int _swarmKindAvailability = 0x02;
+
+class MediaSwarmRequest {
+ final String mediaType;
+ final String sessionId;
+ final String requesterKey6;
+ final List missingIndices;
+
+ const MediaSwarmRequest({
+ required this.mediaType,
+ required this.sessionId,
+ required this.requesterKey6,
+ this.missingIndices = const [],
+ });
+
+ bool get requestsAll => missingIndices.isEmpty;
+
+ Uint8List encodeBinary() {
+ final normalizedMissing = missingIndices.toSet().toList()..sort();
+ final out = Uint8List(14 + normalizedMissing.length);
+ out[0] = _swarmMagic;
+ out[1] = _swarmKindRequest;
+ out[2] = _encodeMediaType(mediaType);
+ _writeSessionId(out, 3, sessionId);
+ _writeKey6(out, 7, requesterKey6);
+ out[13] = normalizedMissing.length;
+ for (var i = 0; i < normalizedMissing.length; i++) {
+ out[14 + i] = normalizedMissing[i];
+ }
+ return out;
+ }
+
+ static MediaSwarmRequest? tryParseBinary(Uint8List payload) {
+ if (payload.length < 14 ||
+ payload[0] != _swarmMagic ||
+ payload[1] != _swarmKindRequest) {
+ return null;
+ }
+
+ final mediaType = _decodeMediaType(payload[2]);
+ if (mediaType == null) return null;
+
+ final missingCount = payload[13];
+ if (payload.length != 14 + missingCount) {
+ return null;
+ }
+
+ return MediaSwarmRequest(
+ mediaType: mediaType,
+ sessionId: _readSessionId(payload, 3),
+ requesterKey6: _readKey6(payload, 7),
+ missingIndices: payload.sublist(14),
+ );
+ }
+}
+
+class MediaSwarmAvailability {
+ final String mediaType;
+ final String sessionId;
+ final String requesterKey6;
+ final String responderKey6;
+ final List availableIndices;
+
+ const MediaSwarmAvailability({
+ required this.mediaType,
+ required this.sessionId,
+ required this.requesterKey6,
+ required this.responderKey6,
+ required this.availableIndices,
+ });
+
+ bool get servesAll => availableIndices.isEmpty;
+
+ Uint8List encodeBinary() {
+ final normalizedAvailable = availableIndices.toSet().toList()..sort();
+ final out = Uint8List(20 + normalizedAvailable.length);
+ out[0] = _swarmMagic;
+ out[1] = _swarmKindAvailability;
+ out[2] = _encodeMediaType(mediaType);
+ _writeSessionId(out, 3, sessionId);
+ _writeKey6(out, 7, requesterKey6);
+ _writeKey6(out, 13, responderKey6);
+ out[19] = normalizedAvailable.length;
+ for (var i = 0; i < normalizedAvailable.length; i++) {
+ out[20 + i] = normalizedAvailable[i];
+ }
+ return out;
+ }
+
+ static MediaSwarmAvailability? tryParseBinary(Uint8List payload) {
+ if (payload.length < 20 ||
+ payload[0] != _swarmMagic ||
+ payload[1] != _swarmKindAvailability) {
+ return null;
+ }
+
+ final mediaType = _decodeMediaType(payload[2]);
+ if (mediaType == null) return null;
+
+ final availableCount = payload[19];
+ if (payload.length != 20 + availableCount) {
+ return null;
+ }
+
+ return MediaSwarmAvailability(
+ mediaType: mediaType,
+ sessionId: _readSessionId(payload, 3),
+ requesterKey6: _readKey6(payload, 7),
+ responderKey6: _readKey6(payload, 13),
+ availableIndices: payload.sublist(20),
+ );
+ }
+}
+
+int _encodeMediaType(String mediaType) {
+ return switch (mediaType) {
+ 'voice' => 0x01,
+ 'image' => 0x02,
+ _ => throw ArgumentError.value(mediaType, 'mediaType'),
+ };
+}
+
+String? _decodeMediaType(int raw) {
+ return switch (raw) {
+ 0x01 => 'voice',
+ 0x02 => 'image',
+ _ => null,
+ };
+}
+
+void _writeSessionId(Uint8List out, int offset, String sessionId) {
+ if (!RegExp(r'^[0-9a-fA-F]{8}$').hasMatch(sessionId)) {
+ throw ArgumentError.value(sessionId, 'sessionId', 'Expected 8 hex chars');
+ }
+ for (var i = 0; i < 4; i++) {
+ out[offset + i] = int.parse(
+ sessionId.substring(i * 2, i * 2 + 2),
+ radix: 16,
+ );
+ }
+}
+
+String _readSessionId(Uint8List payload, int offset) {
+ return payload
+ .sublist(offset, offset + 4)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join();
+}
+
+void _writeKey6(Uint8List out, int offset, String key6) {
+ if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(key6)) {
+ throw ArgumentError.value(key6, 'key6', 'Expected 12 hex chars');
+ }
+ for (var i = 0; i < 6; i++) {
+ out[offset + i] = int.parse(key6.substring(i * 2, i * 2 + 2), radix: 16);
+ }
+}
+
+String _readKey6(Uint8List payload, int offset) {
+ return payload
+ .sublist(offset, offset + 6)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join();
+}
diff --git a/lib/utils/message_airtime_estimator.dart b/lib/utils/message_airtime_estimator.dart
new file mode 100644
index 0000000..01c9f78
--- /dev/null
+++ b/lib/utils/message_airtime_estimator.dart
@@ -0,0 +1,149 @@
+import '../models/message.dart';
+import 'image_message_parser.dart';
+import 'voice_message_parser.dart';
+
+const int _defaultLoRaSf = 10;
+const int _defaultLoRaCr = 5;
+const int _defaultLoRaBwHz = 250000;
+const int _defaultLoRaPreambleSymbols = 8;
+const int _defaultLoRaCrcEnabled = 1;
+const int _defaultLoRaExplicitHeader = 1;
+const double _defaultAirtimeBudgetFactor = 1.0;
+const int _meshPacketHeaderBytes = 2;
+const int _textFrameBaseBytes = 10;
+
+Duration estimateMessageTransmitDuration(
+ Message message, {
+ int? radioBw,
+ int? radioSf,
+ int? radioCr,
+}) {
+ final imageEnvelope = ImageEnvelope.tryParse(message.text);
+ if (imageEnvelope != null) {
+ return estimateImageTransmitDuration(
+ fragmentCount: imageEnvelope.total,
+ sizeBytes: imageEnvelope.sizeBytes,
+ pathLen: message.pathLen,
+ radioBw: radioBw,
+ radioSf: radioSf,
+ radioCr: radioCr,
+ );
+ }
+
+ final voiceEnvelope = VoiceEnvelope.tryParseText(message.text);
+ if (voiceEnvelope != null) {
+ return estimateVoiceTransmitDuration(
+ mode: voiceEnvelope.mode,
+ packetCount: voiceEnvelope.total,
+ durationMs: voiceEnvelope.durationMs,
+ pathLen: message.pathLen,
+ radioBw: radioBw,
+ radioSf: radioSf,
+ radioCr: radioCr,
+ );
+ }
+
+ final voicePacket = VoicePacket.tryParseText(message.text);
+ if (voicePacket != null) {
+ return estimateVoiceTransmitDuration(
+ mode: voicePacket.mode,
+ packetCount: voicePacket.total,
+ durationMs: voicePacket.durationMs * voicePacket.total,
+ pathLen: message.pathLen,
+ radioBw: radioBw,
+ radioSf: radioSf,
+ radioCr: radioCr,
+ );
+ }
+
+ final normalizedPathLen = _normalizedPathLen(message.pathLen);
+ final payloadBytes = _textFrameBaseBytes + message.text.length;
+ final hops = normalizedPathLen + 1;
+ final airtimeMs = _estimateLoRaAirtimeMs(
+ _meshPacketHeaderBytes + normalizedPathLen + payloadBytes,
+ radioBw: radioBw,
+ radioSf: radioSf,
+ radioCr: radioCr,
+ );
+
+ return Duration(
+ milliseconds: (airtimeMs * (1.0 + _defaultAirtimeBudgetFactor) * hops)
+ .round(),
+ );
+}
+
+int _normalizedPathLen(int pathLen) {
+ if (pathLen < 0 || pathLen >= 255) return 0;
+ return pathLen.clamp(0, 64).toInt();
+}
+
+double _estimateLoRaAirtimeMs(
+ int payloadLenBytes, {
+ int? radioBw,
+ int? radioSf,
+ int? radioCr,
+}) {
+ final sf = _normalizeSf(radioSf);
+ final bw = _resolveBandwidthHz(radioBw).toDouble();
+ final cr = (_normalizeCr(radioCr) - 4).clamp(1, 4);
+ final ih = _defaultLoRaExplicitHeader == 1 ? 0 : 1;
+ final de = (sf >= 11 && _defaultLoRaBwHz <= 125000) ? 1 : 0;
+
+ final symbolMs = ((1 << sf) / bw) * 1000.0;
+ final preambleMs = (_defaultLoRaPreambleSymbols + 4.25) * symbolMs;
+
+ final num =
+ (8 * payloadLenBytes) -
+ (4 * sf) +
+ 28 +
+ (16 * _defaultLoRaCrcEnabled) -
+ (20 * ih);
+ final den = 4 * (sf - (2 * de));
+ final payloadSymCoeff = den <= 0 ? 0 : (num / den).ceil();
+ final payloadSymbols =
+ 8 + (payloadSymCoeff < 0 ? 0 : payloadSymCoeff) * (cr + 4);
+ final payloadMs = payloadSymbols * symbolMs;
+
+ return preambleMs + payloadMs;
+}
+
+int _normalizeSf(int? value) {
+ if (value == null) return _defaultLoRaSf;
+ if (value >= 5 && value <= 12) return value;
+ return _defaultLoRaSf;
+}
+
+int _normalizeCr(int? value) {
+ if (value == null) return _defaultLoRaCr;
+ if (value >= 5 && value <= 8) return value;
+ return _defaultLoRaCr;
+}
+
+int _resolveBandwidthHz(int? rawBw) {
+ if (rawBw == null) return _defaultLoRaBwHz;
+ if (rawBw > 1000) return rawBw;
+ switch (rawBw) {
+ case 0:
+ return 7800;
+ case 1:
+ return 10400;
+ case 2:
+ return 15600;
+ case 3:
+ return 20800;
+ case 4:
+ return 31250;
+ case 5:
+ return 41700;
+ case 6:
+ return 62500;
+ case 7:
+ return 125000;
+ case 8:
+ return 250000;
+ case 9:
+ return 500000;
+ default:
+ return _defaultLoRaBwHz;
+ }
+}
diff --git a/lib/utils/raw_route_probe.dart b/lib/utils/raw_route_probe.dart
new file mode 100644
index 0000000..4782a06
--- /dev/null
+++ b/lib/utils/raw_route_probe.dart
@@ -0,0 +1,87 @@
+import 'dart:typed_data';
+
+class RawRouteProbeRequest {
+ static const int _binaryMagic = 0x70; // 'p'
+
+ final int nonce;
+ final String requesterKey6;
+
+ const RawRouteProbeRequest({
+ required this.nonce,
+ required this.requesterKey6,
+ });
+
+ static RawRouteProbeRequest? tryParseBinary(Uint8List payload) {
+ if (payload.length != 11 || payload[0] != _binaryMagic) return null;
+ try {
+ final nonce =
+ (payload[1] << 24) |
+ (payload[2] << 16) |
+ (payload[3] << 8) |
+ payload[4];
+ final requesterKey6 = payload
+ .sublist(5, 11)
+ .map((b) => b.toRadixString(16).padLeft(2, '0'))
+ .join()
+ .toLowerCase();
+ return RawRouteProbeRequest(nonce: nonce, requesterKey6: requesterKey6);
+ } catch (_) {
+ return null;
+ }
+ }
+
+ Uint8List encodeBinary() {
+ if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(requesterKey6)) {
+ throw ArgumentError.value(
+ requesterKey6,
+ 'requesterKey6',
+ 'Expected 12 hex chars',
+ );
+ }
+ final out = Uint8List(11);
+ out[0] = _binaryMagic;
+ out[1] = (nonce >> 24) & 0xFF;
+ out[2] = (nonce >> 16) & 0xFF;
+ out[3] = (nonce >> 8) & 0xFF;
+ out[4] = nonce & 0xFF;
+ for (var i = 0; i < 6; i++) {
+ out[5 + i] = int.parse(
+ requesterKey6.substring(i * 2, i * 2 + 2),
+ radix: 16,
+ );
+ }
+ return out;
+ }
+}
+
+class RawRouteProbeAck {
+ static const int _binaryMagic = 0x71; // 'q'
+
+ final int nonce;
+
+ const RawRouteProbeAck({required this.nonce});
+
+ static RawRouteProbeAck? tryParseBinary(Uint8List payload) {
+ if (payload.length != 5 || payload[0] != _binaryMagic) return null;
+ try {
+ final nonce =
+ (payload[1] << 24) |
+ (payload[2] << 16) |
+ (payload[3] << 8) |
+ payload[4];
+ return RawRouteProbeAck(nonce: nonce);
+ } catch (_) {
+ return null;
+ }
+ }
+
+ Uint8List encodeBinary() {
+ final out = Uint8List(5);
+ out[0] = _binaryMagic;
+ out[1] = (nonce >> 24) & 0xFF;
+ out[2] = (nonce >> 16) & 0xFF;
+ out[3] = (nonce >> 8) & 0xFF;
+ out[4] = nonce & 0xFF;
+ return out;
+ }
+}
diff --git a/lib/utils/transmission_target_resolver.dart b/lib/utils/transmission_target_resolver.dart
index 61354b1..e4617d8 100644
--- a/lib/utils/transmission_target_resolver.dart
+++ b/lib/utils/transmission_target_resolver.dart
@@ -3,7 +3,12 @@ import 'dart:typed_data';
import '../models/contact.dart';
import '../providers/contacts_provider.dart';
-enum TransmissionTargetFailure { unknownContact, unknownRoute, tooFar }
+enum TransmissionTargetFailure {
+ unknownContact,
+ unknownRoute,
+ tooFar,
+ unreachable,
+}
class TransmissionTargetResolution {
final Contact? target;
@@ -16,7 +21,7 @@ class TransmissionTargetResolution {
required this.maxHops,
});
- int get hops => target?.outPathLen ?? -1;
+ int get hops => target?.routeHopCount ?? -1;
bool get isValid => target != null && failure == null;
}
@@ -32,11 +37,17 @@ class TransmissionTargetResolver {
String? senderName,
}) {
if (isSentByMe) {
- final recipient = _findByRecipientKey(contactsProvider, recipientPublicKey);
+ final recipient = _findByRecipientKey(
+ contactsProvider,
+ recipientPublicKey,
+ );
if (recipient != null) return recipient;
}
- final byEnvelope = _findByEnvelopeKey6(contactsProvider, senderKey6FromEnvelope);
+ final byEnvelope = _findByEnvelopeKey6(
+ contactsProvider,
+ senderKey6FromEnvelope,
+ );
if (byEnvelope != null) return byEnvelope;
final byPrefix = _findByPrefix(contactsProvider, senderPublicKeyPrefix);
@@ -64,7 +75,9 @@ class TransmissionTargetResolver {
senderName: senderName,
);
- if (target == null || target.outPathLen < 0 || target.outPathLen > maxFetchHops) {
+ if (target == null ||
+ !target.routeHasPath ||
+ target.routeHopCount > maxFetchHops) {
await refreshContacts();
target = resolveLocalTarget(
contactsProvider: contactsProvider,
@@ -83,14 +96,14 @@ class TransmissionTargetResolver {
maxHops: maxFetchHops,
);
}
- if (target.outPathLen < 0) {
+ if (!target.routeHasPath) {
return TransmissionTargetResolution(
target: target,
failure: TransmissionTargetFailure.unknownRoute,
maxHops: maxFetchHops,
);
}
- if (target.outPathLen > maxFetchHops) {
+ if (target.routeHopCount > maxFetchHops) {
return TransmissionTargetResolution(
target: target,
failure: TransmissionTargetFailure.tooFar,
diff --git a/lib/utils/voice_message_parser.dart b/lib/utils/voice_message_parser.dart
index c344d37..0d093ff 100644
--- a/lib/utils/voice_message_parser.dart
+++ b/lib/utils/voice_message_parser.dart
@@ -2,7 +2,7 @@ import 'dart:convert';
import 'dart:typed_data';
const int _meshPacketHeaderBytes = 2; // mesh header bytes before path/payload
-const int _voicePacketHeaderBytes = 8; // voice packet binary header in payload
+const int _voicePacketHeaderBytes = 6; // voice packet binary header in payload
const int _defaultLoRaSf = 10; // MeshCore companion defaults (SF10)
const int _defaultLoRaCr = 5; // MeshCore companion defaults (4/5)
const int _defaultLoRaBwHz = 250000; // MeshCore companion defaults (250kHz)
@@ -38,7 +38,7 @@ enum VoicePacketMode {
/// V:{sessionId8hex}:{modeId}:{index}/{total}:{base64Codec2}
///
/// Binary format (direct contacts, received via pushRawData):
-/// [0x56 'V'][sessionId:4B][modeId:1B][index:1B][total:1B][codec2Data...]
+/// [0x56 'V'][sessionId:4B][index:1B][codec2Data...]
class VoicePacket {
final String sessionId; // 8 hex chars (4 bytes)
final VoicePacketMode mode;
@@ -104,8 +104,7 @@ class VoicePacket {
// ── Binary format ────────────────────────────────────────────────────────
static const int _binaryMagic = 0x56; // 'V'
- static const int _binaryHeaderLen =
- 8; // magic(1)+session(4)+mode(1)+idx(1)+total(1)
+ static const int _binaryHeaderLen = 6; // magic(1)+session(4)+idx(1)
static bool isVoiceBinary(Uint8List payload) =>
payload.isNotEmpty && payload[0] == _binaryMagic;
@@ -119,16 +118,13 @@ class VoicePacket {
final sessionId = sessionBytes
.map((b) => b.toRadixString(16).padLeft(2, '0'))
.join();
- final modeId = payload[5];
- final index = payload[6];
- final total = payload[7];
- if (total < 1) return null;
+ final index = payload[5];
final codec2Data = payload.sublist(_binaryHeaderLen);
return VoicePacket(
sessionId: sessionId,
- mode: VoicePacketMode.fromId(modeId),
+ mode: VoicePacketMode.mode1300,
index: index,
- total: total,
+ total: 0,
codec2Data: codec2Data,
);
} catch (_) {
@@ -148,9 +144,7 @@ class VoicePacket {
final out = Uint8List(_binaryHeaderLen + codec2Data.length);
out[0] = _binaryMagic;
out.setRange(1, 5, sessionBytes);
- out[5] = mode.id;
- out[6] = index;
- out[7] = total;
+ out[5] = index;
out.setRange(_binaryHeaderLen, out.length, codec2Data);
return out;
}
@@ -174,25 +168,25 @@ class VoicePacket {
}
@override
- String toString() =>
- 'VoicePacket($sessionId ${mode.label} [$index/${total - 1}] ${codec2Data.length}B)';
+ String toString() {
+ final suffix = total > 0 ? ' ${mode.label} [$index/${total - 1}]' : ' [$index]';
+ return 'VoicePacket($sessionId$suffix ${codec2Data.length}B)';
+ }
}
/// Lightweight public/direct message envelope advertising voice availability.
///
/// Text format:
-/// VE2:{sid}:{mode}:{total}:{durS}:{senderKey6}:{ts}
+/// VE3:{sid}:{mode}:{total}:{durS}
/// Example:
-/// VE2:00112233:1:4:4:aabbccddeeff:kf12oi
+/// VE3:00112233:1:4:4
class VoiceEnvelope {
- static const String _prefix = 'VE2:';
+ static const String _prefix = 'VE3:';
final String sessionId;
final VoicePacketMode mode;
final int total;
final int durationMs;
- final String senderKey6;
- final int timestampSec;
final int version;
const VoiceEnvelope({
@@ -200,9 +194,7 @@ class VoiceEnvelope {
required this.mode,
required this.total,
required this.durationMs,
- required this.senderKey6,
- required this.timestampSec,
- this.version = 2,
+ this.version = 3,
});
static bool isVoiceEnvelopeText(String text) => text.startsWith(_prefix);
@@ -215,14 +207,12 @@ class VoiceEnvelope {
static VoiceEnvelope? _tryParse(String body) {
final parts = body.split(':');
- if (parts.length != 6) return null;
+ if (parts.length != 4) return null;
try {
final sid = _decodeSessionId(parts[0]);
final mode = _parseInt(parts[1], base36: true);
final total = _parseInt(parts[2], base36: true);
final durS = _parseInt(parts[3], base36: true);
- final senderKey6 = parts[4];
- final ts = _parseInt(parts[5], base36: true);
if (sid == null) {
return null;
@@ -232,19 +222,13 @@ class VoiceEnvelope {
}
if (total == null || total < 1 || total > 255) return null;
if (durS == null || durS < 0 || durS > 10 * 60) return null;
- if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(senderKey6)) {
- return null;
- }
- if (ts == null || ts <= 0) return null;
return VoiceEnvelope(
sessionId: sid,
mode: VoicePacketMode.fromId(mode),
total: total,
durationMs: durS * 1000,
- senderKey6: senderKey6.toLowerCase(),
- timestampSec: ts,
- version: 2,
+ version: 3,
);
} catch (_) {
return null;
@@ -253,7 +237,7 @@ class VoiceEnvelope {
String encodeText() {
final durationSec = (durationMs / 1000).ceil().clamp(0, 10 * 60);
- return '$_prefix${_encodeSessionId(sessionId)}:${_toBase36(mode.id)}:${_toBase36(total)}:${_toBase36(durationSec)}:${senderKey6.toLowerCase()}:${_toBase36(timestampSec)}';
+ return '$_prefix${_encodeSessionId(sessionId)}:${_toBase36(mode.id)}:${_toBase36(total)}:${_toBase36(durationSec)}';
}
}
@@ -414,18 +398,17 @@ int _resolveBandwidthHz(int? rawBw) {
/// Direct control-plane request to fetch voice packets for a session.
///
/// Text format:
-/// VR2:{sid}:{want}:{requesterKey6}:{ts}
+/// VR3:{sid}:{want}:{requesterKey6}
/// Example:
-/// VR2:00112233:a:aabbccddeeff:kf12oi
+/// VR3:00112233:a:aabbccddeeff
class VoiceFetchRequest {
- static const String _prefix = 'VR2:';
+ static const String _prefix = 'VR3:';
static const int _binaryMagic = 0x72; // 'r'
final String sessionId;
final String want;
final List missingIndices;
final String requesterKey6;
- final int timestampSec;
final int version;
const VoiceFetchRequest({
@@ -433,8 +416,7 @@ class VoiceFetchRequest {
this.want = 'all',
this.missingIndices = const [],
required this.requesterKey6,
- required this.timestampSec,
- this.version = 2,
+ this.version = 3,
});
static bool isVoiceFetchRequestText(String text) =>
@@ -450,7 +432,7 @@ class VoiceFetchRequest {
static VoiceFetchRequest? tryParseBinary(Uint8List payload) {
if (!isVoiceFetchRequestBinary(payload)) return null;
- if (payload.length < 17) return null; // magic+sid+flags+key6+ts+count
+ if (payload.length < 13) return null; // magic+sid+flags+key6+count
try {
final sidBytes = payload.sublist(1, 5);
final sid = sidBytes
@@ -463,25 +445,19 @@ class VoiceFetchRequest {
.map((b) => b.toRadixString(16).padLeft(2, '0'))
.join()
.toLowerCase();
- final ts =
- (payload[12] << 24) |
- (payload[13] << 16) |
- (payload[14] << 8) |
- payload[15];
- final missingCount = payload[16];
- if (payload.length != 17 + missingCount) return null;
+ final missingCount = payload[12];
+ if (payload.length != 13 + missingCount) return null;
final wantMissing = (flags & 0x01) == 0x01;
final missing = [];
for (var i = 0; i < missingCount; i++) {
- missing.add(payload[17 + i]);
+ missing.add(payload[13 + i]);
}
return VoiceFetchRequest(
sessionId: sid,
want: wantMissing ? 'missing' : 'all',
missingIndices: missing,
requesterKey6: requesterKey6,
- timestampSec: ts,
- version: 2,
+ version: 3,
);
} catch (_) {
return null;
@@ -490,12 +466,11 @@ class VoiceFetchRequest {
static VoiceFetchRequest? _tryParse(String body) {
final parts = body.split(':');
- if (parts.length != 4) return null;
+ if (parts.length != 3) return null;
try {
final sid = _decodeSessionId(parts[0]);
final wantToken = parts[1];
final requesterKey6 = parts[2];
- final ts = _parseInt(parts[3], base36: true);
final normalizedWant = wantToken == 'a'
? 'all'
: ((wantToken.startsWith('m'))
@@ -517,15 +492,13 @@ class VoiceFetchRequest {
if (!RegExp(r'^[0-9a-fA-F]{12}$').hasMatch(requesterKey6)) {
return null;
}
- if (ts == null || ts <= 0) return null;
return VoiceFetchRequest(
sessionId: sid,
want: normalizedWant,
missingIndices: missingIndices,
requesterKey6: requesterKey6.toLowerCase(),
- timestampSec: ts,
- version: 2,
+ version: 3,
);
} catch (_) {
return null;
@@ -536,7 +509,7 @@ class VoiceFetchRequest {
final wantToken = want == 'missing' && missingIndices.isNotEmpty
? 'm${_encodeMissingIndicesCompact(missingIndices)}'
: (want == 'all' ? 'a' : want);
- return '$_prefix${_encodeSessionId(sessionId)}:$wantToken:${requesterKey6.toLowerCase()}:${_toBase36(timestampSec)}';
+ return '$_prefix${_encodeSessionId(sessionId)}:$wantToken:${requesterKey6.toLowerCase()}';
}
Uint8List encodeBinary() {
@@ -555,7 +528,7 @@ class VoiceFetchRequest {
? missingIndices.where((v) => v >= 0 && v <= 254).toList()
: [];
- final out = Uint8List(17 + missing.length);
+ final out = Uint8List(13 + missing.length);
out[0] = _binaryMagic;
for (var i = 0; i < 4; i++) {
out[1 + i] = int.parse(sessionId.substring(i * 2, i * 2 + 2), radix: 16);
@@ -567,13 +540,9 @@ class VoiceFetchRequest {
radix: 16,
);
}
- out[12] = (timestampSec >> 24) & 0xFF;
- out[13] = (timestampSec >> 16) & 0xFF;
- out[14] = (timestampSec >> 8) & 0xFF;
- out[15] = timestampSec & 0xFF;
- out[16] = missing.length;
+ out[12] = missing.length;
for (var i = 0; i < missing.length; i++) {
- out[17 + i] = missing[i];
+ out[13 + i] = missing[i];
}
return out;
}
diff --git a/lib/widgets/common/location_display.dart b/lib/widgets/common/location_display.dart
index 0488209..95af749 100644
--- a/lib/widgets/common/location_display.dart
+++ b/lib/widgets/common/location_display.dart
@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:latlong2/latlong.dart';
import '../../l10n/app_localizations.dart';
+import '../../utils/location_formats.dart';
/// Reusable location display widget with tap-to-show modal
/// Shows coordinates in a compact format with ability to view all formats
@@ -35,9 +36,9 @@ class LocationDisplay extends StatelessWidget {
Text(
'${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
style: Theme.of(context).textTheme.titleMedium?.copyWith(
- fontFamily: 'monospace',
- fontWeight: FontWeight.w600,
- ),
+ fontFamily: 'monospace',
+ fontWeight: FontWeight.w600,
+ ),
),
const SizedBox(width: 6),
Icon(
@@ -54,9 +55,9 @@ class LocationDisplay extends StatelessWidget {
// Non-compact version (just text)
return Text(
'${location.latitude.toStringAsFixed(5)}, ${location.longitude.toStringAsFixed(5)}',
- style: Theme.of(context).textTheme.bodyMedium?.copyWith(
- fontFamily: 'monospace',
- ),
+ style: Theme.of(
+ context,
+ ).textTheme.bodyMedium?.copyWith(fontFamily: 'monospace'),
);
}
@@ -79,10 +80,7 @@ class LocationDisplay extends StatelessWidget {
children: [
const Text(
'Location Formats',
- style: TextStyle(
- fontSize: 20,
- fontWeight: FontWeight.bold,
- ),
+ style: TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
),
IconButton(
icon: const Icon(Icons.close),
@@ -121,7 +119,7 @@ class LocationDisplay extends StatelessWidget {
_buildFormatRow(
context,
'Plus Code',
- _convertToPlusCode(location.latitude, location.longitude),
+ formatPlusCode(location.latitude, location.longitude),
),
const SizedBox(height: 8),
],
@@ -140,9 +138,9 @@ class LocationDisplay extends StatelessWidget {
Text(
label,
style: Theme.of(context).textTheme.labelMedium?.copyWith(
- color: Colors.grey,
- fontWeight: FontWeight.w500,
- ),
+ color: Colors.grey,
+ fontWeight: FontWeight.w500,
+ ),
),
const SizedBox(height: 4),
InkWell(
@@ -150,7 +148,9 @@ class LocationDisplay extends StatelessWidget {
Clipboard.setData(ClipboardData(text: value));
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
- content: Text(AppLocalizations.of(context)!.copiedToClipboard(label)),
+ content: Text(
+ AppLocalizations.of(context)!.copiedToClipboard(label),
+ ),
duration: const Duration(seconds: 2),
),
);
@@ -168,9 +168,9 @@ class LocationDisplay extends StatelessWidget {
child: Text(
value,
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
- fontFamily: 'monospace',
- fontWeight: FontWeight.w500,
- ),
+ fontFamily: 'monospace',
+ fontWeight: FontWeight.w500,
+ ),
),
),
Icon(
@@ -242,31 +242,4 @@ class LocationDisplay extends StatelessWidget {
// Full MGRS would require UTM conversion library
return '$zone$letter (approximate)';
}
-
- /// Convert to Google Plus Code format
- /// Simplified implementation - returns approximate code
- String _convertToPlusCode(double lat, double lon) {
- // This is a simplified version - full Plus Code requires the open_location_code package
- const base = '23456789CFGHJMPQRVWX';
-
- // Normalize coordinates
- lat = (lat + 90) / 180; // 0 to 1
- lon = (lon + 180) / 360; // 0 to 1
-
- String code = '';
- for (int i = 0; i < 8; i++) {
- if (i == 4) code += '+';
-
- int latDigit = (lat * 20).floor() % 20;
- int lonDigit = (lon * 20).floor() % 20;
-
- code += base[latDigit];
- code += base[lonDigit];
-
- lat = (lat * 20) % 1;
- lon = (lon * 20) % 1;
- }
-
- return code;
- }
}
diff --git a/lib/widgets/connection_dialog.dart b/lib/widgets/connection_dialog.dart
index 56442a9..c5a25c5 100644
--- a/lib/widgets/connection_dialog.dart
+++ b/lib/widgets/connection_dialog.dart
@@ -21,10 +21,19 @@ class _ConnectionDialogState extends State
final List _discoveredServers = [];
int _scannedCount = 0;
int _totalToScan = 0;
- String? _connectingToServerKey; // Track which server is being connected to (ip:port)
+ int _lastTabIndex = 0;
+ String?
+ _connectingToServerKey; // Track which server is being connected to (ip:port)
// Named listener method for proper cleanup
void _onTabChanged() {
+ if (_tabController.index == _lastTabIndex) return;
+ _lastTabIndex = _tabController.index;
+
+ if (_tabController.index == 0) {
+ _refreshBleDevices();
+ }
+
if (_tabController.index == 1) {
// Switched to network tab
if (_networkScanner.hasCachedResults && _discoveredServers.isEmpty) {
@@ -47,13 +56,16 @@ class _ConnectionDialogState extends State
void initState() {
super.initState();
_tabController = TabController(length: 2, vsync: this);
- _connectionProvider = Provider.of(context, listen: false);
+ _connectionProvider = Provider.of(
+ context,
+ listen: false,
+ );
// Defer scan startup until after the first frame so Provider listeners
// are not notified while this dialog is still being built.
WidgetsBinding.instance.addPostFrameCallback((_) {
if (!mounted) return;
- _connectionProvider.startScan();
+ _refreshBleDevices();
});
// Set up network scanner callbacks
@@ -101,6 +113,12 @@ class _ConnectionDialogState extends State
_networkScanner.scan();
}
+ Future _refreshBleDevices() async {
+ await _connectionProvider.stopScan();
+ if (!mounted) return;
+ await _connectionProvider.startScan();
+ }
+
Color _getSignalColor(int rssi) {
if (rssi >= -60) return Colors.green;
if (rssi >= -75) return Colors.orange;
@@ -218,10 +236,7 @@ class _ConnectionDialogState extends State
Icons.refresh,
color: Theme.of(context).colorScheme.onPrimaryContainer,
),
- onPressed: () {
- connectionProvider.stopScan();
- connectionProvider.startScan();
- },
+ onPressed: _refreshBleDevices,
),
],
),
@@ -255,10 +270,7 @@ class _ConnectionDialogState extends State
),
const SizedBox(height: 8),
TextButton.icon(
- onPressed: () {
- connectionProvider.stopScan();
- connectionProvider.startScan();
- },
+ onPressed: _refreshBleDevices,
icon: const Icon(Icons.refresh),
label: Text(AppLocalizations.of(context)!.scanAgain),
),
diff --git a/lib/widgets/contacts/contact_route_dialog.dart b/lib/widgets/contacts/contact_route_dialog.dart
new file mode 100644
index 0000000..a54815f
--- /dev/null
+++ b/lib/widgets/contacts/contact_route_dialog.dart
@@ -0,0 +1,230 @@
+import 'package:flutter/material.dart';
+
+import '../../models/contact.dart';
+
+class ContactRouteDialog extends StatefulWidget {
+ final Contact contact;
+ final List availableContacts;
+
+ const ContactRouteDialog({
+ super.key,
+ required this.contact,
+ required this.availableContacts,
+ });
+
+ static Future show(
+ BuildContext context, {
+ required Contact contact,
+ required List