2018-09-10 10:28:54 +01:00
|
|
|
/**
|
|
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
|
2018-10-06 01:01:30 +01:00
|
|
|
* Copyright 2018 Simon Redman <simon@ergotech.com>
|
2018-09-10 10:28:54 +01:00
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of
|
|
|
|
* the License or (at your option) version 3 or any later version
|
|
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
|
|
* defined in Section 14 of version 3 of the license.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "smsplugin.h"
|
|
|
|
|
|
|
|
#include <KLocalizedString>
|
|
|
|
#include <KPluginFactory>
|
|
|
|
|
|
|
|
#include <QDebug>
|
|
|
|
#include <QDBusConnection>
|
|
|
|
#include <QLoggingCategory>
|
|
|
|
|
|
|
|
#include <core/device.h>
|
|
|
|
#include <core/daemon.h>
|
|
|
|
|
|
|
|
#include "sendreplydialog.h"
|
|
|
|
|
|
|
|
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_sms.json", registerPlugin< SmsPlugin >(); )
|
|
|
|
|
|
|
|
Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_SMS, "kdeconnect.plugin.sms")
|
|
|
|
|
|
|
|
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()
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
|
|
|
void SmsPlugin::sendSms(const QString& phoneNumber, const QString& messageBody)
|
|
|
|
{
|
|
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST, {
|
|
|
|
{"sendSms", true},
|
|
|
|
{"phoneNumber", phoneNumber},
|
|
|
|
{"messageBody", messageBody}
|
|
|
|
});
|
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);
|
[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
|
|
|
np.set("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
|
|
|
|
const QString phoneNumber = message.address();
|
|
|
|
m_telepathyInterface.call(QDBus::NoBlock, QStringLiteral("sendMessage"), phoneNumber, contactName, messageBody);
|
|
|
|
}
|
|
|
|
|
|
|
|
bool SmsPlugin::handleBatchMessages(const NetworkPacket& np)
|
|
|
|
{
|
|
|
|
const auto messages = np.get<QVariantList>("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);
|
[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
|
|
|
messagesList.append(message);
|
2018-11-15 23:57:58 +00:00
|
|
|
}
|
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
|
|
|
|
{
|
|
|
|
return "/modules/kdeconnect/devices/" + device()->id() + "/sms";
|
|
|
|
}
|
|
|
|
|
|
|
|
#include "smsplugin.moc"
|
|
|
|
|