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

Update call transfer logic to new implementation

Browse source
This commit is contained in:
Benoit Martins 2026-02-23 14:11:39 +01:00
parent 1fff8d6d36
commit 23f5211131
5 changed files with 192 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Linphone/GeneratedGit.swift
View file

@ -2,6 +2,6 @@ import Foundation
public enum AppGitInfo { public enum AppGitInfo {
public static let branch = "master" public static let branch = "master"
public static let commit = "09863890e" public static let commit = "1fff8d6d3"
public static let tag = "6.1.0-alpha" public static let tag = "6.1.0-alpha"
} }

6
Linphone/Localizable/en.lproj/Localizable.strings
View file

@ -138,7 +138,11 @@
"call_stats_audio_title" = "Audio"; "call_stats_audio_title" = "Audio";
"call_stats_media_encryption_title" = "Media encryption"; "call_stats_media_encryption_title" = "Media encryption";
"call_stats_video_title" = "Video"; "call_stats_video_title" = "Video";
"call_transfer_current_call_title" = "Transfer call"; "call_transfer_current_call_title" = "Transfer %@ to…";
"call_transfer_active_calls_label" = "Current calls";
"call_transfer_no_active_call_label" = "No other call";
"call_transfer_confirm_dialog_tittle" = "Confirm call transfer";
"call_transfer_confirm_dialog_message" = "You're about to transfer call %1$@ to %2$@.";
"call_transfer_failed_toast" = "Call transfer failed!"; "call_transfer_failed_toast" = "Call transfer failed!";
"call_transfer_in_progress_toast" = "Call is being transferred"; "call_transfer_in_progress_toast" = "Call is being transferred";
"call_transfer_successful_toast" = "Call has been successfully transferred"; "call_transfer_successful_toast" = "Call has been successfully transferred";

6
Linphone/Localizable/fr.lproj/Localizable.strings
View file

@ -138,7 +138,11 @@
"call_stats_audio_title" = "Audio"; "call_stats_audio_title" = "Audio";
"call_stats_media_encryption_title" = "Chiffrement du média"; "call_stats_media_encryption_title" = "Chiffrement du média";
"call_stats_video_title" = "Video"; "call_stats_video_title" = "Video";
"call_transfer_current_call_title" = "Transférer l’appel"; "call_transfer_current_call_title" = "Transférer %@ à…";
"call_transfer_active_calls_label" = "Appels en cours";
"call_transfer_no_active_call_label" = "Pas d'autre appel";
"call_transfer_confirm_dialog_tittle" = "Confirmer le transfert";
"call_transfer_confirm_dialog_message" = "Vous allez transférer %1$@ à %2$@.";
"call_transfer_failed_toast" = "Echec du transfert"; "call_transfer_failed_toast" = "Echec du transfert";
"call_transfer_in_progress_toast" = "Transfert en cours"; "call_transfer_in_progress_toast" = "Transfert en cours";
"call_transfer_successful_toast" = "Appel transféré"; "call_transfer_successful_toast" = "Appel transféré";

60
Linphone/UI/Call/CallView.swift
View file

