From 617fc65356ddc116fcd6a0eaeecf00549004f204 Mon Sep 17 00:00:00 2001 From: Mikhail Filimonov <> Date: Fri, 27 Apr 2018 18:00:10 +0400 Subject: [PATCH] no message --- TelegramCore.xcodeproj/project.pbxproj | 2 -- TelegramCore/TwoStepVerification.swift | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/TelegramCore.xcodeproj/project.pbxproj b/TelegramCore.xcodeproj/project.pbxproj index 2dbd149376..9a0b00921e 100644 --- a/TelegramCore.xcodeproj/project.pbxproj +++ b/TelegramCore.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 9F10CE8B20613C78002DD61A /* SecretApiLayer73.swift in Sources */ = {isa = PBXBuildFile; fileRef = D018EDFF2044939F00CBB130 /* SecretApiLayer73.swift */; }; 9F10CE8C20613CDB002DD61A /* TelegramDeviceContactImportInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0B2F7732052DEF700D3BFB9 /* TelegramDeviceContactImportInfo.swift */; }; - 9F8DF3C6208F6E1500AED104 /* SecureIdValueContentError.swift in Sources */ = {isa = PBXBuildFile; fileRef = D0136308208F3B0900EB3653 /* SecureIdValueContentError.swift */; }; 9FC8ADA9206BBD000094F7B4 /* SaveSecureIdValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = D093D805206539D000BC3599 /* SaveSecureIdValue.swift */; }; 9FC8ADAB206BBFF10094F7B4 /* RecentWebSessions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC8ADAA206BBFF10094F7B4 /* RecentWebSessions.swift */; }; 9FC8ADAC206BC00A0094F7B4 /* RecentWebSessions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9FC8ADAA206BBFF10094F7B4 /* RecentWebSessions.swift */; }; @@ -2314,7 +2313,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9F8DF3C6208F6E1500AED104 /* SecureIdValueContentError.swift in Sources */, 9FC8ADAC206BC00A0094F7B4 /* RecentWebSessions.swift in Sources */, 9FC8ADA9206BBD000094F7B4 /* SaveSecureIdValue.swift in Sources */, 9F10CE8C20613CDB002DD61A /* TelegramDeviceContactImportInfo.swift in Sources */, diff --git a/TelegramCore/TwoStepVerification.swift b/TelegramCore/TwoStepVerification.swift index 482ef07d9c..63e534eb8e 100644 --- a/TelegramCore/TwoStepVerification.swift +++ b/TelegramCore/TwoStepVerification.swift @@ -285,8 +285,8 @@ public enum RequestTwoStepVerificationPasswordRecoveryCodeError { case generic } -public func requestTwoStepVerificationPasswordRecoveryCode(account: Account) -> Signal { - return account.network.request(Api.functions.auth.requestPasswordRecovery(), automaticFloodWait: false) +public func requestTwoStepVerificationPasswordRecoveryCode(network: Network) -> Signal { + return network.request(Api.functions.auth.requestPasswordRecovery(), automaticFloodWait: false) |> mapError { _ -> RequestTwoStepVerificationPasswordRecoveryCodeError in return .generic } @@ -305,8 +305,8 @@ public enum RecoverTwoStepVerificationPasswordError { case invalidCode } -public func recoverTwoStepVerificationPassword(account: Account, code: String) -> Signal { - return account.network.request(Api.functions.auth.recoverPassword(code: code), automaticFloodWait: false) +public func recoverTwoStepVerificationPassword(network: Network, code: String) -> Signal { + return network.request(Api.functions.auth.recoverPassword(code: code), automaticFloodWait: false) |> mapError { error -> RecoverTwoStepVerificationPasswordError in if error.errorDescription.hasPrefix("FLOOD_WAIT_") { return .limitExceeded