Browse Source

Merge pull request #1280 from deltachat/new2-date-label

forward if message after daymarker is another marker
bjoern 4 years ago
parent
commit
f8e59f5055
1 changed files with 5 additions and 1 deletions
  1. 5 1
      deltachat-ios/Chat/ChatViewController.swift

+ 5 - 1
deltachat-ios/Chat/ChatViewController.swift

@@ -530,7 +530,11 @@ class ChatViewController: UITableViewController {
         if id == DC_MSG_ID_DAYMARKER {
             let cell = tableView.dequeueReusableCell(withIdentifier: "info", for: indexPath) as? InfoMessageCell ?? InfoMessageCell()
             if messageIds.count > indexPath.row + 1 {
-                let nextMessageId = messageIds[indexPath.row + 1]
+                var nextMessageId = messageIds[indexPath.row + 1]
+                if nextMessageId == DC_MSG_ID_MARKER1 && messageIds.count > indexPath.row + 2 {
+                    nextMessageId = messageIds[indexPath.row + 2]
+                }
+
                 let nextMessage = dcContext.getMessage(id: nextMessageId)
                 cell.update(text: DateUtils.getDateString(date: nextMessage.sentDate))
             } else {