@ -2045,22 +2045,18 @@ struct CallView: View {
HStack(spacing: 0) { HStack(spacing: 0) {
if callViewModel.isOneOneCall { if callViewModel.isOneOneCall {
VStack { VStack {
Button { Button {
if callViewModel.callsCounter < 2 { withAnimation {
withAnimation { callViewModel.isTransferInsteadCall = true
callViewModel.isTransferInsteadCall = true isShowStartCallFragment.toggle()
isShowStartCallFragment.toggle() }
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { telecomManager.callStarted = false
telecomManager.callStarted = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { telecomManager.callStarted = true
telecomManager.callStarted = true }
} }
}
} else {
callViewModel.transferClicked()
}
} label: { } label: {
HStack { HStack {
Image("phone-transfer") Image("phone-transfer")
@ -2075,7 +2071,7 @@ struct CallView: View {
.background(Color.gray500) .background(Color.gray500)
.cornerRadius(40) .cornerRadius(40)
Text(callViewModel.callsCounter < 2 ? "call_action_blind_transfer" : "call_action_attended_transfer") Text("call_action_blind_transfer")
.foregroundStyle(.white) .foregroundStyle(.white)
.default_text_style(styleSize: 15) .default_text_style(styleSize: 15)
} }
@ -2471,22 +2467,18 @@ struct CallView: View {
HStack { HStack {
if callViewModel.isOneOneCall { if callViewModel.isOneOneCall {
VStack { VStack {
Button { Button {
if callViewModel.callsCounter < 2 { withAnimation {
withAnimation { callViewModel.isTransferInsteadCall = true
callViewModel.isTransferInsteadCall = true isShowStartCallFragment.toggle()
isShowStartCallFragment.toggle() }
}
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) { telecomManager.callStarted = false
telecomManager.callStarted = false DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { telecomManager.callStarted = true
telecomManager.callStarted = true }
} }
}
} else {
callViewModel.transferClicked()
}
} label: { } label: {
HStack { HStack {
Image("phone-transfer") Image("phone-transfer")
@ -2501,7 +2493,7 @@ struct CallView: View {
.background(Color.gray500) .background(Color.gray500)
.cornerRadius(40) .cornerRadius(40)
Text(callViewModel.callsCounter < 2 ? "call_action_blind_transfer" : "call_action_attended_transfer") Text("call_action_blind_transfer")
.foregroundStyle(.white) .foregroundStyle(.white)
.default_text_style(styleSize: 15) .default_text_style(styleSize: 15)
} }

199
Linphone/UI/Main/History/Fragments/StartCallFragment.swift
View file

@ -32,6 +32,9 @@ struct StartCallFragment: View {
@StateObject private var startCallViewModel = StartCallViewModel() @StateObject private var startCallViewModel = StartCallViewModel()
@State private var transferAddress: Address? = nil
@State private var isShowTransferPopup: Bool = false
@Binding var isShowStartCallFragment: Bool @Binding var isShowStartCallFragment: Bool
@Binding var showingDialer: Bool @Binding var showingDialer: Bool
@ -107,9 +110,23 @@ struct StartCallFragment: View {
} }
} }
Text(!callViewModel.isTransferInsteadCall ? "history_call_start_title" : "call_transfer_current_call_title") let address = callViewModel.currentCall?.remoteAddress
.multilineTextAlignment(.leading)
.default_text_style_orange_800(styleSize: 16) let nameTmp =
address?.displayName
?? address?.username
?? String(address?.asStringUriOnly().dropFirst(4) ?? "")
Text(
!callViewModel.isTransferInsteadCall
? String(localized: "history_call_start_title")
: String(
format: String(localized: "call_transfer_current_call_title"),
nameTmp
)
)
.multilineTextAlignment(.leading)
.default_text_style_orange_800(styleSize: 16)
Spacer() Spacer()
@ -121,6 +138,29 @@ struct StartCallFragment: View {
.background(.white) .background(.white)
VStack(spacing: 0) { VStack(spacing: 0) {
if callViewModel.isTransferInsteadCall {
HStack(alignment: .center) {
Text("call_transfer_active_calls_label")
.default_text_style_800(styleSize: 16)
Spacer()
}
.padding(.vertical, 10)
.padding(.horizontal, 16)
if let remoteAddress = callViewModel.currentCall?.remoteAddress,
!callViewModel.calls.filter({ $0.remoteAddress?.equal(address2: remoteAddress) == false }).isEmpty {
callsList(remoteAddress: remoteAddress)
.padding(.bottom, 10)
} else {
HStack(alignment: .center) {
Text("call_transfer_no_active_call_label")
.default_text_style_700(styleSize: 16)
}
.padding(.bottom, 10)
}
}
ZStack(alignment: .trailing) { ZStack(alignment: .trailing) {
TextField("history_call_start_search_bar_filter_hint", text: $startCallViewModel.searchField) TextField("history_call_start_search_bar_filter_hint", text: $startCallViewModel.searchField)
.default_text_style(styleSize: 15) .default_text_style(styleSize: 15)
@ -251,25 +291,8 @@ struct StartCallFragment: View {
ContactsListFragment(showingSheet: .constant(false) ContactsListFragment(showingSheet: .constant(false)
, startCallFunc: { addr in , startCallFunc: { addr in
if callViewModel.isTransferInsteadCall { if callViewModel.isTransferInsteadCall {
showingDialer = false self.transferAddress = addr
self.isShowTransferPopup = true
startCallViewModel.searchField = ""
magicSearch.currentFilter = ""
magicSearch.searchForContacts()
if callViewModel.isTransferInsteadCall == true {
callViewModel.isTransferInsteadCall = false
}
resetCallView()
delayColorDismiss()
withAnimation {
isShowStartCallFragment.toggle()
callViewModel.blindTransferCallTo(toAddress: addr)
}
} else { } else {
showingDialer = false showingDialer = false
@ -318,6 +341,52 @@ struct StartCallFragment: View {
.frame(maxWidth: .infinity) .frame(maxWidth: .infinity)
} }
.background(.white) .background(.white)
if isShowTransferPopup {
PopupView(
isShowPopup: $isShowTransferPopup,
title: Text("history_dialog_delete_all_call_logs_title"),
content: Text("history_dialog_delete_all_call_logs_message"),
titleFirstButton: nil,
actionFirstButton: {},
titleSecondButton: Text("dialog_confirm"),
actionSecondButton: {
showingDialer = false
startCallViewModel.searchField = ""
magicSearch.currentFilter = ""
magicSearch.searchForContacts()
if callViewModel.isTransferInsteadCall == true {
callViewModel.isTransferInsteadCall = false
}
resetCallView()
delayColorDismiss()
withAnimation {
isShowStartCallFragment.toggle()
if let transferAddress = self.transferAddress {
callViewModel.blindTransferCallTo(toAddress: transferAddress)
self.transferAddress = nil
}
}
self.isShowTransferPopup.toggle()
},
titleThirdButton: Text("dialog_cancel"),
actionThirdButton: {
self.isShowTransferPopup.toggle()
}
)
.background(.black.opacity(0.65))
.zIndex(3)
.onTapGesture {
self.isShowTransferPopup.toggle()
}
}
} }
.navigationTitle("") .navigationTitle("")
.navigationBarHidden(true) .navigationBarHidden(true)
@ -341,31 +410,73 @@ struct StartCallFragment: View {
} }
} }
func callsList(remoteAddress: Address) -> some View {
ForEach(0..<callViewModel.calls.filter({ $0.remoteAddress?.equal(address2: remoteAddress) == false }).count, id: \.self) { index in
Button {
if callViewModel.isTransferInsteadCall {
self.transferAddress = callViewModel.calls.filter({ $0.remoteAddress?.equal(address2: remoteAddress) == false })[index].remoteAddress
self.isShowTransferPopup = true
}
} label: {
HStack {
if index < callViewModel.calls.count,
let remoteAddress = callViewModel.calls.filter({ $0.remoteAddress?.equal(address2: remoteAddress) == false })[index].remoteAddress{
if remoteAddress.domain != AppServices.corePreferences.defaultDomain {
Image(uiImage: contactsManager.textToImage(
firstName: String(remoteAddress.asStringUriOnly().dropFirst(4)),
lastName: ""))
.resizable()
.frame(width: 45, height: 45)
.clipShape(Circle())
Text(String(remoteAddress.asStringUriOnly().dropFirst(4)))
.default_text_style(styleSize: 16)
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .leading)
.foregroundStyle(Color.orangeMain500)
} else {
let nameTmp = remoteAddress.displayName
?? remoteAddress.username
?? String(remoteAddress.asStringUriOnly().dropFirst(4))
Image(uiImage: contactsManager.textToImage(
firstName: nameTmp,
lastName: ""))
.resizable()
.frame(width: 45, height: 45)
.clipShape(Circle())
Text(nameTmp)
.default_text_style(styleSize: 16)
.lineLimit(1)
.frame(maxWidth: .infinity, alignment: .leading)
.foregroundStyle(Color.orangeMain500)
}
} else {
Image("profil-picture-default")
.resizable()
.frame(width: 45, height: 45)
.clipShape(Circle())
Text("username_error")
.default_text_style(styleSize: 16)
.frame(maxWidth: .infinity, alignment: .leading)
.foregroundStyle(Color.orangeMain500)
}
}
.padding(.horizontal)
}
.buttonStyle(.borderless)
.listRowSeparator(.hidden)
}
}
var suggestionsList: some View { var suggestionsList: some View {
ForEach(0..<contactsManager.lastSearchSuggestions.count, id: \.self) { index in ForEach(0..<contactsManager.lastSearchSuggestions.count, id: \.self) { index in
Button { Button {
if callViewModel.isTransferInsteadCall { if callViewModel.isTransferInsteadCall {
showingDialer = false self.transferAddress = contactsManager.lastSearchSuggestions[index].address
self.isShowTransferPopup = true
startCallViewModel.searchField = ""
magicSearch.currentFilter = ""
magicSearch.searchForContacts()
if callViewModel.isTransferInsteadCall == true {
callViewModel.isTransferInsteadCall = false
}
resetCallView()
delayColorDismiss()
withAnimation {
isShowStartCallFragment.toggle()
if contactsManager.lastSearchSuggestions[index].address != nil {
callViewModel.blindTransferCallTo(toAddress: contactsManager.lastSearchSuggestions[index].address!)
}
}
} else { } else {
showingDialer = false showingDialer = false
@ -378,7 +489,7 @@ struct StartCallFragment: View {
callViewModel.isTransferInsteadCall = false callViewModel.isTransferInsteadCall = false
} }
resetCallView() resetCallView()
delayColorDismiss() delayColorDismiss()