mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-04-17 20:08:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master'

Browse source 
#Conflicts:
#	Linphone/GeneratedGit.swift
This commit is contained in:
Benoit Martins 2026-03-26 10:27:22 +01:00
commit 828fadb9e0
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Linphone/GeneratedGit.swift
View file

@ -1,7 +1,7 @@
import Foundation import Foundation
public enum AppGitInfo { public enum AppGitInfo {
public static let branch = "feature/screen_sharing" public static let branch = "master"
public static let commit = "1dc5dec22" public static let commit = "127e12b38"
public static let tag = "6.1.0-alpha" public static let tag = "6.1.0-alpha"
} }

6
Linphone/UI/Main/Meetings/Fragments/AddParticipantsFragment.swift
View file

@ -477,7 +477,11 @@ struct AddParticipantsFragment: View {
_ lhs: [(label: String, phoneNumber: String)], _ lhs: [(label: String, phoneNumber: String)],
_ rhs: [(label: String, phoneNumber: String)] _ rhs: [(label: String, phoneNumber: String)]
) -> Bool { ) -> Bool {
lhs.count == rhs.count && guard !lhs.isEmpty && !rhs.isEmpty else {
return false
}
return lhs.count == rhs.count &&
zip(lhs, rhs).allSatisfy { l, r in zip(lhs, rhs).allSatisfy { l, r in
l.label == r.label && l.phoneNumber == r.phoneNumber l.label == r.label && l.phoneNumber == r.phoneNumber
} }