Differential D7960 Diff 21945 plugins/runcommand/runcommandplugin.cpp

Changeset View

Standalone View

View Options

plugins/runcommand/runcommandplugin.cpp

Context not available.
29#include <QSettings> 29​#include <QSettings>
30#include <QJsonDocument> 30​#include <QJsonDocument>
31#include <KShell> 31​#include <KShell>
32​#include <QUuid>
33​#include <KNotification>
34​#include <KLocalizedString>
32 35​
33#include <core/networkpackage.h> 36​#include <core/networkpackage.h>
34#include <core/device.h> 37​#include <core/device.h>
35 38​
36#define PACKAGE_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand") 39​#define PACKAGE_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand")
40​#define PACKAGE_TYPE_RUNCOMMAND_ADD QStringLiteral("kdeconnect.runcommand.add")
37 41​
38K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_runcommand.json", registerPlugin< RunCommandPlugin >(); ) 42​K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_runcommand.json", registerPlugin< RunCommandPlugin >(); )
39 43​
Context not available.
51 55​
52bool RunCommandPlugin::receivePackage(const NetworkPackage& np) 56​bool RunCommandPlugin::receivePackage(const NetworkPackage& np)
53{ 57​{
58​ if(np.type() == PACKAGE_TYPE_RUNCOMMAND_ADD) {
59​ QString name = np.get<QString>("name");
60​ QString command = np.get<QString>("command");
61​
62​ showConfirmDialog(name, command);
63​ }
thomaspUnsubmitted
Done

is a

return true;

missing here?

thomasp: is a ``` return true; ``` missing here?
64​
54 if (np.get<bool>(QStringLiteral("requestCommandList"), false)) { 65​ if (np.get<bool>(QStringLiteral("requestCommandList"), false)) {
55 sendConfig(); 66​ sendConfig();
56 return true; 67​ return true;
Context not available.
75 86​
76void RunCommandPlugin::connected() 87​void RunCommandPlugin::connected()
77{ 88​{
78 ​
79 sendConfig(); 89​ sendConfig();
80} 90​}
81 91​
Context not available.
83{ 93​{
84 QString commands = config()->get<QString>(QStringLiteral("commands"),QStringLiteral("{}")); 94​ QString commands = config()->get<QString>(QStringLiteral("commands"),QStringLiteral("{}"));
85 NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND, {{"commandList", commands}}); 95​ NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND, {{"commandList", commands}});
96​ np.set<bool>(QStringLiteral("canAddCommand"), true);
86 sendPackage(np); 97​ sendPackage(np);
87} 98​}
88 99​
Context not available.
90 sendConfig(); 101​ sendConfig();
91} 102​}
92 103​
104​void RunCommandPlugin::addCommand(const QString& name, const QString& command)
105​{
106​ QJsonDocument jsonDocument = QJsonDocument::fromJson(config()->get<QByteArray>(QStringLiteral("commands"), "{}"));
107​ QJsonObject jsonConfig = jsonDocument.object();
108​
109​ QString key = QUuid::createUuid().toString();
110​ QJsonObject entry;
111​ entry[QStringLiteral("name")] = name;
112​ entry[QStringLiteral("command")] = command;
113​ jsonConfig[key] = entry;
114​
115​ QJsonDocument document;
116​ document.setObject(jsonConfig);
117​ config()->set(QStringLiteral("commands"), document.toJson(QJsonDocument::Compact));
118​}
119​
120​void RunCommandPlugin::showConfirmDialog(const QString& name, const QString& command)
121​{
122​ KNotification* notification = new KNotification("confirmAddCommand", KNotification::Persistent);
123​ notification->setIconName(QStringLiteral("dialog-information"));
124​ notification->setComponentName("kdeconnect");
125​ notification->setText(i18n("%1 wants to add a command:\n%2", device()->name(), command));
126​ notification->setActions(QStringList() << i18n("Accept") << i18n("Reject"));
127​ connect(notification, &KNotification::action1Activated, this, [this, name, command]{
128​ addCommand(name, command);
129​ sendConfig();
thomaspUnsubmitted
Done

config()->set(...) in addCommand already calls sendConfig() through the configChanged signal

thomasp: `config()->set(...)` in `addCommand` already calls `sendConfig()` through the `configChanged`…
130​ });
131​ notification->sendEvent();
132​}
133​
93#include "runcommandplugin.moc" 134​#include "runcommandplugin.moc"
Context not available.