ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:peter-iakovlev/TelegramUI

Browse Source 
# Conflicts:
#	TelegramUI/TelegramController.swift
This commit is contained in:
Ilya Laktyushin
2018-10-06 00:54:14 +03:00
parent ab5881de15 e81edfb85e
commit b0815c344e
43 changed files with 523 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
TelegramUI/ChatController.swift
View File

@@ -2647,27 +2647,29 @@ public final class ChatController: TelegramController, UIViewControllerPreviewin
self.interfaceInteraction = interfaceInteraction
self.chatDisplayNode.interfaceInteraction = interfaceInteraction
self.galleryHiddenMesageAndMediaDisposable.set(self.account.telegramApplicationContext.mediaManager.galleryHiddenMediaManager.hiddenIds().start(next: { [weak self] ids in
if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
var messageIdAndMedia: [MessageId: [Media]] = [:]
for id in ids {
if case let .chat(messageId, media) = id {
messageIdAndMedia[messageId] = [media]
}
}
//if controllerInteraction.hiddenMedia != messageIdAndMedia {
controllerInteraction.hiddenMedia = messageIdAndMedia
if let mediaManager = self.account.telegramApplicationContext.mediaManager {
self.galleryHiddenMesageAndMediaDisposable.set(mediaManager.galleryHiddenMediaManager.hiddenIds().start(next: { [weak self] ids in
if let strongSelf = self, let controllerInteraction = strongSelf.controllerInteraction {
var messageIdAndMedia: [MessageId: [Media]] = [:]
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
itemNode.updateHiddenMedia()
for id in ids {
if case let .chat(messageId, media) = id {
messageIdAndMedia[messageId] = [media]
}
}
//}
}
}))
//if controllerInteraction.hiddenMedia != messageIdAndMedia {
controllerInteraction.hiddenMedia = messageIdAndMedia
strongSelf.chatDisplayNode.historyNode.forEachItemNode { itemNode in
if let itemNode = itemNode as? ChatMessageItemView {
itemNode.updateHiddenMedia()
}
}
//}
}
}))
}
self.chatDisplayNode.dismissAsOverlay = { [weak self] in
if let strongSelf = self {
@@ -3692,8 +3694,11 @@ public final class ChatController: TelegramController, UIViewControllerPreviewin
self.audioRecorderFeedback = HapticFeedback()
self.audioRecorderFeedback?.prepareTap()
}
self.audioRecorder.set(applicationContext.mediaManager.audioRecorder(beginWithTone: beginWithTone, applicationBindings: applicationContext.applicationBindings, beganWithTone: { _ in
}))
if let mediaManager = applicationContext.mediaManager {
self.audioRecorder.set(mediaManager.audioRecorder(beginWithTone: beginWithTone, applicationBindings: applicationContext.applicationBindings, beganWithTone: { _ in
}))
}
}
}
}