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-26 14:45:45 +04:00
commit 1946dffa2d
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
submodules/TelegramCore/Sources/Authorization.swift
View File

@ -103,6 +103,19 @@ public func sendAuthorizationCode(accountManager: AccountManager<TelegramAccount
|> map { sentCode in |> map { sentCode in
return (.sentCode(sentCode), updatedAccount) return (.sentCode(sentCode), updatedAccount)
} }
|> `catch` { error -> Signal<(SendCodeResult, UnauthorizedAccount), MTRpcError> in
if error.errorDescription == "SESSION_PASSWORD_NEEDED" {
return account.network.request(Api.functions.account.getPassword(), automaticFloodWait: false)
|> mapToSignal { result -> Signal<(SendCodeResult, UnauthorizedAccount), MTRpcError> in
switch result {
case let .password(_, _, _, _, hint, _, _, _, _, _):
return .single((.password(hint: hint), account))
}
}
} else {
return .fail(error)
}
}
} }
case _: case _:
return .fail(error) return .fail(error)

2
submodules/TelegramUI/Sources/ChatMessageInteractiveFileNode.swift
View File

@ -942,7 +942,7 @@ final class ChatMessageInteractiveFileNode: ASDisplayNode {
statusNode.backgroundNodeColor = backgroundNodeColor statusNode.backgroundNodeColor = backgroundNodeColor
} }
if state != .none && isVoice && self.playbackAudioLevelNode == nil { if case .pause = state, isVoice, self.playbackAudioLevelNode == nil {
let blobFrame = progressFrame.insetBy(dx: -12.0, dy: -12.0) let blobFrame = progressFrame.insetBy(dx: -12.0, dy: -12.0)
let playbackAudioLevelNode = VoiceBlobNode( let playbackAudioLevelNode = VoiceBlobNode(
maxLevel: 0.3, maxLevel: 0.3,