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

Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-11-04 23:44:54 +04:00
commit 213e938392
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Telegram/NotificationService/Sources/NotificationService.swift
View File

@ -619,9 +619,12 @@ private final class NotificationServiceHandler {
return nil return nil
} }
let _ = (self.accountManager.accountRecords() let _ = (combineLatest(queue: self.queue,
self.accountManager.accountRecords(),
self.accountManager.sharedData(keys: [ApplicationSpecificSharedDataKeys.inAppNotificationSettings])
)
|> take(1) |> take(1)
|> deliverOn(self.queue)).start(next: { [weak self] records in |> deliverOn(self.queue)).start(next: { [weak self] records, sharedData in
var recordId: AccountRecordId? var recordId: AccountRecordId?
var isCurrentAccount: Bool = false var isCurrentAccount: Bool = false
@ -641,6 +644,8 @@ private final class NotificationServiceHandler {
} }
} }
let inAppNotificationSettings = sharedData.entries[ApplicationSpecificSharedDataKeys.inAppNotificationSettings]?.get(InAppNotificationSettings.self) ?? InAppNotificationSettings.defaultSettings
guard let strongSelf = self, let recordId = recordId else { guard let strongSelf = self, let recordId = recordId else {
Logger.shared.log("NotificationService \(episode)", "Couldn't find a matching decryption key") Logger.shared.log("NotificationService \(episode)", "Couldn't find a matching decryption key")
@ -1075,7 +1080,7 @@ private final class NotificationServiceHandler {
pollWithUpdatedContent = stateManager.postbox.transaction { transaction -> NotificationContent in pollWithUpdatedContent = stateManager.postbox.transaction { transaction -> NotificationContent in
var content = initialContent var content = initialContent
if let peer = transaction.getPeer(interactionAuthorId) { if inAppNotificationSettings.displayNameOnLockscreen, let peer = transaction.getPeer(interactionAuthorId) {
content.addSenderInfo(mediaBox: stateManager.postbox.mediaBox, accountPeerId: stateManager.accountPeerId, peer: peer) content.addSenderInfo(mediaBox: stateManager.postbox.mediaBox, accountPeerId: stateManager.accountPeerId, peer: peer)
} }