ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-03-17 21:18:40 +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
2023-01-11 22:58:27 +04:00
parent a3d132b7ec a42642e4c9
commit 5dce85f071
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1434,7 +1434,10 @@ private final class NotificationServiceHandler {
switch state {
case let .idBased(maxIncomingReadId, _, _, _, _):
if maxIncomingReadId >= messageId.id {
Logger.shared.log("NotificationService \(episode)", "maxIncomingReadId: \(maxIncomingReadId), messageId: \(messageId.id), skipping")
content = NotificationContent(isLockedMessage: nil)
} else {
Logger.shared.log("NotificationService \(episode)", "maxIncomingReadId: \(maxIncomingReadId), messageId: \(messageId.id), not skipping")
}
case .indexBased:
break

4
submodules/ChatListUI/Sources/Node/ChatListNode.swift
View File

@@ -1371,7 +1371,7 @@ public final class ChatListNode: ListView {
let suggestPasswordSetup: Signal<Bool, NoError>
if case .chatList(groupId: .root) = location, chatListFilter == nil {
suggestPasswordSetup = combineLatest(
suggestPasswordSetup = .single(false) |> then(combineLatest(
getServerProvidedSuggestions(account: context.account),
context.engine.auth.twoStepVerificationConfiguration()
)
@@ -1389,7 +1389,7 @@ public final class ChatListNode: ListView {
return false
}
return suggestions.contains(.setupPassword)
}
})
|> distinctUntilChanged
} else {
suggestPasswordSetup = .single(false)