From f6190ffc0e0265d54343e680cd59d7b0c664b454 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 7 Aug 2020 22:15:13 +0400 Subject: [PATCH 1/3] Don't adjust speaker to speaker --- submodules/TelegramCallsUI/Sources/CallControllerNode.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift index 990e2154b6..d2c3d91966 100644 --- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift +++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift @@ -556,7 +556,7 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro if self.outgoingVideoNodeValue != nil || self.incomingVideoNodeValue != nil || self.candidateOutgoingVideoNodeValue != nil || self.candidateIncomingVideoNodeValue != nil { if let audioOutputState = self.audioOutputState, let currentOutput = audioOutputState.currentOutput { switch currentOutput { - case .headphones: + case .headphones, .speaker: break case let .port(port) where port.type == .bluetooth: break From f8ecf4dc883d5ae65a6ec0aa564f3d159cb211cb Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 7 Aug 2020 22:38:50 +0400 Subject: [PATCH 2/3] Fix video --- submodules/TelegramCallsUI/Sources/CallControllerNode.swift | 4 +++- .../PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h | 1 - submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm | 6 ------ .../PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h | 1 + .../TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm | 6 ++++++ 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift index 3ad59d56d3..4bbc599d86 100644 --- a/submodules/TelegramCallsUI/Sources/CallControllerNode.swift +++ b/submodules/TelegramCallsUI/Sources/CallControllerNode.swift @@ -654,9 +654,11 @@ final class CallControllerNode: ViewControllerTracingNode, CallControllerNodePro strongSelf.incomingVideoNodeValue = incomingVideoNode if let expandedVideoNode = strongSelf.expandedVideoNode { strongSelf.minimizedVideoNode = expandedVideoNode + strongSelf.containerNode.insertSubnode(incomingVideoNode, belowSubnode: expandedVideoNode) + } else { + strongSelf.containerNode.insertSubnode(incomingVideoNode, belowSubnode: strongSelf.dimNode) } strongSelf.expandedVideoNode = incomingVideoNode - strongSelf.containerNode.insertSubnode(incomingVideoNode, belowSubnode: strongSelf.dimNode) strongSelf.updateButtonsMode(transition: .animated(duration: 0.4, curve: .spring)) } diff --git a/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h b/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h index b2a73be4bf..d7f6e16846 100644 --- a/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h +++ b/submodules/TgVoip/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h @@ -74,7 +74,6 @@ typedef NS_ENUM(int32_t, OngoingCallDataSaving) { - (NSData * _Nonnull)getDerivedState; - (void)setIsMuted:(bool)isMuted; -- (void)setIsLowBatteryLevel:(bool)isLowBatteryLevel; - (void)setNetworkType:(OngoingCallNetworkType)networkType; @end diff --git a/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm index 38663d7668..7479f6cec8 100644 --- a/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm +++ b/submodules/TgVoip/Sources/OngoingCallThreadLocalContext.mm @@ -419,12 +419,6 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL; } } -- (void)setIsLowBatteryLevel:(bool)isLowBatteryLevel { - if (_tgVoip) { - _tgVoip->setIsLowBatteryLevel(isLowBatteryLevel); - } -} - - (void)setNetworkType:(OngoingCallNetworkType)networkType { if (_networkType != networkType) { _networkType = networkType; diff --git a/submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h b/submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h index eee20d9cee..146aa2edac 100644 --- a/submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h +++ b/submodules/TgVoipWebrtc/PublicHeaders/TgVoip/OngoingCallThreadLocalContext.h @@ -135,6 +135,7 @@ typedef NS_ENUM(int32_t, OngoingCallDataSavingWebrtc) { - (NSData * _Nonnull)getDerivedState; - (void)setIsMuted:(bool)isMuted; +- (void)setIsLowBatteryLevel:(bool)isLowBatteryLevel; - (void)setNetworkType:(OngoingCallNetworkTypeWebrtc)networkType; - (void)makeIncomingVideoView:(void (^_Nonnull)(UIView * _Nullable))completion; - (void)requestVideo:(OngoingCallThreadLocalContextVideoCapturer * _Nullable)videoCapturer; diff --git a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm index ef8b4bdaaa..b4443770e0 100644 --- a/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm +++ b/submodules/TgVoipWebrtc/Sources/OngoingCallThreadLocalContext.mm @@ -640,6 +640,12 @@ static void (*InternalVoipLoggingFunction)(NSString *) = NULL; } } +- (void)setIsLowBatteryLevel:(bool)isLowBatteryLevel { + if (_tgVoip) { + _tgVoip->setIsLowBatteryLevel(isLowBatteryLevel); + } +} + - (void)setNetworkType:(OngoingCallNetworkTypeWebrtc)networkType { if (_networkType != networkType) { _networkType = networkType; From 54ef976ae9311a54758d4c3253b9cc112ef563b2 Mon Sep 17 00:00:00 2001 From: Ali <> Date: Fri, 7 Aug 2020 22:44:44 +0400 Subject: [PATCH 3/3] Fix build --- submodules/TelegramCallsUI/BUCK | 1 + 1 file changed, 1 insertion(+) diff --git a/submodules/TelegramCallsUI/BUCK b/submodules/TelegramCallsUI/BUCK index 22c382e8f7..618ee191c6 100644 --- a/submodules/TelegramCallsUI/BUCK +++ b/submodules/TelegramCallsUI/BUCK @@ -22,6 +22,7 @@ static_library( "//submodules/PresentationDataUtils:PresentationDataUtils", "//submodules/TelegramCallsUI/CallsEmoji:CallsEmoji", "//submodules/SemanticStatusNode:SemanticStatusNode", + "//submodules/TooltipUI:TooltipUI", ], frameworks = [ "$SDKROOT/System/Library/Frameworks/Foundation.framework",