From 8df0a6969e9c8816f16e2486db8d6acbaac2efc1 Mon Sep 17 00:00:00 2001
From: Peter <>
Date: Tue, 30 Jul 2019 16:49:41 +0300
Subject: [PATCH] Extend secret media autoremove timeout to media duration

---
 .../MarkMessageContentAsConsumedInteractively.swift       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift b/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift
index 51c91c09a4..fd0e9c3030 100644
--- a/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift
+++ b/submodules/TelegramCore/TelegramCore/MarkMessageContentAsConsumedInteractively.swift
@@ -57,10 +57,14 @@ public func markMessageContentAsConsumedInteractively(postbox: Postbox, messageI
             for i in 0 ..< updatedAttributes.count {
                 if let attribute = updatedAttributes[i] as? AutoremoveTimeoutMessageAttribute {
                     if attribute.countdownBeginTime == nil || attribute.countdownBeginTime == 0 {
-                        updatedAttributes[i] = AutoremoveTimeoutMessageAttribute(timeout: attribute.timeout, countdownBeginTime: timestamp)
+                        var timeout = attribute.timeout
+                        if let duration = message.secretMediaDuration {
+                            timeout = max(timeout, duration)
+                        }
+                        updatedAttributes[i] = AutoremoveTimeoutMessageAttribute(timeout: timeout, countdownBeginTime: timestamp)
                         updateMessage = true
                         
-                        transaction.addTimestampBasedMessageAttribute(tag: 0, timestamp: timestamp + attribute.timeout, messageId: messageId)
+                        transaction.addTimestampBasedMessageAttribute(tag: 0, timestamp: timestamp + timeout, messageId: messageId)
                         
                         if messageId.peerId.namespace == Namespaces.Peer.SecretChat {
                             var layer: SecretChatLayer?