Skip to content

Align Android message status wording - #6133

Merged
jamesarich merged 7 commits into
meshtastic:mainfrom
RCGV1:codex/message-status-routing-followup
Aug 11, 2026
Merged

Align Android message status wording#6133
jamesarich merged 7 commits into
meshtastic:mainfrom
RCGV1:codex/message-status-routing-followup

Conversation

@RCGV1

@RCGV1 RCGV1 commented Jul 7, 2026

Copy link
Copy Markdown
Member

Summary

  • Align Android message routing error labels with the standardized wording.
  • Keep Channel/key mismatch terminal and error-colored: resending unchanged content cannot repair a channel or PSK mismatch.
  • Keep only the English documentation update; Crowdin-managed localized docs are not hand-edited.
  • Commit screenshot goldens for the added message-status preview states.

Screenshots

Message status states — light

Message status states — dark

Validation

  • Focused core:model and feature:messaging JVM tests
  • Focused Spotless and detekt
  • Message-status screenshot update and validation

Hardware verification

Not performed; the PR remains draft.

Summary by CodeRabbit

  • Bug Fixes

    • Improved message delivery status handling, including clearer warning and error states.
    • Added specific feedback for unavailable interfaces, missing responses, invalid requests, authorization failures, rate limits, duty-cycle limits, and administrative access errors.
    • Clarified channel/key mismatch and encryption-related error displays.
  • Documentation

    • Updated delivery error names, explanations, and troubleshooting guidance.
  • Localization

    • Added and refined user-facing routing error messages for supported languages.

@coderabbitai

coderabbitai Bot commented Jul 7, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

Important

Review skipped

Auto incremental reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: b502de29-e947-4794-83c9-77ddb46c1acd

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
📝 Walkthrough

Walkthrough

Message routing errors now use dedicated resources, clearer text, expanded retryability coverage, and updated message status presentation. Documentation and tests reflect the new error mappings and UI behavior.

Changes

Message Routing Error Feedback

Layer / File(s) Summary
Routing error mappings and resources
.skills/compose-ui/strings-index.txt, core/model/..., core/resources/..., docs/en/user/messages-and-channels.md
Dedicated resources and clearer descriptions now cover additional routing errors. Model mappings and tests cover message-specific, generic, and retryable cases.
Message status presentation
feature/messaging/...
Retryable direct-message errors now use warning styling. Preview messages cover the expanded routing error set. Compose tests validate channel/key mismatch text and error coloring.

Estimated code review effort: 3 (Moderate) | ~20 minutes

Suggested labels: enhancement

Suggested reviewers: jamesarich, thebentern

🚥 Pre-merge checks | ✅ 5 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Tests Prove The Path, Not The End State ⚠️ Warning The new UI test derives statusColor from the same model logic and never inspects rendered color, so it passes after the MessageItem change is reverted; added retryability positives also pass agains... Assert the rendered status color directly, such as through semantics or a screenshot, and add mutation-sensitive retryability cases only where production behavior changes.
✅ Passed checks (5 passed)
Check name Status Explanation
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Sibling Call Sites And Presence Semantics ✅ Passed The PR changes routing-error resources and message-status UI only; it changes no nullable/presence semantics or physical metric defaults, and neither NodeItem nor NodeItemCompact is modified.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly summarizes the primary change: standardizing Android message status wording.
✨ Finishing Touches 💡 2
⚔️ Resolve merge conflicts 💡
  • Resolve merge conflict in branch codex/message-status-routing-followup
🛠️ Fix failing CI checks 💡
  • Create stacked PR
  • Commit on current branch

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@roberthadow

Copy link
Copy Markdown

Hello @RCGV1 --

This is excellent. I have already volunteered to help documentation for the Android UI as soon as the details are sorted.

@jamesarich

Copy link
Copy Markdown
Collaborator

A few things before this comes out of draft:

  1. Scope / translations. Most of the 44 files are the 36 hand-edited docs/<locale>/user/messages-and-channels.md files. Those are Crowdin-managed outputs (crowdin.yml maps translations to docs/{code}/user/), so these edits will be overwritten on the next sync — and right now they inject English into localized docs (e.g. docs/ar-rSA/user/messages-and-channels.md:80 shows "Failed to deliver to mesh" in the Arabic table). Please revert all non-English docs and keep only docs/en/user/messages-and-channels.md; Crowdin handles the rest. That drops this to ~6 files.

  2. screenshot-check is red. The new preview states in MessageItemPreviews.kt don't have committed golden PNGs. Please run the screenshot-update task and commit them.

  3. Undocumented behavior change. Message.kt:166 removes NO_CHANNEL from nonRetryableMessageRoutingErrors, which makes channel/key-mismatch failures retryable and warning-colored (MessageItem.kt:399). That's a real behavior change, not just wording — please call it out in the description and confirm it's intended.

