tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add a package type that updates the device capabilities

Browse source 
Every time we reload the plugin list, report the plugins that we support.
If the remote devices' capabilities change, update the plugin list.

Reviewed by Albert Vaca
This commit is contained in:
Aleix Pol 2015-09-07 20:03:05 +02:00
parent f65a1f206f
commit 4960247fb5
3 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/device.cpp
View file

@ -181,6 +181,10 @@ void Device::reloadPlugins()
Q_EMIT pluginsChanged(); Q_EMIT pluginsChanged();
NetworkPackage np(PACKAGE_TYPE_CAPABILITIES);
np.set<QStringList>("SupportedIncomingInterfaces", m_pluginsByIncomingInterface.keys());
np.set<QStringList>("SupportedOutgoingInterfaces", m_pluginsByOutgoingInterface.keys());
sendPackage(np);
} }
QString Device::pluginsConfigFile() const QString Device::pluginsConfigFile() const
@ -395,6 +399,15 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
} }
} else if (np.type() == PACKAGE_TYPE_CAPABILITIES) {
QSet<QString> newIncomingCapabilities = np.get<QStringList>("SupportedIncomingInterfaces", QStringList()).toSet();
QSet<QString> newOutgoingCapabilities = np.get<QStringList>("SupportedOutgoingInterfaces", QStringList()).toSet();
if (newOutgoingCapabilities != m_outgoingCapabilities || newIncomingCapabilities != m_incomingCapabilities) {
m_incomingCapabilities = newIncomingCapabilities;
m_outgoingCapabilities = newOutgoingCapabilities;
reloadPlugins();
}
} else if (isPaired()) { } else if (isPaired()) {
QList<KdeConnectPlugin*> plugins = m_pluginsByIncomingInterface.values(np.type()); QList<KdeConnectPlugin*> plugins = m_pluginsByIncomingInterface.values(np.type());
foreach(KdeConnectPlugin* plugin, plugins) { foreach(KdeConnectPlugin* plugin, plugins) {

4
core/device.h
View file

@ -154,8 +154,8 @@ private: //Fields (TODO: dPointer!)
QMultiMap<QString, KdeConnectPlugin*> m_pluginsByOutgoingInterface; QMultiMap<QString, KdeConnectPlugin*> m_pluginsByOutgoingInterface;
QTimer m_pairingTimeut; QTimer m_pairingTimeut;
const QSet<QString> m_incomingCapabilities; QSet<QString> m_incomingCapabilities;
const QSet<QString> m_outgoingCapabilities; QSet<QString> m_outgoingCapabilities;
QStringList m_missingPlugins; QStringList m_missingPlugins;
}; };

1
core/networkpackagetypes.h
View file

@ -23,6 +23,7 @@
#define PACKAGE_TYPE_IDENTITY QLatin1String("kdeconnect.identity") #define PACKAGE_TYPE_IDENTITY QLatin1String("kdeconnect.identity")
#define PACKAGE_TYPE_PAIR QLatin1String("kdeconnect.pair") #define PACKAGE_TYPE_PAIR QLatin1String("kdeconnect.pair")
#define PACKAGE_TYPE_CAPABILITIES QLatin1String("kdeconnect.capabilities")
#define PACKAGE_TYPE_ENCRYPTED QLatin1String("kdeconnect.encrypted") #define PACKAGE_TYPE_ENCRYPTED QLatin1String("kdeconnect.encrypted")
#endif // NETWORKPACKAGETYPES_H #endif // NETWORKPACKAGETYPES_H