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

Improve QR auth and sessions UI

Browse Source
This commit is contained in:
Ali
2019-12-09 19:35:43 +04:00
parent 6b45ef45a6
commit 74a3370f76
10 changed files with 366 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
submodules/SettingsUI/Sources/SettingsController.swift
View File

@@ -859,8 +859,9 @@ public func settingsController(context: AccountContext, accountManager: AccountM
let activeSessionsContextAndCountSignal = contextValue.get()
|> deliverOnMainQueue
|> mapToSignal { context -> Signal<(ActiveSessionsContext, Int), NoError> in
|> mapToSignal { context -> Signal<(ActiveSessionsContext, Int, WebSessionsContext), NoError> in
let activeSessionsContext = ActiveSessionsContext(account: context.account)
let webSessionsContext = WebSessionsContext(account: context.account)
let otherSessionCount = activeSessionsContext.state
|> map { state -> Int in
return state.sessions.filter({ !$0.isCurrent }).count
@@ -868,10 +869,10 @@ public func settingsController(context: AccountContext, accountManager: AccountM
|> distinctUntilChanged
return otherSessionCount
|> map { value in
return (activeSessionsContext, value)
return (activeSessionsContext, value, webSessionsContext)
}
}
let activeSessionsContextAndCount = Promise<(ActiveSessionsContext, Int)>()
let activeSessionsContextAndCount = Promise<(ActiveSessionsContext, Int, WebSessionsContext)>()
activeSessionsContextAndCount.set(activeSessionsContextAndCountSignal)
let arguments = SettingsItemArguments(sharedContext: context.sharedContext, avatarAndNameInfoContext: avatarAndNameInfoContext, avatarTapAction: {
@@ -933,10 +934,10 @@ public func settingsController(context: AccountContext, accountManager: AccountM
|> take(1)).start(next: { context in
let _ = (activeSessionsContextAndCount.get()
|> deliverOnMainQueue
|> take(1)).start(next: { activeSessionsContext, _ in
|> take(1)).start(next: { activeSessionsContext, _, webSessionsContext in
pushControllerImpl?(privacyAndSecurityController(context: context, initialSettings: privacySettingsValue, updatedSettings: { settings in
privacySettings.set(.single(settings))
}, activeSessionsContext: activeSessionsContext))
}, activeSessionsContext: activeSessionsContext, webSessionsContext: webSessionsContext))
})
})
}, openDataAndStorage: {
@@ -1108,11 +1109,11 @@ public func settingsController(context: AccountContext, accountManager: AccountM
}, openDevices: {
let _ = (activeSessionsContextAndCount.get()
|> deliverOnMainQueue
|> take(1)).start(next: { activeSessionsContext, count in
|> take(1)).start(next: { activeSessionsContext, count, webSessionsContext in
if count == 0 {
pushControllerImpl?(AuthDataTransferSplashScreen(context: context, activeSessionsContext: activeSessionsContext))
} else {
pushControllerImpl?(recentSessionsController(context: context, activeSessionsContext: activeSessionsContext))
pushControllerImpl?(recentSessionsController(context: context, activeSessionsContext: activeSessionsContext, webSessionsContext: webSessionsContext))
}
})
})