浏览代码

use firstIndex() instead of deprecated index()

B. Petersen 3 年之前
父节点
当前提交
b3e12524eb
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      deltachat-ios/Chat/ChatViewController.swift

+ 2 - 2
deltachat-ios/Chat/ChatViewController.swift

@@ -972,7 +972,7 @@ class ChatViewController: UITableViewController {
     private func scrollToLastUnseenMessage() {
     private func scrollToLastUnseenMessage() {
         DispatchQueue.main.async { [weak self] in
         DispatchQueue.main.async { [weak self] in
             guard let self = self else { return }
             guard let self = self else { return }
-            if let markerMessageIndex = self.messageIds.index(of: Int(DC_MSG_ID_MARKER1)) {
+            if let markerMessageIndex = self.messageIds.firstIndex(of: Int(DC_MSG_ID_MARKER1)) {
                 let indexPath = IndexPath(row: markerMessageIndex, section: 0)
                 let indexPath = IndexPath(row: markerMessageIndex, section: 0)
                 self.tableView.scrollToRow(at: indexPath, at: .top, animated: false)
                 self.tableView.scrollToRow(at: indexPath, at: .top, animated: false)
             } else {
             } else {
@@ -1393,7 +1393,7 @@ class ChatViewController: UITableViewController {
             let msg = dcContext.getMessage(id: messageId)
             let msg = dcContext.getMessage(id: messageId)
             if msg.state != DC_STATE_OUT_DRAFT,
             if msg.state != DC_STATE_OUT_DRAFT,
                msg.chatId == chatId {
                msg.chatId == chatId {
-                if let newMsgMarkerIndex = messageIds.index(of: Int(DC_MSG_ID_MARKER1)) {
+                if let newMsgMarkerIndex = messageIds.firstIndex(of: Int(DC_MSG_ID_MARKER1)) {
                     messageIds.remove(at: newMsgMarkerIndex)
                     messageIds.remove(at: newMsgMarkerIndex)
                 }
                 }
                 insertMessage(msg)
                 insertMessage(msg)