ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-08-24 14:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'faa3d0317deee578665860a1c667c62eaaadc91b'

Browse Source
This commit is contained in:
Peter 2017-03-05 20:11:58 +03:00
commit 117004025d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TelegramCore/ImportAccount.swift
View File

@ -11,9 +11,15 @@ public struct ImportAccountProvider {
let mtProtoKeychain: () -> Signal<[String: [String: Data]], NoError> let mtProtoKeychain: () -> Signal<[String: [String: Data]], NoError>
let accountState: () -> Signal<AccountState, NoError> let accountState: () -> Signal<AccountState, NoError>
let peers: () -> Signal<[Peer], NoError> let peers: () -> Signal<[Peer], NoError>
public init(mtProtoKeychain: @escaping () -> Signal<[String: [String: Data]], NoError>, accountState: @escaping() -> Signal<AccountState, NoError>, peers: @escaping() -> Signal<[Peer], NoError>) {
self.mtProtoKeychain = mtProtoKeychain
self.accountState = accountState
self.peers = peers
}
} }
public func importAccount(account: Account, provider: ImportAccountProvider) -> Signal<Void, NoError> { public func importAccount(account: UnauthorizedAccount, provider: ImportAccountProvider) -> Signal<Void, NoError> {
return provider.mtProtoKeychain() return provider.mtProtoKeychain()
|> mapToSignal { keychain -> Signal<Void, NoError> in |> mapToSignal { keychain -> Signal<Void, NoError> in
for (group, dict) in keychain { for (group, dict) in keychain {

2
TelegramCore/NetworkLogging.m
View File

@ -16,7 +16,7 @@ void setBridgingTraceFunction(void (*f)(NSString *, NSString *)) {
#if TARGET_IPHONE_SIMULATOR #if TARGET_IPHONE_SIMULATOR
static bool loggingEnabled = true; static bool loggingEnabled = true;
#elif defined(DEBUG) #elif defined(DEBUG)
static bool loggingEnabled = false; static bool loggingEnabled = true;
#else #else
static bool loggingEnabled = true; static bool loggingEnabled = true;
#endif #endif