ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -31,3 +31,6 @@ url=../TelegramCore.git
[submodule "submodules/TelegramUI"] [submodule "submodules/TelegramUI"]
path = submodules/TelegramUI path = submodules/TelegramUI
url=../TelegramUI.git url=../TelegramUI.git
[submodule "submodules/ffmpeg"]
path = submodules/ffmpeg
url=../ffmpeg.git

2
SiriIntents/IntentContacts.swift
View File

@ -58,5 +58,5 @@ func personWithUser(stableId: String, user: TelegramUser) -> INPerson {
var nameComponents = PersonNameComponents() var nameComponents = PersonNameComponents()
nameComponents.givenName = user.firstName nameComponents.givenName = user.firstName
nameComponents.familyName = user.lastName nameComponents.familyName = user.lastName
return INPerson(personHandle: INPersonHandle(value: stableId, type: .unknown), nameComponents: nameComponents, displayName: user.displayTitle, image: nil, contactIdentifier: stableId, customIdentifier: "tg\(user.id.toInt64())") return INPerson(personHandle: INPersonHandle(value: stableId, type: .unknown), nameComponents: nameComponents, displayName: user.debugDisplayTitle, image: nil, contactIdentifier: stableId, customIdentifier: "tg\(user.id.toInt64())")
} }

3
Telegram-iOS.xcworkspace/contents.xcworkspacedata generated
View File

@ -25,6 +25,9 @@
<FileRef <FileRef
location = "group:submodules/lottie-ios/Lottie.xcodeproj"> location = "group:submodules/lottie-ios/Lottie.xcodeproj">
</FileRef> </FileRef>
<FileRef
location = "group:submodules/ffmpeg/FFMpeg.xcodeproj">
</FileRef>
<FileRef <FileRef
location = "group:submodules/libtgvoip/libtgvoip.xcodeproj"> location = "group:submodules/libtgvoip/libtgvoip.xcodeproj">
</FileRef> </FileRef>

2
Telegram-iOS/ApplicationContext.swift
View File

@ -707,7 +707,7 @@ final class AuthorizedApplicationContext {
if inAppNotificationSettings.displayPreviews { if inAppNotificationSettings.displayPreviews {
let presentationData = strongSelf.applicationContext.currentPresentationData.with { $0 } let presentationData = strongSelf.applicationContext.currentPresentationData.with { $0 }
strongSelf.notificationController.enqueue(ChatMessageNotificationItem(account: strongSelf.account, strings: presentationData.strings, messages: messages, tapAction: { strongSelf.notificationController.enqueue(ChatMessageNotificationItem(account: strongSelf.account, strings: presentationData.strings, nameDisplayOrder: presentationData.nameDisplayOrder, messages: messages, tapAction: {
if let strongSelf = self { if let strongSelf = self {
var foundOverlay = false var foundOverlay = false
strongSelf.mainWindow.forEachViewController({ controller in strongSelf.mainWindow.forEachViewController({ controller in

11
Telegram-iOS/NotificationManager.swift
View File

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

2
submodules/Display

@ -1 +1 @@
Subproject commit c8a85704654a263d5d389339adb612a16c589309 Subproject commit d71707c31b1395bffe54699c02a238a9010f8d0c

2
submodules/TelegramCore

@ -1 +1 @@
Subproject commit 911336d6010798c5f7d02ef3c44de409ca275b81 Subproject commit ceaa1e758052643d5df558adb1dbbb4e922d21e8

2
submodules/TelegramUI

@ -1 +1 @@
Subproject commit 241de58edd93b50f9b01df95dbb1801f25295253 Subproject commit a806b9011c9452c8eae64be81562871ce9566956

1
submodules/ffmpeg Submodule

@ -0,0 +1 @@
Subproject commit d53fb89437cb397e74d6af789f85acd4faf267a6