diff --git a/Share/ShareRootController.swift b/Share/ShareRootController.swift index 8199d34192..3532d4fcb7 100644 --- a/Share/ShareRootController.swift +++ b/Share/ShareRootController.swift @@ -66,7 +66,7 @@ class ShareRootController: UIViewController { if #available(iOSApplicationExtension 8.2, *) { self.observer1 = NotificationCenter.default.addObserver(forName: NSNotification.Name.NSExtensionHostDidBecomeActive, object: nil, queue: nil, using: { _ in - inForeground.set(false) + inForeground.set(true) }) self.observer2 = NotificationCenter.default.addObserver(forName: NSNotification.Name.NSExtensionHostWillResignActive, object: nil, queue: nil, using: { _ in diff --git a/Telegram-iOS/WatchBridge.swift b/Telegram-iOS/WatchBridge.swift index 06b3c834c1..5c45de3ffa 100644 --- a/Telegram-iOS/WatchBridge.swift +++ b/Telegram-iOS/WatchBridge.swift @@ -465,7 +465,7 @@ func makeBridgePeers(_ message: Message) -> [Int64 : Any] { } func makeBridgeMessage(_ entry: MessageHistoryEntry, strings: PresentationStrings) -> (TGBridgeMessage, [Int64 : TGBridgeUser])? { - if case let .MessageEntry(message, read, _, _) = entry, let bridgeMessage = makeBridgeMessage(message, strings: strings) { + if case let .MessageEntry(message, read, _, _, _) = entry, let bridgeMessage = makeBridgeMessage(message, strings: strings) { if message.id.namespace == Namespaces.Message.Local && !message.flags.contains(.Failed) { return nil } diff --git a/submodules/Display b/submodules/Display index 9a2b81c465..6e0355b632 160000 --- a/submodules/Display +++ b/submodules/Display @@ -1 +1 @@ -Subproject commit 9a2b81c465c26a823bec6aaecc42e51de4773562 +Subproject commit 6e0355b6326c684f465c691dbaef6d147bda38f3 diff --git a/submodules/Postbox b/submodules/Postbox index f027996caa..3a8f1cddbc 160000 --- a/submodules/Postbox +++ b/submodules/Postbox @@ -1 +1 @@ -Subproject commit f027996caa7b7b4174dcb8622d321b143f746628 +Subproject commit 3a8f1cddbcc107617061baf8bfc95ba6ae32a1f5 diff --git a/submodules/TelegramCore b/submodules/TelegramCore index 2d16542a27..90fd9374a3 160000 --- a/submodules/TelegramCore +++ b/submodules/TelegramCore @@ -1 +1 @@ -Subproject commit 2d16542a27fb3d43eedaea8ddddaf506e249be1d +Subproject commit 90fd9374a3e2a154aca6ce3339289b3b4282e87c diff --git a/submodules/TelegramUI b/submodules/TelegramUI index 5149354c84..b04d42e547 160000 --- a/submodules/TelegramUI +++ b/submodules/TelegramUI @@ -1 +1 @@ -Subproject commit 5149354c84e030f92949ed2038aab8b7ed3083fc +Subproject commit b04d42e547aa5abcb71b2a43e79cab7769538d88