Skip to content

fix: Don't show read marker without message afterwards #2572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
SystemKeeper wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Draft

fix: Don't show read marker without message afterwards #2572

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions NextcloudTalk/Chat/ChatViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1450,6 +1450,8 @@ import SwiftUI

if let lastMessage, lastMessage.messageId > self.lastReadMessage {
// Iterate backwards to find the correct location for the unread message separator
var foundOneMessage = false

for sectionIndex in self.dateSections.indices.reversed() {
let dateSection: Date = self.dateSections[sectionIndex]

Expand All @@ -1458,6 +1460,14 @@ import SwiftUI
for messageIndex in messages.indices.reversed() {
let message = messages[messageIndex]

// The unread marker should never be inserted after the first message, as that would
// show it without any message afterwards. Therefore we check if we found at least one
// message, before adding the marker
if !foundOneMessage {
foundOneMessage = true
continue
}

if message.messageId > self.lastReadMessage {
continue
}
Expand Down
Loading