From 35f75490a47c9f55e46e10bcd3945b1420fdf538 Mon Sep 17 00:00:00 2001
From: Ryan Zhao <ryanzhaors@qq.com>
Date: Mon, 29 Nov 2021 13:35:32 +1100
Subject: [PATCH] clean

---
 .../Signal/TSIncomingMessage+Conversion.swift | 21 -------------------
 .../Messages/Signal/TSInfoMessage+Calls.swift |  2 +-
 .../Signal/TSOutgoingMessage+Conversion.swift |  7 -------
 3 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/SessionMessagingKit/Messages/Signal/TSIncomingMessage+Conversion.swift b/SessionMessagingKit/Messages/Signal/TSIncomingMessage+Conversion.swift
index b963f68f0..6849fd50c 100644
--- a/SessionMessagingKit/Messages/Signal/TSIncomingMessage+Conversion.swift
+++ b/SessionMessagingKit/Messages/Signal/TSIncomingMessage+Conversion.swift
@@ -1,26 +1,5 @@
 
 public extension TSIncomingMessage {
-    
-    static func from(_ callMessage: CallMessage, associatedWith thread: TSThread) -> TSIncomingMessage {
-        let sender = callMessage.sender!
-        let result = TSIncomingMessage(
-            timestamp: callMessage.sentTimestamp!,
-            in: thread,
-            authorId: sender,
-            sourceDeviceId: 1,
-            messageBody: NSLocalizedString("call_incoming", comment: ""),
-            attachmentIds: [],
-            expiresInSeconds: 0,
-            quotedMessage: nil,
-            linkPreview: nil,
-            wasReceivedByUD: true,
-            openGroupInvitationName: nil,
-            openGroupInvitationURL: nil,
-            serverHash: callMessage.serverHash
-        )
-        result.isCallMessage = true
-        return result
-    }
 
     static func from(_ visibleMessage: VisibleMessage, quotedMessage: TSQuotedMessage?, linkPreview: OWSLinkPreview?, associatedWith thread: TSThread) -> TSIncomingMessage {
         let sender = visibleMessage.sender!
diff --git a/SessionMessagingKit/Messages/Signal/TSInfoMessage+Calls.swift b/SessionMessagingKit/Messages/Signal/TSInfoMessage+Calls.swift
index fcf0af1be..6be8d499c 100644
--- a/SessionMessagingKit/Messages/Signal/TSInfoMessage+Calls.swift
+++ b/SessionMessagingKit/Messages/Signal/TSInfoMessage+Calls.swift
@@ -30,7 +30,7 @@
         guard self.messageType == .call else { return }
         self.callState = newCallState
         var contactName: String = ""
-        if let contactThread = self.thread as? TSContactThread {
+        if let contactThread = self.thread(with: transaction) as? TSContactThread {
             let sessionID =  contactThread.contactSessionID()
             contactName = Storage.shared.getContact(with: sessionID)?.displayName(for: Contact.Context.regular) ?? sessionID
         }
diff --git a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage+Conversion.swift b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage+Conversion.swift
index 83ff29abd..1509af0f3 100644
--- a/SessionMessagingKit/Messages/Signal/TSOutgoingMessage+Conversion.swift
+++ b/SessionMessagingKit/Messages/Signal/TSOutgoingMessage+Conversion.swift
@@ -2,13 +2,6 @@ import SessionUtilitiesKit
 
 @objc public extension TSOutgoingMessage {
     
-    @objc(fromCallOffer:associatedWith:)
-    static func from(_ callMessage: CallMessage, associatedWith thread: TSThread) -> TSOutgoingMessage {
-        let outgoingMessage = TSOutgoingMessage(in: thread, messageBody: NSLocalizedString("call_outgoing", comment: ""), attachmentId: nil)
-        outgoingMessage.isCallMessage = true
-        return outgoingMessage
-    }
-    
     @objc(from:associatedWith:)
     static func from(_ visibleMessage: VisibleMessage, associatedWith thread: TSThread) -> TSOutgoingMessage {
         return from(visibleMessage, associatedWith: thread, using: nil)