mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-05-07 14:44:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix uninitialized encryption backend on chat room creation without encryptionFix unin

Browse source
This commit is contained in:
Julien Wadel 2021-08-25 20:19:13 +02:00
parent a0bab8083d
commit eab5d76787
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-app/src/components/chat-room/ChatRoomModel.hpp
View file

@ -183,7 +183,7 @@ public:
bool isEphemeralEnabled() const;
long getEphemeralLifetime() const;
bool canBeEphemeral();
Q_INVOKABLE bool haveEncryption() const;
bool haveEncryption() const;
Q_INVOKABLE bool isSecure() const;
int getSecurityLevel() const;
bool isGroupEnabled() const;

2
linphone-app/src/components/timeline/TimelineModel.cpp
View file

@ -95,7 +95,7 @@ void TimelineModel::setSelected(const bool& selected){
<< ", isConference:"<< mChatRoomModel->isConference()
<< ", isOneToOne:"<< mChatRoomModel->isOneToOne()
<< ", Encrypted:"<< mChatRoomModel->haveEncryption()
<< ", ephemeralEnabled:" << mChatRoomModel->haveEncryption()
<< ", ephemeralEnabled:" << mChatRoomModel->isEphemeralEnabled()
<< ", isAdmin:"<< mChatRoomModel->isMeAdmin()
<< ", canHandleParticipants:"<< mChatRoomModel->canHandleParticipants()
<< ", hasBeenLeft:" << mChatRoomModel->hasBeenLeft();

6
linphone-app/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file

@ -78,11 +78,7 @@ Notification {
AccountSettingsModel.setDefaultProxyConfigFromSipAddress(notification.localAddress)
notification.timelineModel.selected = true
notification.notificationData.window.setView('Conversation', {
chatRoomModel:notification.timelineModel.getChatRoomModel()/*,
peerAddress: notification.peerAddress,
localAddress: notification.localAddress,
fullPeerAddress: notification.fullPeerAddress,
fullLocalAddress: notification.fullLocalAddress*/
chatRoomModel:notification.timelineModel.getChatRoomModel()
})
})
}

2
linphone-sdk

@ -1 +1 @@
Subproject commit 235a49a0e6a17055cf9cf756b80452d88ee45f83
Subproject commit 90d0649aa68f0730817eaef9930522700ceb0253