The core wording/logic change looks clean (no values-*/strings.xml edits, index regenerated, tests added).

@jamesarich jamesarich left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Requesting changes — three items to resolve before this leaves draft (detail in the comment above):

  1. Revert the 36 Crowdin-managed locale docs. crowdin.yml owns docs/{code}/user/; hand-editing them corrupts localized content (English injected into non-English tables, e.g. docs/ar-rSA/user/messages-and-channels.md:80) and gets clobbered on the next sync. Keep only docs/en/user/messages-and-channels.md. This drops the PR from 44 files to ~6.
  2. Commit the screenshot goldens for the new MessageItemPreviews.kt states — screenshot-check is red without them.
  3. Document the NO_CHANNEL behavior change (Message.kt:166 makes channel/key-mismatch failures retryable + warning-colored) in the description, and confirm it's intended — it's a behavior change, not just wording.

The core logic/wording change itself looks clean.

@RCGV1
RCGV1 marked this pull request as ready for review August 9, 2026 15:38

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In
`@feature/messaging/src/commonTest/kotlin/org/meshtastic/feature/messaging/component/MessageItemTest.kt`:
- Around line 207-231: Update channelKeyMismatch_isTerminalAndUsesErrorColor to
verify the rendered MessageItem styling rather than calling messageStatusColor
directly; use a retryable routing-error message and assert its warning color
through the UI, while keeping the NO_CHANNEL terminal-text assertion separate.
Ensure the test would fail if MessageItem stops passing isRetryableFailure.
🪄 Autofix

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 34530f3e-9419-4cc0-8246-1b2938259072

📥 Commits

Reviewing files that changed from the base of the PR and between 5fde2d3 and f3ffc0b.

⛔ Files ignored due to path filters (2)
  • screenshot-tests/src/screenshotTestDebug/reference/org/meshtastic/screenshots/feature/MessagingScreenshotTestsKt/ScreenshotMessageItemStatusStates_Dark_d19fbf1f_0.png is excluded by !**/*.png, !**/*.png
  • screenshot-tests/src/screenshotTestDebug/reference/org/meshtastic/screenshots/feature/MessagingScreenshotTestsKt/ScreenshotMessageItemStatusStates_Light_b29dc7a7_0.png is excluded by !**/*.png, !**/*.png
📒 Files selected for processing (8)
  • .skills/compose-ui/strings-index.txt
  • core/model/src/commonMain/kotlin/org/meshtastic/core/model/Message.kt
  • core/model/src/commonTest/kotlin/org/meshtastic/core/model/DataPacketTest.kt
  • core/resources/src/commonMain/composeResources/values/strings.xml
  • docs/en/user/messages-and-channels.md
  • feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
  • feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/MessageItemPreviews.kt
  • feature/messaging/src/commonTest/kotlin/org/meshtastic/feature/messaging/component/MessageItemTest.kt

RCGV1 added 4 commits August 9, 2026 18:00
…s-routing-followup

# Conflicts:
#	feature/messaging/src/commonMain/kotlin/org/meshtastic/feature/messaging/component/MessageItem.kt
#	screenshot-tests/src/screenshotTestDebug/reference/org/meshtastic/screenshots/feature/MessagingScreenshotTestsKt/ScreenshotMessageItemStatusStates_Dark_d19fbf1f_0.png
#	screenshot-tests/src/screenshotTestDebug/reference/org/meshtastic/screenshots/feature/MessagingScreenshotTestsKt/ScreenshotMessageItemStatusStates_Light_b29dc7a7_0.png
@jamesarich jamesarich added the enhancement New feature or request label Aug 11, 2026
@jamesarich
jamesarich self-requested a review August 11, 2026 15:37
@jamesarich
jamesarich added this pull request to the merge queue Aug 11, 2026
Merged via the queue into meshtastic:main with commit 5ee5a5b Aug 11, 2026
15 of 16 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ai-generated enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants