64062b3cc9
Summary: Drop support for creating notifications from the SMS plugin. The old usecase is better handled by the notifications plugin reply box anyway Rename packets defined in SMS plugin from PACKET_TYPE_TELEPHONY_* to PACKET_TYPE_SMS_* Update TELEPHONY plugin packet description to point to SMS plugin Define TELEPHONY_REQUEST_MUTE packet to replace old TELEPHONY_REQUEST with mute event field Please see Android-side patch here: D15544 Test Plan: I see four test cases, based on the version of the app being used, where "old" means any version built with sources not containing this revision and "new" means any version built with sources using this revision: - New Android vs. New Desktop - Supported and works for me - New Android vs. Old Desktop - Supported and works for me - Old Android vs. New Desktop - Not supported - Download a new app from the Play store or F-Droid - Old Android vs. Old Desktop - If this is broken, it is not my fault :) In the supported use cases: - Test SMS reply - Receive SMS (or MMS!) message - Verify that the //notification// plugin forwards a replyable notification and that replying works - Test incoming call ringer mute - Enable ringer volume (not vibrate) - Receive phone call - Verify a desktop notification with a Mute button appears - Verify that clicking the mute button causes the phone to stop making the ringer noise (vibration not affected) Reviewers: #kde_connect, albertvaka, nicolasfella Reviewed By: #kde_connect, albertvaka, nicolasfella Subscribers: nicolasfella, kdeconnect Tags: #kde_connect Differential Revision: https://phabricator.kde.org/D15543
119 lines
3.6 KiB
C++
119 lines
3.6 KiB
C++
/**
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.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 <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)
|
|
{
|
|
if (np.type() == PACKET_TYPE_SMS_MESSAGES) {
|
|
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}
|
|
});
|
|
qDebug(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 QString& conversationID) const
|
|
{
|
|
NetworkPacket np(PACKET_TYPE_SMS_REQUEST_CONVERSATION);
|
|
np.set("threadID", conversationID.toInt());
|
|
|
|
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");
|
|
|
|
for (const QVariant& body : messages)
|
|
{
|
|
ConversationMessage message(body.toMap());
|
|
forwardToTelepathy(message);
|
|
m_conversationInterface->addMessage(message);
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
QString SmsPlugin::dbusPath() const
|
|
{
|
|
return "/modules/kdeconnect/devices/" + device()->id() + "/sms";
|
|
}
|
|
|
|
#include "smsplugin.moc"
|
|
|