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

Update submodules

Browse Source
This commit is contained in:
Peter Iakovlev
2018-12-11 17:58:11 +04:00
parent daa2d27719
commit 8f2c0c28cd
9 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram-iOS/NotificationManager.swift
View File

@@ -356,7 +356,10 @@ final class NotificationManager {
Logger.shared.log("NotificationManager", "account missing")
return
}
let strings = (account.telegramApplicationContext.currentPresentationData.with { $0 }).strings
let presentationData = (account.telegramApplicationContext.currentPresentationData.with { $0 })
let strings = presentationData.strings
let nameDisplayOrder = presentationData.nameDisplayOrder
for (messages, sound, initialDisplayContents, delayMessage) in messageList {
for message in messages {
self.processedMessages.insert(message.id)
@@ -431,9 +434,9 @@ final class NotificationManager {
body = strings.MESSAGE_FWDS(peer.displayTitle, "\(messages.count)").0
}
} else if messages[0].groupingKey != nil {
var kind = messageContentKind(messages[0], strings: strings, accountPeerId: account.peerId).key
var kind = messageContentKind(messages[0], strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: account.peerId).key
for i in 1 ..< messages.count {
let nextKind = messageContentKind(messages[i], strings: strings, accountPeerId: account.peerId)
let nextKind = messageContentKind(messages[i], strings: strings, nameDisplayOrder: nameDisplayOrder, accountPeerId: account.peerId)
if kind != nextKind.key {
kind = .text
break
@@ -491,7 +494,7 @@ final class NotificationManager {
title = nil
}
let chatPeer = RenderedPeer(peerId: firstMessage.id.peerId, peers: additionalPeers)
let (_, _, messageText) = chatListItemStrings(strings: strings, message: firstMessage, chatPeer: chatPeer, accountPeerId: account.peerId)
let (_, _, messageText) = chatListItemStrings(strings: strings, nameDisplayOrder: nameDisplayOrder, message: firstMessage, chatPeer: chatPeer, accountPeerId: account.peerId)
body = messageText
loop: for media in firstMessage.media {