Develop #19

Merged

wt merged 107 commits from develop into main 2026-10-13 09:42:23 +00:00

Conversation 0 Commits 107 Files Changed 165

+21368 -3264

wt commented 2026-10-13 09:42:13 +00:00

Owner

Copy link

Copy source

No description provided.

wt added 107 commits 2026-10-13 09:42:14 +00:00

fix message archive sync e948114525

Update ios.yml 98d99bce98

Update ios.yml 41229649af

Create packs.yml c826cb8c82

Update packs.yml 6e177c8a39

Update packs.yml 14c42974ed

Update packs.yml 7c2bb18d3e

Update packs.yml ee901fe23e

Update WatchSessionModel.swift 0f0ea7b80f

Update WatchSessionModel.swift ee9ace7615

Update LumaCallEngine.swift 2380005593

Update CryptoKitAESGCMEngineTests.swift e14dc25891

fix warnings dee1eab897

fix errors and warnings 6a2f27d92a

Update LumaRoomStore.swift e632e46272

Update LumaRoomStore.swift 9e3b40eff7

Update LumaRoomStore.swift 69195efd36

Update XMPPService.swift 395100f0f5

Update XMPPService.swift 0eb7e689e7

Update XMPPService.swift 7791535d95

Update XMPPService.swift 94bea40220

Update PROSODY.md 5c51bacc40

updated XMPPService.swift fix warnings cd342a3f98

Update XMPPService.swift 85c06165e8

fix ios ci test callsdpnormalization 10e18eecb6

Update ios.yml 2558f722fc

more fixes for tests 88616124b6

Update packs.yml 628441a6b6

Update packs.yml 25a3fb9dd3

Update packs.yml d556cb1429

mam fixes 65605ded95

0011 0012 patch fixes 57eaf56023

0013 patch dee7e94e92

perf(xmpp): fix slow MAM/MUC-MAM and move OMEMO decryption off the main ... 9b56d2ebcf

thread

- Replace O(n^2) origin-id/stanza-id lookups in AppModel with hash
  indexes
  and stop rebuilding the whole index on every unseen stanza-id, so
  archive
  application no longer grows quadratically with history size.
- Run OMEMO decryption on a serial background queue instead of the main
  actor, and decrypt archived stanzas in small batches with a shorter
  yield,
  keeping the UI responsive during large archive catch-ups.
- Show the "Синхронизация истории…" banner only for the one-page
  bootstrap
  window; incremental backlog catch-up continues silently in the
  background.
- Fix MUC-MAM: publish decoded group mutations at the end of room
  catch-up;
  they were previously accumulated and then silently dropped.
- Retry a failed catch-up pass automatically (bounded) and lengthen the
  query/apply timeouts so a single slow page no longer leaves history
  unloaded until the next app activation.

Update XMPPService.swift b5ddb0408e

Create AGENTS.md d08f4abc1a

Update verify.sh cc5fe28e7e

Update verify.sh e4144edcb3

Update ChatArchiveTests.swift e54e95489e

Update packs.yml 5c47be36f1

Update packs.yml f071f824ce

Update packs.yml 00ceefba0e

Update packs.yml 0b4a552044

fix MAM history loading, multi-device resource, and OMEMO self-session ... 9c8cff7168

Multi-device:
- Add DeviceResource with a stable per-install UUID-based resource
  (Luma-<hex>) persisted in UserDefaults and migrated from legacy
  "Luma".
- AccountConfiguration.effectiveResource falls back to
  DeviceResource.default
  for a blank or legacy resource; LoginView defaults resource to "" with
  an
  auto placeholder.
- Prevents two devices from sharing the same full JID resource and
  kicking
  each other off the stream (the "xmpp stream error" conflict).

MAM / history:
- loadOlderHistory now always issues the RSM page request instead of
  deferring, so scrolling up reliably loads older messages.
- Track interactive history mutations separately so live messages are
  not
  dropped while an older-history page is decoding.
- ChatView: replace the unreliable GeometryReader/preference scroll
  trigger
  with onAppear/onDisappear on a top sentinel; auto-load the first page
  when
  the conversation is empty.
- AppModel: reset hasMoreOlderHistory for empty conversations and clear
  isLoadingOlderHistory on disconnect.
- Decode own/duplicate/notEncrypted messages to
  decryption-failed/plaintext
  placeholders instead of dropping them, so every MAM stanza is
  collected.

