From 8186e21b4cd95c3be74ef6b8e508648fa2cf1e0d Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 10 May 2017 10:28:42 +0200 Subject: [PATCH] feat(src/components/chat/ChatModel): use now linphone resend function --- linphone-desktop/src/components/chat/ChatModel.cpp | 10 ++-------- .../ui/views/App/Calls/IncallFullscreenWindow.qml | 4 +++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/linphone-desktop/src/components/chat/ChatModel.cpp b/linphone-desktop/src/components/chat/ChatModel.cpp index 0e0d8de6e..0f704a75f 100644 --- a/linphone-desktop/src/components/chat/ChatModel.cpp +++ b/linphone-desktop/src/components/chat/ChatModel.cpp @@ -344,15 +344,9 @@ void ChatModel::resendMessage (int id) { switch (map["status"].toInt()) { case MessageStatusFileTransferError: case MessageStatusNotDelivered: { - // TODO: Do not duplicate me! Use a linphone core function in the future. shared_ptr message = static_pointer_cast(entry.second); - - shared_ptr message2 = message->clone(); - message2->setListener(mMessageHandlers); - mChatRoom->sendChatMessage(message2); - - removeEntry(id); - insertMessageAtEnd(message2); + message->setListener(mMessageHandlers); + message->resend(); break; } diff --git a/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml index ec532a3f6..7a6e7257c 100644 --- a/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml +++ b/linphone-desktop/ui/views/App/Calls/IncallFullscreenWindow.qml @@ -292,8 +292,10 @@ Window { ActionButton { Layout.preferredHeight: CallStyle.actionArea.iconSize Layout.preferredWidth: CallStyle.actionArea.iconSize - icon: 'options' // TODO: display options. + icon: 'options' iconSize: CallStyle.actionArea.iconSize + + visible: false // TODO: V2 } }