Bladeren bron

adapt error handling if a day marker is the last entry of a chat

cyberta 4 jaren geleden
bovenliggende
commit
907d37ad2b
1 gewijzigde bestanden met toevoegingen van 8 en 4 verwijderingen
  1. 8 4
      deltachat-ios/Chat/ChatViewController.swift

+ 8 - 4
deltachat-ios/Chat/ChatViewController.swift

@@ -509,11 +509,15 @@ class ChatViewController: UITableViewController {
         _ = handleUIMenu()
         _ = handleUIMenu()
 
 
         let id = messageIds[indexPath.row]
         let id = messageIds[indexPath.row]
-        if id == DC_MSG_ID_DAYMARKER, messageIds.count > indexPath.row + 1 {
-            let nextMessageId = messageIds[indexPath.row + 1]
-            let nextMessage = DcMsg(id: nextMessageId)
+        if id == DC_MSG_ID_DAYMARKER {
             let cell = tableView.dequeueReusableCell(withIdentifier: "info", for: indexPath) as? InfoMessageCell ?? InfoMessageCell()
             let cell = tableView.dequeueReusableCell(withIdentifier: "info", for: indexPath) as? InfoMessageCell ?? InfoMessageCell()
-            cell.update(text: DateUtils.getDateString(date: nextMessage.sentDate))
+            if messageIds.count > indexPath.row + 1 {
+                let nextMessageId = messageIds[indexPath.row + 1]
+                let nextMessage = DcMsg(id: nextMessageId)
+                cell.update(text: DateUtils.getDateString(date: nextMessage.sentDate))
+            } else {
+                cell.update(text: "ErrDaymarker")
+            }
             return cell
             return cell
         }
         }