From c3746801ac3591373d5eb022c04fcaf96c951e22 Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 22 Nov 2022 15:50:35 +0100 Subject: [PATCH] Remove Incoming condition in IncomingOutgoingCommonView for reset outgoing call timer --- ...gCommonView.swift => IncomingOutgoingCommonView.swift} | 2 +- linphone.xcodeproj/project.pbxproj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) rename Classes/Swift/Voip/Views/Fragments/{IncomingOuntgoingCommonView.swift => IncomingOutgoingCommonView.swift} (98%) diff --git a/Classes/Swift/Voip/Views/Fragments/IncomingOuntgoingCommonView.swift b/Classes/Swift/Voip/Views/Fragments/IncomingOutgoingCommonView.swift similarity index 98% rename from Classes/Swift/Voip/Views/Fragments/IncomingOuntgoingCommonView.swift rename to Classes/Swift/Voip/Views/Fragments/IncomingOutgoingCommonView.swift index 4ceb0020f..a15c91ed2 100644 --- a/Classes/Swift/Voip/Views/Fragments/IncomingOuntgoingCommonView.swift +++ b/Classes/Swift/Voip/Views/Fragments/IncomingOutgoingCommonView.swift @@ -43,7 +43,7 @@ import linphonesw var callData: CallData? = nil { didSet { - duration.call = callData?.call.dir == .Incoming ? callData?.call : nil + duration.call = callData?.call callData?.call.remoteAddress.map { avatar.fillFromAddress(address: $0) displayName.text = $0.addressBookEnhancedDisplayName() diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 1b2529cb3..5dc500b04 100644 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -728,7 +728,7 @@ C63F724A285A24B10066163B /* VoipConferenceActiveSpeakerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E4285A24B10066163B /* VoipConferenceActiveSpeakerView.swift */; }; C63F724B285A24B10066163B /* VoipConferenceDisplayModeSelectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E5285A24B10066163B /* VoipConferenceDisplayModeSelectionView.swift */; }; C63F724C285A24B10066163B /* ActiveCallView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E7285A24B10066163B /* ActiveCallView.swift */; }; - C63F724D285A24B10066163B /* IncomingOuntgoingCommonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E8285A24B10066163B /* IncomingOuntgoingCommonView.swift */; }; + C63F724D285A24B10066163B /* IncomingOutgoingCommonView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E8285A24B10066163B /* IncomingOutgoingCommonView.swift */; }; C63F724E285A24B10066163B /* PausedCallOrConferenceView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71E9285A24B10066163B /* PausedCallOrConferenceView.swift */; }; C63F724F285A24B10066163B /* LocalVideoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71EA285A24B10066163B /* LocalVideoView.swift */; }; C63F7250285A24B10066163B /* CallStatsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C63F71EB285A24B10066163B /* CallStatsView.swift */; }; @@ -1900,7 +1900,7 @@ C63F71E4285A24B10066163B /* VoipConferenceActiveSpeakerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VoipConferenceActiveSpeakerView.swift; sourceTree = ""; }; C63F71E5285A24B10066163B /* VoipConferenceDisplayModeSelectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VoipConferenceDisplayModeSelectionView.swift; sourceTree = ""; }; C63F71E7285A24B10066163B /* ActiveCallView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ActiveCallView.swift; sourceTree = ""; }; - C63F71E8285A24B10066163B /* IncomingOuntgoingCommonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncomingOuntgoingCommonView.swift; sourceTree = ""; }; + C63F71E8285A24B10066163B /* IncomingOutgoingCommonView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IncomingOutgoingCommonView.swift; sourceTree = ""; }; C63F71E9285A24B10066163B /* PausedCallOrConferenceView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PausedCallOrConferenceView.swift; sourceTree = ""; }; C63F71EA285A24B10066163B /* LocalVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalVideoView.swift; sourceTree = ""; }; C63F71EB285A24B10066163B /* CallStatsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallStatsView.swift; sourceTree = ""; }; @@ -3530,7 +3530,7 @@ C63F71DC285A24B10066163B /* AudioRoutesView.swift */, C63F71DD285A24B10066163B /* Conference */, C63F71E6285A24B10066163B /* ActiveCall */, - C63F71E8285A24B10066163B /* IncomingOuntgoingCommonView.swift */, + C63F71E8285A24B10066163B /* IncomingOutgoingCommonView.swift */, C63F71E9285A24B10066163B /* PausedCallOrConferenceView.swift */, C63F71EA285A24B10066163B /* LocalVideoView.swift */, C63F71EB285A24B10066163B /* CallStatsView.swift */, @@ -5105,7 +5105,7 @@ 637157A11B283FE200C91677 /* FileTransferDelegate.m in Sources */, D378AB2A15DCDB4A0098505D /* ImagePickerView.m in Sources */, 22405F001601C19200B92522 /* ImageView.m in Sources */, - C63F724D285A24B10066163B /* IncomingOuntgoingCommonView.swift in Sources */, + C63F724D285A24B10066163B /* IncomingOutgoingCommonView.swift in Sources */, D37EE162160377D7003608A6 /* DTActionSheet.m in Sources */, D306459E1611EC2A00BB571E /* UILoadingImageView.m in Sources */, C63F7246285A24B10066163B /* VoipGridParticipantCell.swift in Sources */,