Dismiss context menu when message gets deleted

submodules/ContextUI/Sources/ContextController.swift

@@ -1510,11 +1510,18 @@ public protocol ContextExtractedContentSource: class {
     var keepInPlace: Bool { get }
     var ignoreContentTouches: Bool { get }
     var blurBackground: Bool { get }
+    var shouldBeDismissed: Signal<Bool, NoError> { get }
     
     func takeView() -> ContextControllerTakeViewInfo?
     func putBack() -> ContextControllerPutBackViewInfo?
 }
 
+public extension ContextExtractedContentSource {
+    var shouldBeDismissed: Signal<Bool, NoError> {
+        return .single(false)
+    }
+}
+
 public protocol ContextControllerContentSource: class {
     var controller: ViewController { get }
     var navigationController: NavigationController? { get }
@@ -1555,6 +1562,8 @@ public final class ContextController: ViewController, StandalonePresentableContr
     
     public var reactionSelected: ((ReactionContextItem.Reaction) -> Void)?
     
+    private var shouldBeDismissedDisposable: Disposable?
+    
     public init(account: Account, presentationData: PresentationData, source: ContextContentSource, items: Signal<[ContextMenuItem], NoError>, reactionItems: [ReactionContextItem], recognizer: TapLongTapOrDoubleTapGestureRecognizer? = nil, gesture: ContextGesture? = nil, displayTextSelectionTip: Bool = false) {
         self.account = account
         self.presentationData = presentationData
@@ -1567,8 +1576,19 @@ public final class ContextController: ViewController, StandalonePresentableContr
         
         super.init(navigationBarPresentationData: nil)
         
-        if case let .extracted(extractedSource) = source, !extractedSource.blurBackground {
+        if case let .extracted(extractedSource) = source {
-            self.statusBar.statusBarStyle = .Ignore
+            if !extractedSource.blurBackground {
+                self.statusBar.statusBarStyle = .Ignore
+            }
+            self.shouldBeDismissedDisposable = (extractedSource.shouldBeDismissed
+            |> filter { $0 }
+            |> take(1)
+            |> deliverOnMainQueue).start(next: { [weak self] _ in
+                guard let strongSelf = self else {
+                    return
+                }
+                strongSelf.dismiss(result: .default, completion: {})
+            })
         } else {
             self.statusBar.statusBarStyle = .Hide
         }
@@ -1579,6 +1599,10 @@ public final class ContextController: ViewController, StandalonePresentableContr
         fatalError("init(coder:) has not been implemented")
     }
     
+    deinit {
+        self.shouldBeDismissedDisposable?.dispose()
+    }
+    
     override public func loadDisplayNode() {
         self.displayNode = ContextControllerNode(account: self.account, controller: self, presentationData: self.presentationData, source: self.source, items: self.items, reactionItems: self.reactionItems, beginDismiss: { [weak self] result in
             self?.dismiss(result: result, completion: nil)

submodules/PeerInfoUI/Sources/PeerAutoremoveSetupScreen.swift

@@ -121,7 +121,7 @@ private func peerAutoremoveSetupEntries(peer: Peer?, presentationData: Presentat
         24 * 60 * 60 * 7
     ]
     if isDebug || true {
-        availableValues[1] = 60
+        availableValues[1] = 5
         availableValues[2] = 5 * 60
     }
     entries.append(.timeValue(resolvedValue, availableValues))

submodules/TelegramUI/Sources/ChatController.swift

@@ -844,7 +844,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         let _ = ApplicationSpecificNotice.incrementChatTextSelectionTips(accountManager: strongSelf.context.sharedContext.accountManager).start()
                     }
                     
-                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message, selectAll: selectAll)), items: .single(actions), reactionItems: reactionItems, recognizer: recognizer, gesture: gesture, displayTextSelectionTip: displayTextSelectionTip)
+                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, postbox: strongSelf.context.account.postbox, message: message, selectAll: selectAll)), items: .single(actions), reactionItems: reactionItems, recognizer: recognizer, gesture: gesture, displayTextSelectionTip: displayTextSelectionTip)
                     strongSelf.currentContextController = controller
                     controller.reactionSelected = { [weak controller] value in
                         guard let strongSelf = self, let message = updatedMessages.first else {
@@ -1870,7 +1870,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         }
                     })))
                     
-                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: message, selectAll: true)), items: .single(actions), reactionItems: [], recognizer: nil)
+                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, postbox: strongSelf.context.account.postbox, message: message, selectAll: true)), items: .single(actions), reactionItems: [], recognizer: nil)
                     strongSelf.currentContextController = controller
                     strongSelf.forEachController({ controller in
                         if let controller = controller as? TooltipScreen {
@@ -1947,7 +1947,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
                         f(.dismissWithoutContent)
                     })))
                     
-                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, message: topMessage, selectAll: true)), items: .single(actions), reactionItems: [], recognizer: nil)
+                    let controller = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .extracted(ChatMessageContextExtractedContentSource(chatNode: strongSelf.chatDisplayNode, postbox: strongSelf.context.account.postbox, message: topMessage, selectAll: true)), items: .single(actions), reactionItems: [], recognizer: nil)
                     strongSelf.currentContextController = controller
                     strongSelf.forEachController({ controller in
                         if let controller = controller as? TooltipScreen {

submodules/TelegramUI/Sources/ChatMessageContextControllerContentSource.swift

@@ -3,6 +3,7 @@ import UIKit
 import Display
 import ContextUI
 import Postbox
+import SwiftSignalKit
 
 final class ChatMessageContextExtractedContentSource: ContextExtractedContentSource {
     let keepInPlace: Bool = false
@@ -10,11 +11,29 @@ final class ChatMessageContextExtractedContentSource: ContextExtractedContentSou
     let blurBackground: Bool = true
     
     private weak var chatNode: ChatControllerNode?
+    private let postbox: Postbox
     private let message: Message
     private let selectAll: Bool
     
-    init(chatNode: ChatControllerNode, message: Message, selectAll: Bool) {
+    var shouldBeDismissed: Signal<Bool, NoError> {
+        let viewKey = PostboxViewKey.messages(Set([self.message.id]))
+        return self.postbox.combinedView(keys: [viewKey])
+        |> map { views -> Bool in
+            guard let view = views.views[viewKey] as? MessagesView else {
+                return false
+            }
+            if view.messages.isEmpty {
+                return true
+            } else {
+                return false
+            }
+        }
+        |> distinctUntilChanged
+    }
+    
+    init(chatNode: ChatControllerNode, postbox: Postbox, message: Message, selectAll: Bool) {
         self.chatNode = chatNode
+        self.postbox = postbox
         self.message = message
         self.selectAll = selectAll
     }