From 1943f0f21cf58d6d1229194b50cb86d38257814b Mon Sep 17 00:00:00 2001 From: Benoit Martins Date: Tue, 17 Mar 2026 16:16:40 +0100 Subject: [PATCH] Fix mediaEncryption setting and media list for friends with multiple addresses --- Linphone/GeneratedGit.swift | 2 +- .../UI/Main/Contacts/ViewModel/ContactsListViewModel.swift | 2 +- .../Main/Settings/Fragments/SettingsAdvancedCallFragment.swift | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Linphone/GeneratedGit.swift b/Linphone/GeneratedGit.swift index 29b5b3fed..7736678ca 100644 --- a/Linphone/GeneratedGit.swift +++ b/Linphone/GeneratedGit.swift @@ -2,6 +2,6 @@ import Foundation public enum AppGitInfo { public static let branch = "master" - public static let commit = "c01f79dd2" + public static let commit = "1ffcd3e1a" public static let tag = "6.1.0-alpha" } diff --git a/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift b/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift index 0ae56cf0d..71fcdc887 100644 --- a/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift +++ b/Linphone/UI/Main/Contacts/ViewModel/ContactsListViewModel.swift @@ -343,7 +343,7 @@ class ContactsListViewModel: ObservableObject { if let contactAvatarModel = SharedMainViewModel.shared.displayedFriend { var remote: Address? - if contactAvatarModel.addresses.count == 1 { + if contactAvatarModel.addresses.count >= 1 { do { remote = try Factory.Instance.createAddress(addr: contactAvatarModel.address) } catch { diff --git a/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedCallFragment.swift b/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedCallFragment.swift index fcb8b9749..9ed0606cd 100644 --- a/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedCallFragment.swift +++ b/Linphone/UI/Main/Settings/Fragments/SettingsAdvancedCallFragment.swift @@ -83,15 +83,12 @@ struct SettingsAdvancedCallFragment: View { } Button("SRTP") { settingsViewModel.mediaEncryption = "SRTP" - settingsViewModel.mediaEncryptionMandatory = true } Button("ZRTP") { settingsViewModel.mediaEncryption = "ZRTP" - settingsViewModel.mediaEncryptionMandatory = true } Button("DTLS") { settingsViewModel.mediaEncryption = "DTLS" - settingsViewModel.mediaEncryptionMandatory = true } } label: { Text(settingsViewModel.mediaEncryption)