From 76471f901a072d08e2994d23fb2a7ea6f5053df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Tue, 8 Jun 2021 09:49:04 -0400
Subject: [PATCH] fileTransfer: follow api changes for downloadFile
Change-Id: If20a691c64c9b78276b6f950038bd30d556cbfea
---
src/api/datatransfermodel.h | 1 +
src/conversationmodel.cpp | 2 +-
src/datatransfermodel.cpp | 3 ++-
src/messageslist.cpp | 1 +
src/qtwrapper/configurationmanager_wrap.h | 2 ++
5 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/api/datatransfermodel.h b/src/api/datatransfermodel.h
index 19083559..fee2fc7c 100644
--- a/src/api/datatransfermodel.h
+++ b/src/api/datatransfermodel.h
@@ -73,6 +73,7 @@ public:
void download(const QString& accountId,
const QString& convId,
+ const QString& interactionId,
const QString& fileId,
const QString& path);
diff --git a/src/conversationmodel.cpp b/src/conversationmodel.cpp
index c00a039e..2581ab33 100644
--- a/src/conversationmodel.cpp
+++ b/src/conversationmodel.cpp
@@ -3685,7 +3685,7 @@ ConversationModelPimpl::acceptTransfer(const QString& convUid,
qWarning() << "Too much duplicates for " << destinationDir << path;
return;
}
- linked.owner.dataTransferModel->download(linked.owner.id, convUid, fileId, path);
+ linked.owner.dataTransferModel->download(linked.owner.id, convUid, interactionId, fileId, path);
} else {
qWarning() << "Cannot download file without valid interaction";
}
diff --git a/src/datatransfermodel.cpp b/src/datatransfermodel.cpp
index 11a55c93..146f6ba0 100644
--- a/src/datatransfermodel.cpp
+++ b/src/datatransfermodel.cpp
@@ -213,10 +213,11 @@ DataTransferModel::accept(const QString& accountId,
void
DataTransferModel::download(const QString& accountId,
const QString& convId,
+ const QString& interactionId,
const QString& fileId,
const QString& path)
{
- ConfigurationManager::instance().downloadFile(accountId, convId, fileId, path);
+ ConfigurationManager::instance().downloadFile(accountId, convId, interactionId, fileId, path);
}
void
diff --git a/src/messageslist.cpp b/src/messageslist.cpp
index 795b6bbc..92703c20 100644
--- a/src/messageslist.cpp
+++ b/src/messageslist.cpp
@@ -19,6 +19,7 @@
*/
#include <QCoreApplication>
+#include <stdexcept>
#include "messageslist.h"
#include "api/interaction.h"
diff --git a/src/qtwrapper/configurationmanager_wrap.h b/src/qtwrapper/configurationmanager_wrap.h
index 25412ec0..d353b400 100644
--- a/src/qtwrapper/configurationmanager_wrap.h
+++ b/src/qtwrapper/configurationmanager_wrap.h
@@ -329,11 +329,13 @@ public Q_SLOTS: // METHODS
void downloadFile(const QString& accountId,
const QString& convId,
+ const QString& interactionId,
const QString& fileId,
const QString& path)
{
DRing::downloadFile(accountId.toStdString(),
convId.toStdString(),
+ interactionId.toStdString(),
fileId.toStdString(),
path.toStdString());
}
--
GitLab