adapt to api without get_original_chat_id()

deltachat · Jan 30, 2025 · b93a026 · b93a026
1 parent ba5ae11
commit b93a026
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/deltachat-ios/Chat/ChatViewController.swift b/deltachat-ios/Chat/ChatViewController.swift
@@ -2233,10 +2233,10 @@ extension ChatViewController: BaseMessageCellDelegate {
         guard let appDelegate = UIApplication.shared.delegate as? AppDelegate else { return }
         let savedMessage = dcContext.getMessage(id: messageIds[indexPath.row])
 
-        let originalChatId = savedMessage.originalChatId
-        if originalChatId != 0 {
-            let originalMessageId: Int? = savedMessage.originalMessageId == 0 ? nil : savedMessage.originalMessageId
-            appDelegate.appCoordinator.showChat(chatId: originalChatId, msgId: originalMessageId, animated: true, clearViewControllerStack: true)
+        let originalMessageId = savedMessage.originalMessageId
+        if originalMessageId != 0 {
+            let originalMessage = dcContext.getMessage(id: originalMessageId)
+            appDelegate.appCoordinator.showChat(chatId: originalMessage.chatId, msgId: originalMessageId, animated: true, clearViewControllerStack: true)
         }
     }
 

diff --git a/deltachat-ios/Chat/Views/Cells/BaseMessageCell.swift b/deltachat-ios/Chat/Views/Cells/BaseMessageCell.swift
@@ -439,7 +439,7 @@ public class BaseMessageCell: UITableViewCell {
             avatarView.isHidden = true
         }
 
-        gotoOriginalButton.isHidden = msg.originalChatId == 0
+        gotoOriginalButton.isHidden = msg.originalMessageId == 0
 
         let downloadState = msg.downloadState
         let hasHtml = msg.hasHtml

diff --git a/deltachat-ios/DC/DcMsg.swift b/deltachat-ios/DC/DcMsg.swift
@@ -48,10 +48,6 @@ public class DcMsg {
         return Int(dc_msg_get_from_id(messagePointer))
     }
 
-    public var originalChatId: Int {
-        return Int(dc_msg_get_original_chat_id(messagePointer))
-    }
-
     public var originalMessageId: Int {
         return Int(dc_msg_get_original_msg_id(messagePointer))
     }