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' into gift-resale

Browse Source 
# Conflicts:
#	submodules/TelegramUI/Sources/SharedAccountContext.swift
This commit is contained in:
Mikhail Filimonov
2025-04-17 09:39:55 +01:00
parent 62a3b0d6ae fc14d83988
commit 27a2f38ff6
62 changed files with 739 additions and 311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
View File

@@ -625,10 +625,8 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
if conferenceCall.flags.contains(.isMissed) {
titleString = strings.Chat_CallMessage_DeclinedGroupCall
} else if message.timestamp < currentTime - missedTimeout {
} else if conferenceCall.duration == nil && message.timestamp < currentTime - missedTimeout {
titleString = strings.Chat_CallMessage_MissedGroupCall
} else if conferenceCall.duration != nil {
titleString = strings.Chat_CallMessage_CancelledGroupCall
} else {
if incoming {
titleString = strings.Chat_CallMessage_IncomingGroupCall