瀏覽代碼

forward if message after daymarker is another marker; a loop seems not to be required as three are no longer chains of markers. in the long-term, however, the date from the daymarker itself can be used, which, however, would require some more refactoring

B. Petersen 4 年之前
父節點
當前提交
1f0fecb307
共有 1 個文件被更改,包括 5 次插入1 次删除
  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 {