lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-22 06:02:03 +02:00
Code Activity

fix: add default flag to sendAccountTextMessage

Browse source 
Change-Id: I08ef8b2f383c3aa1035518a2d4f92e941048e211
This commit is contained in:
Aline Gondim Santos 2023-02-16 09:28:12 -03:00
parent dfd1f6c78c
commit 8147baef2b
6 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon

@ -1 +1 @@
Subproject commit 62e735d73c807cac424f59c63de454969dd2d808 Subproject commit 47f3fd14ab0532ff94fd5317f885689928d9293b

5
src/app/positionmanager.cpp
View file

@ -154,7 +154,7 @@ PositionManager::sendPosition(const QString& body, bool triggersLocalPosition)
Q_FOREACH (const QString& uri, convInfo.participantsUris()) { Q_FOREACH (const QString& uri, convInfo.participantsUris()) {
if (uri != accountUri) { if (uri != accountUri) {
lrcInstance_->getAccountInfo(key.first) 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) { if (lrcInstance_->getCurrentAccountInfo().profileInfo.uri != uri) {
lrcInstance_->getCurrentAccountInfo().contactModel->sendDhtMessage(uri, lrcInstance_->getCurrentAccountInfo().contactModel->sendDhtMessage(uri,
stopMsg, stopMsg,
APPLICATION_GEO); APPLICATION_GEO,
1);
} }
} }
} }

3
src/libclient/api/contactmodel.h
View file

@ -110,7 +110,8 @@ public:
*/ */
uint64_t sendDhtMessage(const QString& uri, uint64_t sendDhtMessage(const QString& uri,
const QString& body, const QString& body,
const QString& mimeType = {}) const; const QString& mimeType = {},
int flag = 0) const;
/** /**
* Get best id for contact * Get best id for contact
* @param contactUri * @param contactUri

6
src/libclient/contactmodel.cpp
View file

@ -491,7 +491,8 @@ ContactModelPimpl::searchSipContact(const URI& query)
uint64_t uint64_t
ContactModel::sendDhtMessage(const QString& contactUri, ContactModel::sendDhtMessage(const QString& contactUri,
const QString& body, const QString& body,
const QString& mimeType) const const QString& mimeType,
int flag) const
{ {
// Send interaction // Send interaction
QMap<QString, QString> payloads; QMap<QString, QString> payloads;
@ -501,7 +502,8 @@ ContactModel::sendDhtMessage(const QString& contactUri,
payloads[mimeType] = body; payloads[mimeType] = body;
auto msgId = ConfigurationManager::instance().sendTextMessage(QString(owner.id), auto msgId = ConfigurationManager::instance().sendTextMessage(QString(owner.id),
QString(contactUri), QString(contactUri),
payloads); payloads,
flag);
// NOTE: ConversationModel should store the interaction into the database // NOTE: ConversationModel should store the interaction into the database
return msgId; return msgId;
} }

2
src/libclient/conversationmodel.cpp
View file

@ -4003,7 +4003,7 @@ ConversationModel::getConvMediasInfos(const QString& accountId, const QString& c
{ {
pimpl_->currentMsgRequestId = ConfigurationManager::instance().searchConversation( pimpl_->currentMsgRequestId = ConfigurationManager::instance().searchConversation(
accountId, conversationId, "", "", "", "application/data-transfer+json", 0, 0, 0, 0); accountId, conversationId, "", "", "", "application/data-transfer+json", 0, 0, 0, 0);
}; }
void void
ConversationModel::acceptTransfer(const QString& convUid, const QString& interactionId) ConversationModel::acceptTransfer(const QString& convUid, const QString& interactionId)

6
src/libclient/qtwrapper/configurationmanager_wrap.h
View file

@ -793,11 +793,13 @@ public Q_SLOTS: // METHODS
uint64_t sendTextMessage(const QString& accountId, uint64_t sendTextMessage(const QString& accountId,
const QString& to, const QString& to,
const QMap<QString, QString>& payloads) const QMap<QString, QString>& payloads,
int flag)
{ {
return libjami::sendAccountTextMessage(accountId.toStdString(), return libjami::sendAccountTextMessage(accountId.toStdString(),
to.toStdString(), to.toStdString(),
convertMap(payloads)); convertMap(payloads),
flag);
} }
QVector<Message> getLastMessages(const QString& accountID, const uint64_t& base_timestamp) QVector<Message> getLastMessages(const QString& accountID, const uint64_t& base_timestamp)