From 7d0e0d5164241073605122b04d65a58d0229cf81 Mon Sep 17 00:00:00 2001
From: Ryan ZHAO <>
Date: Thu, 14 Dec 2023 11:30:14 +1100
Subject: [PATCH] remove attached disappearing messages settings for some
 control messages

---
 .../Messages/Control Messages/MessageRequestResponse.swift      | 2 --
 .../Messages/Control Messages/TypingIndicator.swift             | 2 --
 .../Messages/Control Messages/UnsendRequest.swift               | 2 --
 3 files changed, 6 deletions(-)

diff --git a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift
index 6d21b629b..cadb4e6e4 100644
--- a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift	
@@ -74,8 +74,6 @@ public final class MessageRequestResponse: ControlMessage {
         
         do {
             contentProto.setMessageRequestResponse(try messageRequestResponseProto.build())
-            // DisappearingMessagesConfiguration
-            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto, threadId: threadId)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct unsend request proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift
index 3b4b6e4e0..2d131d069 100644
--- a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift	
@@ -90,8 +90,6 @@ public final class TypingIndicator: ControlMessage {
         let contentProto = SNProtoContent.builder()
         do {
             contentProto.setTypingMessage(try typingIndicatorProto.build())
-            // DisappearingMessagesConfiguration
-            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto, threadId: threadId)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct typing indicator proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift
index b28a021c6..c34fc422e 100644
--- a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift	
@@ -70,8 +70,6 @@ public final class UnsendRequest: ControlMessage {
         let contentProto = SNProtoContent.builder()
         do {
             contentProto.setUnsendRequest(try unsendRequestProto.build())
-            // DisappearingMessagesConfiguration
-            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto, threadId: threadId)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct unsend request proto from: \(self).")