From 8147baef2bbe23c12a1c5837ee52d1005b4593b6 Mon Sep 17 00:00:00 2001
From: Aline Gondim Santos <aline.gondimsantos@savoirfairelinux.com>
Date: Thu, 16 Feb 2023 09:28:12 -0300
Subject: [PATCH] fix: add default flag to sendAccountTextMessage
Change-Id: I08ef8b2f383c3aa1035518a2d4f92e941048e211
---
daemon | 2 +-
src/app/positionmanager.cpp | 5 +++--
src/libclient/api/contactmodel.h | 3 ++-
src/libclient/contactmodel.cpp | 6 ++++--
src/libclient/conversationmodel.cpp | 2 +-
src/libclient/qtwrapper/configurationmanager_wrap.h | 6 ++++--
6 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/daemon b/daemon
index 62e735d73..47f3fd14a 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 62e735d73c807cac424f59c63de454969dd2d808
+Subproject commit 47f3fd14ab0532ff94fd5317f885689928d9293b
diff --git a/src/app/positionmanager.cpp b/src/app/positionmanager.cpp
index a309e5b19..3ba52cf92 100644
--- a/src/app/positionmanager.cpp
+++ b/src/app/positionmanager.cpp
@@ -154,7 +154,7 @@ PositionManager::sendPosition(const QString& body, bool triggersLocalPosition)
Q_FOREACH (const QString& uri, convInfo.participantsUris()) {
if (uri != accountUri) {
lrcInstance_->getAccountInfo(key.first)
- .contactModel->sendDhtMessage(uri, body, APPLICATION_GEO);
+ .contactModel->sendDhtMessage(uri, body, APPLICATION_GEO, 1);
}
}
}
@@ -244,7 +244,8 @@ PositionManager::sendStopMessage(QString accountId, const QString convId)
if (lrcInstance_->getCurrentAccountInfo().profileInfo.uri != uri) {
lrcInstance_->getCurrentAccountInfo().contactModel->sendDhtMessage(uri,
stopMsg,
- APPLICATION_GEO);
+ APPLICATION_GEO,
+ 1);
}
}
}
diff --git a/src/libclient/api/contactmodel.h b/src/libclient/api/contactmodel.h
index 03f6b2a1d..46234849e 100644
--- a/src/libclient/api/contactmodel.h
+++ b/src/libclient/api/contactmodel.h
@@ -110,7 +110,8 @@ public:
*/
uint64_t sendDhtMessage(const QString& uri,
const QString& body,
- const QString& mimeType = {}) const;
+ const QString& mimeType = {},
+ int flag = 0) const;
/**
* Get best id for contact
* @param contactUri
diff --git a/src/libclient/contactmodel.cpp b/src/libclient/contactmodel.cpp
index f0fbf19bc..84d6b2af1 100644
--- a/src/libclient/contactmodel.cpp
+++ b/src/libclient/contactmodel.cpp
@@ -491,7 +491,8 @@ ContactModelPimpl::searchSipContact(const URI& query)
uint64_t
ContactModel::sendDhtMessage(const QString& contactUri,
const QString& body,
- const QString& mimeType) const
+ const QString& mimeType,
+ int flag) const
{
// Send interaction
QMap<QString, QString> payloads;
@@ -501,7 +502,8 @@ ContactModel::sendDhtMessage(const QString& contactUri,
payloads[mimeType] = body;
auto msgId = ConfigurationManager::instance().sendTextMessage(QString(owner.id),
QString(contactUri),
- payloads);
+ payloads,
+ flag);
// NOTE: ConversationModel should store the interaction into the database
return msgId;
}
diff --git a/src/libclient/conversationmodel.cpp b/src/libclient/conversationmodel.cpp
index c7ce04dcc..1716d401f 100644
--- a/src/libclient/conversationmodel.cpp
+++ b/src/libclient/conversationmodel.cpp
@@ -4003,7 +4003,7 @@ ConversationModel::getConvMediasInfos(const QString& accountId, const QString& c
{
pimpl_->currentMsgRequestId = ConfigurationManager::instance().searchConversation(
accountId, conversationId, "", "", "", "application/data-transfer+json", 0, 0, 0, 0);
-};
+}
void
ConversationModel::acceptTransfer(const QString& convUid, const QString& interactionId)
diff --git a/src/libclient/qtwrapper/configurationmanager_wrap.h b/src/libclient/qtwrapper/configurationmanager_wrap.h
index bbc21d3ae..2eb19ef9c 100644
--- a/src/libclient/qtwrapper/configurationmanager_wrap.h
+++ b/src/libclient/qtwrapper/configurationmanager_wrap.h
@@ -793,11 +793,13 @@ public Q_SLOTS: // METHODS
uint64_t sendTextMessage(const QString& accountId,
const QString& to,
- const QMap<QString, QString>& payloads)
+ const QMap<QString, QString>& payloads,
+ int flag)
{
return libjami::sendAccountTextMessage(accountId.toStdString(),
to.toStdString(),
- convertMap(payloads));
+ convertMap(payloads),
+ flag);
}
QVector<Message> getLastMessages(const QString& accountID, const uint64_t& base_timestamp)
--
GitLab