fix: remove broken cherry-pick artifacts that prevent compilation#659
Merged
torlando-tech merged 2 commits intorelease/v0.9.xfrom Mar 11, 2026
Merged
Conversation
Commit ae1cbd2 (sort messages by received time) was cherry-picked from main but carried along changes referencing code not on this branch: - SettingsScreen.kt: DisposableEffect lifecycle observer and MessageDeliveryRetrievalCard params for background location permission flow (hasForegroundPermission, hasBackgroundPermission, Toast, Settings) - MessagingViewModel.kt: unused ReceivedLocationRepository import - Test files: same unused import These references cause compilation failures on the release branch, which broke the v0.9.19-beta tagged release build. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Greptile SummaryThis PR removes cherry-pick artifacts from commit Key changes:
Confidence Score: 5/5
Important Files Changed
Sequence DiagramsequenceDiagram
participant LR as LXMF Router
participant RW as ReticulumWrapper._on_lxmf_delivery
participant PI as router.pending_inbound
participant KC as kotlin_message_received_callback
LR->>PI: append(lxmf_message)
LR->>RW: callback fires
RW->>PI: check: message already in queue? (skip re-add)
RW->>KC: invoke with full message event
KC-->>RW: success
RW->>PI: remove(lxmf_message)
Note over PI: queue length 0 after successful delivery
Last reviewed commit: 4c853c3 |
Same fix as 1a3a694 applied to test_wrapper_messaging.py — the reaction test needs the same treatment. The release branch removes messages from pending_inbound after successful callback (e00d2a3), so the test must pre-populate the queue and assert it's empty after. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Contributor
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
ae1cbd26b(sort messages by received time) was cherry-picked frommainto the release branch but carried along changes that reference code only onmainDisposableEffectlifecycle observer andMessageDeliveryRetrievalCardparameters for background location permission flow (hasForegroundPermission,hasBackgroundPermission,showBackgroundLocationSheet,Toast,Settings) — none of which exist on this branchReceivedLocationRepositoryimport (class doesn't exist on this branch)v0.9.19-betatagged release build (run)Test plan
compileNoSentryDebugKotlinpasses (was failing before)MapViewModelTest,SettingsViewModelTest,MessagingViewModelTest,MessagingViewModelImageLoadingTestall pass🤖 Generated with Claude Code