From 937444c5d00f1d463d89aa7c9f1127c4a5fb4ecb Mon Sep 17 00:00:00 2001
From: Benoit Martins <benoit.martins@belledonne-communications.com>
Date: Fri, 12 Jan 2024 16:01:04 +0100
Subject: [PATCH] Fix video display in call view

---
 Linphone/UI/Call/CallView.swift                | 14 ++++++++------
 Linphone/UI/Call/ViewModel/CallViewModel.swift |  3 ---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Linphone/UI/Call/CallView.swift b/Linphone/UI/Call/CallView.swift
index c7d34b298..709a814df 100644
--- a/Linphone/UI/Call/CallView.swift
+++ b/Linphone/UI/Call/CallView.swift
@@ -82,7 +82,7 @@ struct CallView: View {
 									Button {
 										callViewModel.toggleVideo()
 									} label: {
-										Image(callViewModel.cameraDisplayed ? "video-camera" : "video-camera-slash")
+										Image(telecomManager.remoteVideo ? "video-camera" : "video-camera-slash")
 											.renderingMode(.template)
 											.resizable()
 											.foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white)
@@ -500,7 +500,7 @@ struct CallView: View {
 					
 					Spacer()
 					
-					if callViewModel.cameraDisplayed {
+					if telecomManager.remoteVideo {
 						Button {
 							callViewModel.switchCamera()
 						} label: {
@@ -594,10 +594,12 @@ struct CallView: View {
 				.scaledToFill()
 				.clipped()
 				.onTapGesture {
-					fullscreenVideo.toggle()
+					if telecomManager.remoteVideo {
+						fullscreenVideo.toggle()
+					}
 				}
 				
-				if callViewModel.cameraDisplayed {
+				if telecomManager.remoteVideo {
 					HStack {
 						Spacer()
 						VStack {
@@ -741,7 +743,7 @@ struct CallView: View {
 								Button {
 									callViewModel.toggleVideo()
 								} label: {
-									Image(callViewModel.cameraDisplayed ? "video-camera" : "video-camera-slash")
+									Image(telecomManager.remoteVideo ? "video-camera" : "video-camera-slash")
 										.renderingMode(.template)
 										.resizable()
 										.foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white)
@@ -825,7 +827,7 @@ struct CallView: View {
 							Button {
 								callViewModel.toggleVideo()
 							} label: {
-								Image(callViewModel.cameraDisplayed ? "video-camera" : "video-camera-slash")
+								Image(telecomManager.remoteVideo ? "video-camera" : "video-camera-slash")
 									.renderingMode(.template)
 									.resizable()
 									.foregroundStyle((callViewModel.isPaused || telecomManager.isPausedByRemote) ? Color.gray500 : .white)
diff --git a/Linphone/UI/Call/ViewModel/CallViewModel.swift b/Linphone/UI/Call/ViewModel/CallViewModel.swift
index 26f9dd2ed..b6abd4aa5 100644
--- a/Linphone/UI/Call/ViewModel/CallViewModel.swift
+++ b/Linphone/UI/Call/ViewModel/CallViewModel.swift
@@ -75,7 +75,6 @@ class CallViewModel: ObservableObject {
 					
 					//self.avatarModel = ???
 					self.micMutted = self.currentCall!.microphoneMuted
-					self.cameraDisplayed = self.currentCall!.cameraEnabled == true
 					self.isRecording = self.currentCall!.params!.isRecording
 					self.isPaused = self.isCallPaused()
 					self.timeElapsed = 0
@@ -139,8 +138,6 @@ class CallViewModel: ObservableObject {
 						"[CallViewModel] Updating call with video enabled set to \(params.videoEnabled)"
 					)
 					try self.currentCall!.update(params: params)
-					
-					self.cameraDisplayed = self.currentCall!.cameraEnabled == true
 				} catch {
 					
 				}