2018-09-10 10:28:54 +01:00
|
|
|
/**
|
2020-08-17 10:48:10 +01:00
|
|
|
* SPDX-FileCopyrightText: 2013 Albert Vaca <albertvaka@gmail.com>
|
|
|
|
* SPDX-FileCopyrightText: 2018 Simon Redman <simon@ergotech.com>
|
2018-09-10 10:28:54 +01:00
|
|
|
*
|
2020-08-17 10:48:10 +01:00
|
|
|
* SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
|
2018-09-10 10:28:54 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include "smsplugin.h"
|
|
|
|
|
|
|
|
#include <KLocalizedString>
|
|
|
|
#include <KPluginFactory>
|
|
|
|
|
|
|
|
#include <QDebug>
|
|
|
|
#include <QDBusConnection>
|
2019-07-20 15:02:38 +01:00
|
|
|
#include <QProcess>
|
2018-09-10 10:28:54 +01:00
|
|
|
|
|
|
|
#include <core/device.h>
|
|
|
|
#include <core/daemon.h>
|
|
|
|
|
2020-05-26 17:55:47 +01:00
|
|
|
#include "plugin_sms_debug.h"
|
2018-09-10 10:28:54 +01:00
|
|
|
|
2019-06-12 21:16:54 +01:00
|
|
|
K_PLUGIN_CLASS_WITH_JSON(SmsPlugin, "kdeconnect_sms.json")
|
2018-09-10 10:28:54 +01:00
|
|
|
|
|
|
|
SmsPlugin::SmsPlugin(QObject* parent, const QVariantList& args)
|
|
|
|
: KdeConnectPlugin(parent, args)
|
|
|
|
, m_telepathyInterface(QStringLiteral("org.freedesktop.Telepathy.ConnectionManager.kdeconnect"), QStringLiteral("/kdeconnect"))
|
|
|
|
, m_conversationInterface(new ConversationsDbusInterface(this))
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
SmsPlugin::~SmsPlugin()
|
|
|
|
{
|
2019-03-22 00:55:44 +00:00
|
|
|
// m_conversationInterface is self-deleting, see ~ConversationsDbusInterface for more information
|
2018-09-10 10:28:54 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
bool SmsPlugin::receivePacket(const NetworkPacket& np)
|
|
|
|
{
|
2018-09-16 23:03:31 +01:00
|
|
|
if (np.type() == PACKET_TYPE_SMS_MESSAGES) {
|
2018-09-10 10:28:54 +01:00
|
|
|
return handleBatchMessages(np);
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-07-29 16:18:19 +01:00
|
|
|
void SmsPlugin::sendSms(const QVariantList& addresses, const QString& messageBody, const qint64 subID)
|
2018-09-10 10:28:54 +01:00
|
|
|
{
|
2020-07-08 09:16:56 +01:00
|
|
|
QVariantList addressMapList;
|
2020-07-29 16:18:19 +01:00
|
|
|
for (const QVariant& address : addresses) {
|
|
|
|
QVariantMap addressMap({{QStringLiteral("address"), qdbus_cast<ConversationAddress>(address).address()}});
|
2020-07-08 09:16:56 +01:00
|
|
|
addressMapList.append(addressMap);
|
|
|
|
}
|
|
|
|
|
2020-03-20 02:16:55 +00:00
|
|
|
QVariantMap packetMap({
|
2019-06-10 15:40:28 +01:00
|
|
|
{QStringLiteral("sendSms"), true},
|
2020-07-08 09:16:56 +01:00
|
|
|
{QStringLiteral("addresses"), addressMapList},
|
2019-06-10 15:40:28 +01:00
|
|
|
{QStringLiteral("messageBody"), messageBody}
|
2018-09-10 10:28:54 +01:00
|
|
|
});
|
2020-03-20 02:16:55 +00:00
|
|
|
if (subID != -1) {
|
|
|
|
packetMap[QStringLiteral("subID")] = subID;
|
|
|
|
}
|
|
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST, packetMap);
|
2018-11-01 15:36:32 +00:00
|
|
|
qCDebug(KDECONNECT_PLUGIN_SMS) << "Dispatching SMS send request to remote";
|
2018-09-10 10:28:54 +01:00
|
|
|
sendPacket(np);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SmsPlugin::requestAllConversations()
|
|
|
|
{
|
2018-09-16 23:03:31 +01:00
|
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST_CONVERSATIONS);
|
2018-09-10 10:28:54 +01:00
|
|
|
|
|
|
|
sendPacket(np);
|
|
|
|
}
|
|
|
|
|
[SMS App] Make requestMoreMessages asynchronous, blocking, and caching
Summary:
The most serious change from this patch is to move the asynchronous replying to a request from the app for more messages to a newly-spawned, self-destructing thread. Within that thread, we block until the remote device replies with the requested messages.
All gotten messages are cached in the ConversationDbusInterface, so all future requests are fast and don't hit the remote device.
Test Plan: After applying this diff, the messaging app should show 10 messages every time it is opened
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, nicolasfella, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D16475
2018-12-13 05:42:45 +00:00
|
|
|
void SmsPlugin::requestConversation (const qint64& conversationID) const
|
2018-09-10 10:28:54 +01:00
|
|
|
{
|
2018-09-16 23:03:31 +01:00
|
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST_CONVERSATION);
|
2019-06-10 15:40:28 +01:00
|
|
|
np.set(QStringLiteral("threadID"), conversationID);
|
2018-09-10 10:28:54 +01:00
|
|
|
|
|
|
|
sendPacket(np);
|
|
|
|
}
|
|
|
|
|
|
|
|
void SmsPlugin::forwardToTelepathy(const ConversationMessage& message)
|
|
|
|
{
|
|
|
|
// If we don't have a valid Telepathy interface, bail out
|
|
|
|
if (!(m_telepathyInterface.isValid())) return;
|
|
|
|
|
|
|
|
qCDebug(KDECONNECT_PLUGIN_SMS) << "Passing a text message to the telepathy interface";
|
|
|
|
connect(&m_telepathyInterface, SIGNAL(messageReceived(QString,QString)), SLOT(sendSms(QString,QString)), Qt::UniqueConnection);
|
|
|
|
const QString messageBody = message.body();
|
|
|
|
const QString contactName; // TODO: When telepathy support is improved, look up the contact with KPeople
|
2019-07-19 18:33:15 +01:00
|
|
|
const QString phoneNumber = message.addresses()[0].address();
|
2018-09-10 10:28:54 +01:00
|
|
|
m_telepathyInterface.call(QDBus::NoBlock, QStringLiteral("sendMessage"), phoneNumber, contactName, messageBody);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SmsPlugin::handleBatchMessages(const NetworkPacket& np)
|
|
|
|
{
|
2019-06-10 15:40:28 +01:00
|
|
|
const auto messages = np.get<QVariantList>(QStringLiteral("messages"));
|
[SMS App] Make requestMoreMessages asynchronous, blocking, and caching
Summary:
The most serious change from this patch is to move the asynchronous replying to a request from the app for more messages to a newly-spawned, self-destructing thread. Within that thread, we block until the remote device replies with the requested messages.
All gotten messages are cached in the ConversationDbusInterface, so all future requests are fast and don't hit the remote device.
Test Plan: After applying this diff, the messaging app should show 10 messages every time it is opened
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, nicolasfella, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D16475
2018-12-13 05:42:45 +00:00
|
|
|
QList<ConversationMessage> messagesList;
|
|
|
|
messagesList.reserve(messages.count());
|
2018-09-10 10:28:54 +01:00
|
|
|
|
2018-10-06 01:01:30 +01:00
|
|
|
for (const QVariant& body : messages) {
|
2018-09-10 10:28:54 +01:00
|
|
|
ConversationMessage message(body.toMap());
|
2018-11-15 23:57:58 +00:00
|
|
|
if (message.containsTextBody()) {
|
|
|
|
forwardToTelepathy(message);
|
|
|
|
}
|
2019-07-19 16:29:28 +01:00
|
|
|
messagesList.append(message);
|
2018-09-10 10:28:54 +01:00
|
|
|
}
|
|
|
|
|
[SMS App] Make requestMoreMessages asynchronous, blocking, and caching
Summary:
The most serious change from this patch is to move the asynchronous replying to a request from the app for more messages to a newly-spawned, self-destructing thread. Within that thread, we block until the remote device replies with the requested messages.
All gotten messages are cached in the ConversationDbusInterface, so all future requests are fast and don't hit the remote device.
Test Plan: After applying this diff, the messaging app should show 10 messages every time it is opened
Reviewers: #kde_connect, nicolasfella, albertvaka
Reviewed By: #kde_connect, albertvaka
Subscribers: albertvaka, apol, nicolasfella, kdeconnect
Tags: #kde_connect
Differential Revision: https://phabricator.kde.org/D16475
2018-12-13 05:42:45 +00:00
|
|
|
m_conversationInterface->addMessages(messagesList);
|
|
|
|
|
2018-09-10 10:28:54 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
QString SmsPlugin::dbusPath() const
|
|
|
|
{
|
2019-06-10 15:40:28 +01:00
|
|
|
return QStringLiteral("/modules/kdeconnect/devices/") + device()->id() + QStringLiteral("/sms");
|
2018-09-10 10:28:54 +01:00
|
|
|
}
|
|
|
|
|
2019-07-20 15:02:38 +01:00
|
|
|
void SmsPlugin::launchApp()
|
|
|
|
{
|
|
|
|
QProcess::startDetached(QLatin1String("kdeconnect-sms"), { QStringLiteral("--device"), device()->id() });
|
|
|
|
}
|
|
|
|
|
2018-09-10 10:28:54 +01:00
|
|
|
#include "smsplugin.moc"
|
|
|
|
|