Merge branch 'feature/secureid' of https://github.com/peter-iakovlev/TelegramCoreDev into feature/secureid

# Conflicts:
#	TelegramCore/ProxySettings.swift
This commit is contained in:
Mikhail Filimonov
2018-04-20 13:16:36 +04:00
10 changed files with 248 additions and 71 deletions

View File

@@ -197,7 +197,7 @@ public func requestSecureIdForm(postbox: Postbox, network: Network, peerId: Peer
|> mapToSignal { result -> Signal<EncryptedSecureIdForm, RequestSecureIdFormError> in
return postbox.modify { modifier -> EncryptedSecureIdForm in
switch result {
case let .authorizationForm(flags, requiredTypes, values, users, termsUrl):
case let .authorizationForm(flags, requiredTypes, values, errors, users, termsUrl):
var peers: [Peer] = []
for user in users {
let parsed = TelegramUser(user: user)