Two 0.32 lines had diverged since 28 September. main carried the Spanish
localization (853 strings) and friend-to-friend bridge sharing;
release/android-0-32 carried 65 commits of stories, Today, the shared test
vectors, the shell peer and envelope wake parity. Neither was a superset, so
this is a real merge of 26 conflicting hunks across 15 files.
.e2e-ref now pins flamenet-e2e 4b4042f, the commit that unified the two spec
lines. Before that no single pin covered both sides. .gitlab-ci.yml takes the
release branch's version, as the owner chose.
Conflicts that were decisions, not text:
- Conversations.kt looked like two versions of uploadAttachment. It was not:
that function exists only on the release branch, and git had paired its
doc comment and parameter list with the body of main's sendGroupAttachment.
Resolving side by side would have deleted one function. Both are written
out whole, and the attachment padding of 23.7 and 23.9 is intact.
- MessengerService and Session: main suppressed alerts for this account's own
device copies (14.5, 17.2); theirs added card, event and game notices with
snooze handling. Session keeps the quiet set and the notice bookkeeping and
returns touched + quiet, so quiet threads still count as unread, and the
service subtracts them before anything is raised.
- MainActivity: contact links and hello links are different schemes, so both
handlers stay. Hello runs first, because helloLinkIn matches only its own
scheme and leaves the intent alone, while the contact handler consumes any
VIEW data and would swallow every hello link.
- MessengerViewModel: fetchedBuddies is not in scope at that point, so the
roster comes from the vault as theirs has it, with the status localized.
Nine string keys to match: seven new (the hello-link QR label, the card and
event forward notes, the Today tab and the three attach row labels) and two
reworded, because supervision now hides the Today tab. English and Spanish
both, so parity holds at 879 keys each side.
No Java on the machine this was merged on, so CI is the first compile.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
