Merge branch 'master' of gitlab.com:peter-iakovlev/telegram-ios

This commit is contained in:
overtake 2020-08-06 12:36:51 +03:00
commit a784720d3a

View File

@ -434,8 +434,10 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
case .incomingRequested: case .incomingRequested:
strongSelf.call.acceptVideo() strongSelf.call.acceptVideo()
default: default:
self?.endCall?() strongSelf.endCall?()
} }
case .requesting:
strongSelf.endCall?()
case .ringing: case .ringing:
strongSelf.acceptCall?() strongSelf.acceptCall?()
default: default:
@ -761,7 +763,7 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
if !self.statusNode.subtitle.isEmpty { if !self.statusNode.subtitle.isEmpty {
text += "\n\(self.statusNode.subtitle)" text += "\n\(self.statusNode.subtitle)"
} }
statusValue = .text(string: text, displayLogo: true) statusValue = .text(string: text, displayLogo: false)
case .active(let timestamp, let reception, let keyVisualHash), .reconnecting(let timestamp, let reception, let keyVisualHash): case .active(let timestamp, let reception, let keyVisualHash), .reconnecting(let timestamp, let reception, let keyVisualHash):
let strings = self.presentationData.strings let strings = self.presentationData.strings
var isReconnecting = false var isReconnecting = false
@ -799,7 +801,7 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro
if !self.statusNode.subtitle.isEmpty { if !self.statusNode.subtitle.isEmpty {
text += "\n\(self.statusNode.subtitle)" text += "\n\(self.statusNode.subtitle)"
} }
statusValue = .text(string: text, displayLogo: true) statusValue = .text(string: text, displayLogo: false)
/*case .outgoingRequested: /*case .outgoingRequested:
statusValue = .text(string: self.presentationData.strings.Call_StatusRequesting, displayLogo: false)*/ statusValue = .text(string: self.presentationData.strings.Call_StatusRequesting, displayLogo: false)*/
} }