OMEMO:
- Remove the encrypt-to-self setup that built a Signal session with the
  local
  device (cryptographically invalid), which caused an endless "Bad MAC"
  loop
  and a stream of undecryptable messages in the self-chat.
- Add LumaOMEMOStore.removeSessionWithOwnDevice() and call it on connect
  to
  purge any self-session persisted by the previous build.

Tests:
- Update AccountConfigurationTests for the unique resource and add
  coverage
  for legacy-resource migration and explicit-resource preservation.

fix appicon a886917dc8

add server info screen, connection stats, and emoji picker ... 0317277d46

Server information (Monal-style):
- Add ServerInformation model and ServerInfoView reachable from
  Settings,
  showing server software (XEP-0092), disco#info identities and
  features,
  conference (MUC) services via disco#items, and STUN/TURN via XEP-0215.
- Add a curated XEP capability list with per-XEP success/error status
  derived
  from server/account disco features and connection flags.
- Detect PEP (0163) from account disco pubsub#* features, HTTP Upload
  (0363)
  from the main domain plus its components, and add Roster Versioning
  (0237),
  Pre-Authenticated Roster Subscription (0379), and SASL SCRAM Downgrade
  Protection (0474, neutral because Martin does not expose SSDP).

Connection statistics:
- Add LumaConnectionStatsModule, an XmppStanzaFilter registered before
  stream
  management, to count sent / acknowledged / received stanzas.
- Track last login and SMACKS session timestamps, and read SASL
  mechanisms
  and Client State Indication from the raw stream features.

MAM / OMEMO handling:
- Prefer a plaintext <body> fallback when OMEMO decryption fails instead
  of
  showing "failed to decrypt".
- Keep the optimistic text of our own outgoing message when its echo
  cannot
  be decrypted back, instead of replacing it with a placeholder.

Emoji picker:
- Add EmojiCatalog and a cross-platform EmojiPickerView.
- Open the picker for reactions (replacing the static quick list) and
  from
  the composer's smiley button, inserting the chosen emoji into the
  draft.

migrate persistence from JSON to SwiftData ... cbb820a86e

Models:
- Convert Conversation and ChatMessage to SwiftData @Model classes with
  a
  one-to-many relationship and cascade delete.
- Rename ChatMessage.id to clientID and drop Conversation.id in favor of
  jid
  (the string id would clash with PersistentIdentifier).
- Keep MessageReaction as a Codable value stored in an array attribute.

Persistence:
- Add ArchiveStore, a per-account ModelContainer/ModelContext that
  replaces
  the JSON ChatArchive with load/save/erase.
- Add ArchiveMetadataRecord for the durable MAM checkpoints, cursor,
  locally
  deleted message IDs and roster contact JIDs.
- Add LegacyArchiveImporter to import the old JSON snapshot once and
  delete
  the file afterwards, preserving existing history.

AppModel:
- Replace ChatArchive with ArchiveStore and persist via context.save();
  insert new models and delete the replaced object on upsert merges so
  SwiftData never keeps an orphaned duplicate.

Tests:
- Replace ChatArchiveTests with ArchiveStoreTests (store round-trip and
  legacy import) and drop the now-obsolete Codable round-trip
  assertions.

fix command 0bf01fafa4

updated ChatView one button instead four e31b3bf81a

updated ci/cd 70b692968b

Update ChatView.swift e4b26cd651

added .KeyboardType(.emailAddress) to xmppaddress TextField in ... 6cf74618d7

LoginView.swift

Update EncryptionDevicesView.swift ef1a403fbe

Update LoginView.swift 7125795249

gix warnings 711d0cb1fc

Update AGENTS.md 888501485a

добавил кнопку Копировать тект в контекстном меню сообщения #13 fe2b14ecee

Добавлено gasText в ChatMessage #13 4c16644b69

исправлена ошибка message.text->meesage.body #13 afa1958ac5

поправил синтаксическую ошибку #13 233eb7e189

