mirror of
https://gitlab.linphone.org/BC/public/linphone-iphone.git
synced 2026-04-17 11:48:27 +00:00
Merge branch 'master'
#Conflicts: # Linphone/GeneratedGit.swift
This commit is contained in:
commit
828fadb9e0
2 changed files with 7 additions and 3 deletions
|
|
@ -1,7 +1,7 @@
|
|||
import Foundation
|
||||
|
||||
public enum AppGitInfo {
|
||||
public static let branch = "feature/screen_sharing"
|
||||
public static let commit = "1dc5dec22"
|
||||
public static let branch = "master"
|
||||
public static let commit = "127e12b38"
|
||||
public static let tag = "6.1.0-alpha"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -477,7 +477,11 @@ struct AddParticipantsFragment: View {
|
|||
_ lhs: [(label: String, phoneNumber: String)],
|
||||
_ rhs: [(label: String, phoneNumber: String)]
|
||||
) -> 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
|
||||
l.label == r.label && l.phoneNumber == r.phoneNumber
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue