From 1a8c0fa8060a5146dd876b8ab2cdd84313389427 Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Fri, 8 Mar 2024 21:21:26 +0100 Subject: [PATCH] Avoid to remove file on cancelling upload --- CHANGELOG.md | 1 + linphone-app/src/components/content/ContentModel.cpp | 8 ++------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c4a34e68..7dda19dbd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Network remote file can be used in chat attachment on Windows. - Crash on forwarding a message to a new secure chat room. - URI handlers and remote provisioning. +- Avoid to remove file on cancelling upload and fix cancelling file transfers. - Update SDK to 5.3.26. ### Added diff --git a/linphone-app/src/components/content/ContentModel.cpp b/linphone-app/src/components/content/ContentModel.cpp index 3317dbaf6..a73023f20 100644 --- a/linphone-app/src/components/content/ContentModel.cpp +++ b/linphone-app/src/components/content/ContentModel.cpp @@ -207,11 +207,7 @@ void ContentModel::downloadFile(){ } void ContentModel::cancelDownloadFile(){ if(mChatMessageModel && mChatMessageModel->getChatMessage()) { - if(mChatMessageModel->isOutgoing() ){ - mChatMessageModel->deleteEvent();// Uploading is cancelling : Delete event to have clean history. - emit mChatMessageModel->remove(mChatMessageModel); - }else - mChatMessageModel->getChatMessage()->cancelFileTransfer(); + mChatMessageModel->getChatMessage()->cancelFileTransfer(); } } @@ -257,4 +253,4 @@ bool ContentModel::saveAs (const QString& path){ } void ContentModel::updateTransferData(){ -} \ No newline at end of file +}