mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-02-02 04:09:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use flexiapi backend on first start.

Browse source 
Fix ephemeral set on creation.
This commit is contained in:
Julien Wadel 2023-07-31 18:12:56 +02:00
parent d8142d05c1
commit 238fb78aad
2 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
linphone-app/assets/linphonerc-factory
View file

@ -21,4 +21,7 @@ max_conference_size=vga
[ui]
use_qrcode=0
assistant_supports_phone_numbers/readonly=0
assistant_supports_phone_numbers/readonly=0
[account_creator]
backend=1

21
linphone-app/src/components/calls/CallsListModel.cpp
View file

@ -260,11 +260,7 @@ bool CallsListModel::createSecureChat (const QString& subject, const QString &pa
std::list <shared_ptr<linphone::Address> > participants;
std::shared_ptr<const linphone::Address> localAddress;
participants.push_back(address);
int ephemeralTime = CoreManager::getInstance()->getSettingsModel()->getCreateEphemeralChatRooms();
if(ephemeralTime>0)
params->setEphemeralLifetime(ephemeralTime);
params->enableEncryption(true);
params->setSubject(Utils::appStringToCoreString(subject));
params->enableEncryption(true);
params->enableGroup(true);
@ -272,8 +268,11 @@ bool CallsListModel::createSecureChat (const QString& subject, const QString &pa
qInfo() << "Create secure ChatRoom: " << subject << ", from " << QString::fromStdString(localAddress->asString()) << " and with " <<participantAddress;;
std::shared_ptr<linphone::ChatRoom> chatRoom = core->createChatRoom(params, localAddress, participants);
if(chatRoom) {
chatRoom->setEphemeralLifetime(ephemeralTime);
chatRoom->enableEphemeral(ephemeralTime>0);
int ephemeralTime = CoreManager::getInstance()->getSettingsModel()->getCreateEphemeralChatRooms();
if( ephemeralTime>0){
chatRoom->setEphemeralLifetime(ephemeralTime);
chatRoom->enableEphemeral(true);
}
}
// Still needed?
// if( chatRoom != nullptr){
@ -325,9 +324,6 @@ QVariantMap CallsListModel::createChatRoom(const QString& subject, const int& se
qWarning() << "Failed to add participant to conference, bad address : " << (participant ? participant->getSipAddress() : p.toString());
}
params->enableEncryption(securityLevel>0);
int ephemeralTime = CoreManager::getInstance()->getSettingsModel()->getCreateEphemeralChatRooms();
if(securityLevel > 0 && ephemeralTime>0)
params->setEphemeralLifetime(ephemeralTime);
if( securityLevel<=0)
params->setBackend(linphone::ChatRoomBackend::Basic);
@ -376,8 +372,11 @@ QVariantMap CallsListModel::createChatRoom(const QString& subject, const int& se
if( !chatRoom)
qWarning() << "Chat room cannot be created";
else if(securityLevel > 0) {
chatRoom->setEphemeralLifetime(ephemeralTime);
chatRoom->enableEphemeral(ephemeralTime>0);
int ephemeralTime = CoreManager::getInstance()->getSettingsModel()->getCreateEphemeralChatRooms();
if( ephemeralTime>0){
chatRoom->setEphemeralLifetime(ephemeralTime);
chatRoom->enableEphemeral(true);
}
}
result["created"] = (chatRoom != nullptr);