clean

2 years ago · 3643a96918
parent c247064fa8
commit 3643a96918
2 changed files with 4 additions and 5 deletions
--- a/Session/Conversations/ConversationVC.swift
+++ b/Session/Conversations/ConversationVC.swift
@ -1255,6 +1255,9 @@ final class ConversationVC: BaseVC, ConversationSearchControllerDelegate, UITabl
    // MARK: - General
    
    func addOrRemoveOutdatedClientBanner(contactIsUsingOutdatedClient: Bool) {
+        // Do not show the banner until the new disappearing messages is enabled
+        guard DisappearingMessagesConfiguration.isNewConfigurationEnabled else { return }
+        
        guard contactIsUsingOutdatedClient else {
            UIView.animate(
                withDuration: 0.25,
--- a/Receiving/MessageReceiver.swift
+++ b/Receiving/MessageReceiver.swift
@ -336,11 +336,7 @@ public enum MessageReceiver {
        
        // Check the contact's client version based on this received message
        let contact: Contact = Contact.fetchOrCreate(db, id: sender)
-        let lastKnowClientVersion: SessionVersion.FeatureVersion = (
-            !proto.hasExpirationType &&
-            !proto.hasExpirationTimer &&
-            !proto.hasLastDisappearingMessageChangeTimestamp
-        ) ? .legacyDisappearingMessages : .newDisappearingMessages
+        let lastKnowClientVersion: SessionVersion.FeatureVersion = !proto.hasExpirationTimer ? .legacyDisappearingMessages : .newDisappearingMessages
        _ = try? contact
            .with(lastKnownClientVersion: lastKnowClientVersion)
            .saved(db)