Merge pull request '#13 Добавил в меню действий с сообщением возможность скопировать текст сообщения' (#14) from issue-13 into develop ... 277d8654c3

Reviewed-on: #14

finish SwiftData migration with @Query views ... 2884810ec4

- Drive chat list, timeline and forward picker from SwiftData @Query
  instead of AppModel's in-memory arrays; inject the per-account
  ModelContext from RootView with an in-memory fallback.
- Physically delete locally deleted messages (context.delete) and
  purge rows marked deleted by older builds on store open, so @Query
  views never resurrect them.
- Delete the legacy JSON snapshot only after a successful import save
  and restore the completeUntilFirstUserAuthentication data protection
  attribute on the store file.
- Mirror the old ChatArchive tolerant decoding in LegacyArchiveImporter
  so snapshots from older schema versions (missing reactions,
  isGroupMessage, roster fields) still import.
- Cover the new behaviour in ArchiveStoreTests and guard it with new
  verify.sh invariants; update AGENTS.md, ARCHITECTURE.md and
  SECURITY.md.

#11 fix SASL login failures with non-ASCII passwords ... fc07855036

- Normalize SCRAM passwords with RFC 4013 SASLprep before the
  challenge response, so they match SASLprep-compliant servers
  (Martin hashes raw UTF-8) and PLAIN still sends the password
  untouched.
- Capture the raw <failure/> condition with LumaSaslFailureModule and
  map SASL errors to actionable Russian messages instead of the
  cryptic OS-localized "Martin.SaslError, error 5".
- Cover SASLprep and failure message mapping with unit tests and new
  verify.sh invariants.

#10 add group chat delete alongside leave ... 4566b59ff1

- Delete a group chat from GroupInfoView or via a swipe in the chat
  list: remove the conversation and its messages from SwiftData,
  clean per-chat state, and leave the room on the server first when
  joined.
- Keep "Покинуть комнату" as leave-without-deleting and suppress
  deleted rooms for the session so roomState events cannot recreate
  them; an explicit rejoin or a fresh invitation clears the
  suppression.
- Add verify.sh invariants and document the behaviour in
  ARCHITECTURE.md.

#6 fix gallery preview after canceling a previous pick ... b54113f0e4

- Stage picked media only when the picker is dismissed with a
  confirmed selection instead of on every selection change, so
  canceling restores an empty binding and never schedules a preview.
- Reset the selection binding after dismissal and recreate the picker
  via a reset token, so a stale selection can no longer leak into the
  next presentation and break its preview/send flow.
- Add verify.sh invariants for the picker state machine.

#5 fix camera capture preview after shooting ... 5790f9b2f6

- Dismiss the camera fullScreenCover through the SwiftUI binding
  synchronously in the picker delegate before background file
  preparation, so UIImagePickerController no longer dismisses itself
  and desynchronizes the presentation state that the preview sheet
  waits on.
- Keep the archive-sync suspension reserved across the dismissal and
  surface an explicit error when the captured file fails to prepare.
- Add verify.sh invariants for the camera dismissal flow.

#5 fix camera video preview after shooting ... 75fbcc5346

- Claim the picker-owned temp movie synchronously inside the picker
  delegate with FileManager.moveItem before returning, so the picker's
  post-dismissal cleanup can no longer delete the source while a
  background copy is reading it.
- Deliver the captured movie to the staging flow immediately; heavy
  staging and thumbnail work still runs off the main thread.
- Add a verify.sh invariant for the synchronous movie claim.

fix #5 camera video preview with settling and diagnostics ... 496ee6f0f2

- Wait until the picker movie's file size stops changing before
  staging it, so a movie whose final bytes are still being flushed is
  never copied truncated (which produced drafts without a thumbnail
  and unplayable previews).
- Log the whole camera video path (pickup size, staging result,
  analyze outcome, thumbnail decode) under the video-preview os_log
  category for fast on-device diagnosis.
- Cover the video analysis pipeline with a simulator test that
  generates an HEVC QuickTime movie and asserts duration plus JPEG
  thumbnail, and guard the diagnostics in Scripts/verify.sh.

#11 explain SCRAM proof mismatches and make the password visible ... 33702420a0

- Translate Prosody's "doesn't match the one we calculated" SCRAM
  failure into an actionable Russian message pointing at the typed
  password, since the client math itself is verified against the
  RFC 5802 test vector.
- Set explicit username/password text content types on the login
  screen, disable smart text features, and add a password visibility
  toggle so users can verify what they submit.
- Cover the mapping with a unit test and verify.sh invariants.

#7 add SCRAM-SHA-512 and document TLS 1.3 support ... b0eb44d7a7

- Implement SCRAM-SHA-512 (RFC 5802 with SHA-512) as a Luma-side
  SaslMechanism and register it ahead of Martin's SHA-256/SHA-1/PLAIN,
  so modern servers preferring SHA-512 authenticate with it.
- Verify the math against Python-computed reference vectors (salted
  password, client proof, server signature) in SCRAMSHA512Tests and
  guard the mechanism registration in Scripts/verify.sh.
- Confirm the TLS stack negotiates TLS 1.3 (negotiatedSSL + ALPN via
  SecureTransport, handshake verified against a TLS 1.3-only server)
  and document the TLS/SCRAM posture in SECURITY.md.

#8 add app lock with passcode and biometric unlock ... 0d78e02d2b

- Gate every layer behind AppLockView when the lock is enabled and
  lock on launch and on backgrounding; the passcode lives only in the
  Keychain (AppLockVault) and the enable state defaults to off.
- Add the lock section to Settings: enable/setup, change passcode and
  disable all require the current passcode via a shared passcode
  sheet; Face ID / Touch ID unlock prompts automatically and can be
  toggled with passcode confirmation.
- Add NSFaceIDUsageDescription to both app targets, cover the passcode
  policy with tests, guard the feature in verify.sh and document it in
  SECURITY.md.

#12 sync call history between devices via carbons and MAM ... 1a26651daa

- After a call ends, send a plaintext <call-history/> service message
  to the user's own bare JID with direction, status, duration, start
  time, peer and video flag plus the call id as origin-id.
- Intercept the payload on live, carbon and MAM paths and upsert the
  same system call card on every device; deduplication reuses the
  origin-id as clientID, and missed incoming calls bump unread.
- Cover payload parsing and round-trip in CallHistorySyncTests, guard
  the namespace and interception in verify.sh, and document the flow
  in ARCHITECTURE.md.

tame the reply swipe so vertical scrolling stays clean ... 0ef77f7f6a

- Raise the swipe dominance threshold to 2.0 and add a 24pt
  activation distance so diagonal timeline scrolls never move bubbles
  or fire haptics, and snap the indicator back when a gesture turns
  vertical mid-drag.
- Cover the stricter thresholds in MessageReplySwipeTests.

make the reply swipe reliable and add a telegram-style plate ... 2130a76735

- Lock the gesture into a reply swipe once it starts clearly
  horizontal (1.6 dominance, 12pt) and relax the ratio to 1.05
  afterwards, so a slightly diagonal finish no longer cancels the
  swipe while vertical scrolls stay untouched.
- Restyle the composer reply banner as a rounded telegram-like card
  with the reply header, close button and two-line quote preview.
- Cover the lock/follow behaviour in MessageReplySwipeTests.

restrict the reply swipe to right-to-left ... 2868a13abd

- Accept only negative-width translations in canLock, offset and
  shouldReply so swiping left-to-right stays entirely with the scroll
  view while right-to-left keeps the lock/follow behaviour.
- Mirror the restriction in MessageReplySwipeTests and fix the
  line-sensitive PhotosPicker data-fallback guard in verify.sh.

stop the disconnected-history alert from blocking scrolling ... 5a7fc36722

- Skip older-history loads silently while the connection is down:
  the trigger previously failed with "not connected", popped the
  global alert over the timeline and froze scrolling until dismissed.
- Accept fast reply-swipe flicks whose end state is clearly leftward
  even without an intermediate horizontal lock, while scroll-owned
  touches still never activate the swipe.
- Add a seeded-chat UI test mode (launch argument), accessibility
  identifiers and a LumaUITests target with timeline scroll and reply
  swipe tests; guard the fix in verify.sh.

fix undecryptable self-copies by preserving the self-session ... 8b86e33186

- Purge the poisoned self-session only once per account instead of on
  every connect, and rebuild it from the own published bundle when
  missing: deleting it repeatedly broke encrypt-to-self, so archived
  copies of own messages (most visibly in the self-chat) failed with
  "could not decrypt".
- Detect OMEMO 2 (urn:xmpp:omemo:2) payloads, which the pinned
  MartinOMEMO does not implement, and show them as undecryptable
  instead of empty plaintext bubbles.
- Guard both behaviours in verify.sh and document the namespace
  limitation in SECURITY.md.

fix app lock hanging on macOS and blocking the photo picker ... 6ed5cb3ce9

- Lock only when the scene really backgrounds: transient inactive
  states (system photo picker, app switcher) no longer swap in the
  lock screen and break gallery selection on iOS.
- Cache biometric availability once per session off the main thread
  instead of calling LAContext.canEvaluatePolicy in view bodies,
  which froze the macOS lock screen, and auto-prompt biometrics on
  iOS only.
- Keep UI tests as an opt-in target and guard both fixes in
  verify.sh.

add a telegram-style bottom tab bar to the main screen ... efe3986ba5

- Replace the sidebar-based MainChatView with MainTabView: a custom
  bottom bar with Контакты / Звонки / Чаты / Настройки that looks the
  same on iOS and macOS, and open chats via push navigation.
- Put the search field above the chat and contact lists (searchable on
  iOS, an inline field on macOS) and add an aggregated call-history
  screen backed by model.callHistoryMessages.
- Embed SettingsView as a tab, update verify.sh guards, and keep CI on
  deterministic unit tests while the UI tests stay runnable manually.

updated to tabView 97e8f4bab6

added omemo2 7db327c588

telegram ui style f7e22364fd

fix macos build df7ab24677

updated ui for macos and ios e3fcee3351

tls sasl d4b4c92759

serverinfoview 1650145d4d

added preview for views 1e2670903f

updated up cf2bda9c54

some fixes e28a4043ee

fix 772d4505ea

added bubble tails b37c71720b

added chatbubbleshape 2d29f82647

added .read state 299f78de36

added .read state 16c9fab509

fix self-chat read state: mark own outgoing messages as read locally ... 8a2af872d6

Self-chat returned early in sendDisplayedMarkerIfNeeded, so outgoing
messages never reached markRead and never showed the Read status.

fix read state in self-chat and stop leaking read-marker into it (#18) ... ade7efea1a

Self-chat never showed Read: the outgoing message was promoted by
sendDisplayedMarkerIfNeeded, but a later XEP-0184 <received/> receipt
or a LMM correction overwrote .read with .delivered/.sent directly,
bypassing Delivery.merged. Mark self-addressed outgoing messages read
as soon as the server accepts them and merge every weaker status into
the ladder instead of overwriting.

The self-addressed read-marker carried a plaintext <body>, so clients
that do not know our namespace (Conversations, Monal) rendered it as a
"Сообщение прочитано" bubble in the self-chat. Service stanzas now ride
on their payload element only.

Refs #18

fix optional account unwrap in editMessage self-chat read (#18) ... 338affd89e

editMessage has no guard let account, so the self-chat read shortcut
compared against an optional; use optional chaining to build.

Refs #18

mark outgoing 1:1 messages <markable/> so peers can send displayed markers (#18) ... 0d6c562abd

Martin only attaches <request/> (XEP-0184 receipts) in createMessage, so
Conversations/Monal had no licence to answer with <displayed/> and read
state was stuck on delivered. MUC stays exempt per XEP-0333.

added more anomations 3e990e7af9

fix more animations 28e8c2e2a8

updated ci/cd 864a8b68f2

Update macos.yml e1f27cd8b2

some fixes 95a1c62b54

added multi accounting #4 ca1a69e61f

fix some #4 de61940c95

updated sheet close when successful added another acoount #4 8f235b4ff9

bump to 20261013.0 6969863d1e

wt merged commit 8ecd38499d into main 2026-10-13 09:42:23 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

Compat/Breaking

Breaking change that won't be backward compatible

Kind/Bug

Something is not working

Kind/Documentation

Documentation changes

Kind/Enhancement

Improve existing functionality

Kind/Feature

New functionality

Kind/Security

This is security issue

Kind/Testing

Issue or pull request related to testing

Priority

Critical

1

The priority is critical

Priority

High

2

The priority is high

Priority

Medium

3

The priority is medium

Priority

Low

4

The priority is low

Reviewed

Confirmed

1

Issue has been confirmed

Reviewed

Duplicate

2

This issue or pull request already exists

Reviewed

Invalid

3

Invalid issue

Reviewed

Won't Fix

3

This issue won't be fixed

Status

Blocked

1

Something is blocking this issue or pull request

Status

Need More Info

2

Feedback is required to reproduce issue or to continue work

Status

Abandoned

3

Somebody has started to work on this but abandoned work

No labels

Milestone

No items

No Milestone

Projects

Clear projects

No projects

Assignees

Clear assignees

wt (wt)

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: wt/Luma#19