Merge commit 'aee8b15dbf6911ab555a38691ac8f5a030c1820f' into hotfix-messages

This commit is contained in:
Peter 2019-05-23 00:58:49 +02:00
commit 31e7082a4c

View File

@ -16,7 +16,9 @@ public func requestAccountPrivacySettings(account: Account) -> Signal<AccountPri
let forwardPrivacy = account.network.request(Api.functions.account.getPrivacy(key: .inputPrivacyKeyForwards))
let autoremoveTimeout = account.network.request(Api.functions.account.getAccountTTL())
return combineLatest(lastSeenPrivacy, groupPrivacy, voiceCallPrivacy, voiceCallP2P, profilePhotoPrivacy, forwardPrivacy, autoremoveTimeout)
|> retryRequest
|> `catch` { error in
return .never()
}
|> mapToSignal { lastSeenPrivacy, groupPrivacy, voiceCallPrivacy, voiceCallP2P, profilePhotoPrivacy, forwardPrivacy, autoremoveTimeout -> Signal<AccountPrivacySettings, NoError> in
let accountTimeoutSeconds: Int32
switch autoremoveTimeout {