Skip to content

Conversation

@mdecourcy
Copy link
Contributor

@mdecourcy mdecourcy commented Nov 12, 2025

This PR ensures the Android client always asks the radio for its buffered text messages after a disconnect/reconnect and captures the responses. We now persist the last StoreForward replay marker per device, issue a CLIENT_HISTORY request (and restart the RX collector) as soon as any transport returns to CONNECTED, and ship focused debug logs/tests. That brings Wi‑Fi/TCP reconnects back in line with BLE/2.7.5, so queued messages are delivered again.

To close #3672

big thanks to @dblaber / corruptedstack on discord for helping verify! My heltec just came in and I have also verified.

@github-actions github-actions bot added the bugfix PR tag label Nov 12, 2025
@codecov
Copy link

codecov bot commented Nov 12, 2025

Codecov Report

❌ Patch coverage is 6.74847% with 152 lines in your changes missing coverage. Please review.
✅ Project coverage is 0.56%. Comparing base (4a5c63a) to head (68bf77c).
⚠️ Report is 3 commits behind head on main.

Files with missing lines Patch % Lines
...in/java/com/geeksville/mesh/service/MeshService.kt 7.23% 141 Missing ⚠️
...kotlin/org/meshtastic/core/prefs/mesh/MeshPrefs.kt 0.00% 11 Missing ⚠️
Additional details and impacted files
@@           Coverage Diff            @@
##            main   #3676      +/-   ##
========================================
+ Coverage   0.51%   0.56%   +0.05%     
========================================
  Files        377     377              
  Lines      21298   21449     +151     
  Branches    2580    2622      +42     
========================================
+ Hits         109     122      +13     
- Misses     21169   21307     +138     
  Partials      20      20              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mdecourcy mdecourcy force-pushed the fix/tcp-backfill-regression branch 2 times, most recently from 2fde6b9 to e2bd4e6 Compare November 13, 2025 15:21
@mdecourcy mdecourcy marked this pull request as draft November 13, 2025 18:34
@mdecourcy mdecourcy changed the title WIP: address backfill issue on tcp connections; add logging fix: address backfill issue on tcp connections; add logging Nov 14, 2025
@mdecourcy mdecourcy force-pushed the fix/tcp-backfill-regression branch from a99fb61 to 3668f93 Compare November 14, 2025 01:26
@mdecourcy mdecourcy force-pushed the fix/tcp-backfill-regression branch from 3668f93 to 24729ba Compare November 14, 2025 01:38
@mdecourcy mdecourcy marked this pull request as ready for review November 14, 2025 01:46
Copy link
Collaborator

@jamesarich jamesarich left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like the rebase munged a few of the things implemented in #3691


PayloadVariantCase.LOG_RECORD -> { proto: MeshProtos.FromRadio -> handleLogRecord(proto.logRecord) }
PayloadVariantCase.LOG_RECORD -> { proto: MeshProtos.FromRadio -> handleLogReord(proto.logRecord) }

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oop looks like you undid my typo fix... and some of the logging I had added in #3691 for the bt connection, mind giving it another pass?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad yeah i was in rebase hell for a bit there. On it

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When it gets too bad, cherrypicking the other way onto a new branch is often easier

Copy link
Collaborator

@DaneEvans DaneEvans left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good

…htastic#3691)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>
@jamesarich jamesarich added this pull request to the merge queue Nov 14, 2025
Merged via the queue into meshtastic:main with commit 7369a9b Nov 14, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix PR tag

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Bug]: Network (TCP/WIFI) losing packets when disconnected and reconnected in v2.7.6-open.4

3 participants