ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-11-08 09:49:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'cd6af7d5378f746b7be0c11693b3f6a0282644e9' into beta

Browse Source
This commit is contained in:
Ali 2021-03-18 23:40:04 +04:00
commit ea726fe4a4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/CallListUI/Sources/CallListControllerNode.swift
View File

@ -383,7 +383,7 @@ final class CallListControllerNode: ASDisplayNode {
} }
if let activeCall = activeCall { if let activeCall = activeCall {
strongSelf.context.joinGroupCall(peerId: peerId, invite: nil, requestJoinAsPeerId: nil, activeCall: activeCall) strongSelf.joinGroupCall(peerId, activeCall)
} }
})) }))
}) })

2
submodules/TelegramCallsUI/Sources/PresentationGroupCall.swift
View File

@ -1506,7 +1506,7 @@ public final class PresentationGroupCallImpl: PresentationGroupCall {
let previousRaisedHand = strongSelf.stateValue.raisedHand let previousRaisedHand = strongSelf.stateValue.raisedHand
if !(strongSelf.stateValue.muteState?.canUnmute ?? false) { if !(strongSelf.stateValue.muteState?.canUnmute ?? false) {
strongSelf.stateValue.raisedHand = participant.raiseHandRating != nil strongSelf.stateValue.raisedHand = participant.hasRaiseHand
} }
if let muteState = participant.muteState, muteState.canUnmute && previousRaisedHand { if let muteState = participant.muteState, muteState.canUnmute && previousRaisedHand {

6
submodules/TelegramPresentationData/Sources/PresentationData.swift
View File

@ -158,12 +158,14 @@ private func currentDateTimeFormat() -> PresentationDateTimeFormat {
var dateSeparator = "/" var dateSeparator = "/"
var dateSuffix = "" var dateSuffix = ""
if let dateString = DateFormatter.dateFormat(fromTemplate: "MdY", options: 0, locale: locale) { if let dateString = DateFormatter.dateFormat(fromTemplate: "MdY", options: 0, locale: locale) {
for separator in [".", "/", "-", "/"] { for separator in [". ", ".", "/", "-", "/"] {
if dateString.contains(separator) { if dateString.contains(separator) {
if separator == ". " { if separator == ". " {
dateSuffix = "." dateSuffix = "."
} dateSeparator = "."
} else {
dateSeparator = separator dateSeparator = separator
}
break break
} }
} }