Merge commit '77a592a05c' into background-task

This commit is contained in:
Peter 2019-10-22 19:10:24 +04:00
commit cbaf7d1ada
97 changed files with 1504 additions and 1090 deletions

View file

@ -1181,6 +1181,8 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe
}, report: {
presentControllerImpl?(peerReportOptionsController(context: context, subject: .peer(peerId), present: { c, a in
presentControllerImpl?(c, a)
}, push: { c in
pushControllerImpl?(c)
}, completion: { _ in }), nil)
})
@ -1579,8 +1581,6 @@ public func userInfoController(context: AccountContext, peerId: PeerId, mode: Pe
let text: String = presentationData.strings.UserInfo_TapToCall
let tooltipController = TooltipController(content: .text(text), dismissByTapOutside: true)
tooltipController.dismissed = {
}
controller.present(tooltipController, in: .window(.root), with: TooltipControllerPresentationArguments(sourceNodeAndRect: { [weak resultItemNode] in
if let resultItemNode = resultItemNode {
return (resultItemNode, callButtonFrame)