674e826bb6
Something in the demarshalling of the address list is broken and I can't figure out why. Instead expose a much simpler method that only takes one address string. This removes the ability to send to multiple destinations from one command, but that's better than not working at all. This patch is for 20.08 only as the marshalling works differently in master anyway.
155 lines
5 KiB
C++
155 lines
5 KiB
C++
/**
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
|
|
* Copyright 2018 Simon Redman <simon@ergotech.com>
|
|
*
|
|
* 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 <https://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "smsplugin.h"
|
|
|
|
#include <KLocalizedString>
|
|
#include <KPluginFactory>
|
|
|
|
#include <QDebug>
|
|
#include <QDBusConnection>
|
|
#include <QProcess>
|
|
|
|
#include <core/device.h>
|
|
#include <core/daemon.h>
|
|
|
|
#include "sendreplydialog.h"
|
|
#include "plugin_sms_debug.h"
|
|
|
|
K_PLUGIN_CLASS_WITH_JSON(SmsPlugin, "kdeconnect_sms.json")
|
|
|
|
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()
|
|
{
|
|
// m_conversationInterface is self-deleting, see ~ConversationsDbusInterface for more information
|
|
}
|
|
|
|
bool SmsPlugin::receivePacket(const NetworkPacket& np)
|
|
{
|
|
if (np.type() == PACKET_TYPE_SMS_MESSAGES) {
|
|
return handleBatchMessages(np);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
void SmsPlugin::sendSms(const QDBusVariant& addresses, const QString& messageBody, const qint64 subID)
|
|
{
|
|
QList<ConversationAddress> addressList = ConversationAddress::listfromDBus(addresses);
|
|
|
|
QVariantList addressMapList;
|
|
for (const ConversationAddress address : addressList) {
|
|
QVariantMap addressMap({{QStringLiteral("address"), address.address()}});
|
|
addressMapList.append(addressMap);
|
|
qDebug() <<address.address();
|
|
}
|
|
|
|
QVariantMap packetMap({
|
|
{QStringLiteral("sendSms"), true},
|
|
{QStringLiteral("addresses"), addressMapList},
|
|
{QStringLiteral("messageBody"), messageBody}
|
|
});
|
|
if (subID != -1) {
|
|
packetMap[QStringLiteral("subID")] = subID;
|
|
}
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST, packetMap);
|
|
qCDebug(KDECONNECT_PLUGIN_SMS) << "Dispatching SMS send request to remote";
|
|
sendPacket(np);
|
|
}
|
|
|
|
void SmsPlugin::sendSms(const QString& address, const QString& messageBody)
|
|
{
|
|
QVariantMap packetMap({
|
|
{QStringLiteral("sendSms"), true},
|
|
{QStringLiteral("phoneNumber"), address},
|
|
{QStringLiteral("messageBody"), messageBody}
|
|
});
|
|
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST, packetMap);
|
|
qCDebug(KDECONNECT_PLUGIN_SMS) << "Dispatching SMS send request to remote";
|
|
sendPacket(np);
|
|
}
|
|
|
|
void SmsPlugin::requestAllConversations()
|
|
{
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST_CONVERSATIONS);
|
|
|
|
sendPacket(np);
|
|
}
|
|
|
|
void SmsPlugin::requestConversation (const qint64& conversationID) const
|
|
{
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST_CONVERSATION);
|
|
np.set(QStringLiteral("threadID"), conversationID);
|
|
|
|
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.addresses()[0].address();
|
|
m_telepathyInterface.call(QDBus::NoBlock, QStringLiteral("sendMessage"), phoneNumber, contactName, messageBody);
|
|
}
|
|
|
|
bool SmsPlugin::handleBatchMessages(const NetworkPacket& np)
|
|
{
|
|
const auto messages = np.get<QVariantList>(QStringLiteral("messages"));
|
|
QList<ConversationMessage> messagesList;
|
|
messagesList.reserve(messages.count());
|
|
|
|
for (const QVariant& body : messages) {
|
|
ConversationMessage message(body.toMap());
|
|
if (message.containsTextBody()) {
|
|
forwardToTelepathy(message);
|
|
}
|
|
messagesList.append(message);
|
|
}
|
|
|
|
m_conversationInterface->addMessages(messagesList);
|
|
|
|
return true;
|
|
}
|
|
|
|
QString SmsPlugin::dbusPath() const
|
|
{
|
|
return QStringLiteral("/modules/kdeconnect/devices/") + device()->id() + QStringLiteral("/sms");
|
|
}
|
|
|
|
void SmsPlugin::launchApp()
|
|
{
|
|
QProcess::startDetached(QLatin1String("kdeconnect-sms"), { QStringLiteral("--device"), device()->id() });
|
|
}
|
|
|
|
#include "smsplugin.moc"
|
|
|