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

Changed the way we detect if capabilities are supported

Browse source
This commit is contained in:
Albert Vaca 2016-05-31 20:10:35 +02:00
parent 59f69856d6
commit 4383a42703
2 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
core/device.cpp
View file

@ -111,7 +111,7 @@ void Device::reloadPlugins()
KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins"); KConfigGroup pluginStates = KSharedConfig::openConfig(pluginsConfigFile())->group("Plugins");
PluginLoader* loader = PluginLoader::instance(); PluginLoader* loader = PluginLoader::instance();
const bool deviceSupportsCapabilities = !m_incomingCapabilities.isEmpty() || !m_outgoingCapabilities.isEmpty(); const bool capabilitiesSupported = (m_protocolVersion >= 6);
foreach (const QString& pluginName, loader->getPluginList()) { foreach (const QString& pluginName, loader->getPluginList()) {
const KPluginMetaData service = loader->getPluginInfo(pluginName); const KPluginMetaData service = loader->getPluginInfo(pluginName);
@ -127,9 +127,6 @@ void Device::reloadPlugins()
//If we don't find intersection with the received on one end and the sent on the other, we don't //If we don't find intersection with the received on one end and the sent on the other, we don't
//let the plugin stay //let the plugin stay
//Also, if no capabilities are specified on the other end, we don't apply this optimizaton, as
//we assume that the other client doesn't know about capabilities.
const bool capabilitiesSupported = deviceSupportsCapabilities && (!incomingInterfaces.isEmpty() || !outgoingInterfaces.isEmpty());
if (capabilitiesSupported if (capabilitiesSupported
&& (m_incomingCapabilities & outgoingInterfaces).isEmpty() && (m_incomingCapabilities & outgoingInterfaces).isEmpty()
&& (m_outgoingCapabilities & incomingInterfaces).isEmpty() && (m_outgoingCapabilities & incomingInterfaces).isEmpty()
@ -272,8 +269,6 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
qSort(m_deviceLinks.begin(), m_deviceLinks.end(), lessThan); qSort(m_deviceLinks.begin(), m_deviceLinks.end(), lessThan);
if (m_deviceLinks.size() == 1) { if (m_deviceLinks.size() == 1) {
m_incomingCapabilities = identityPackage.get<QStringList>("IncomingCapabilities", QStringList()).toSet();
m_outgoingCapabilities = identityPackage.get<QStringList>("OutgoingCapabilities", QStringList()).toSet();
reloadPlugins(); //Will load the plugins reloadPlugins(); //Will load the plugins
Q_EMIT reachableStatusChanged(); Q_EMIT reachableStatusChanged();
} else { } else {

2
core/networkpackage.cpp
View file

@ -59,8 +59,6 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np)
np->set("deviceName", config->name()); np->set("deviceName", config->name());
np->set("deviceType", config->deviceType()); np->set("deviceType", config->deviceType());
np->set("protocolVersion", NetworkPackage::ProtocolVersion); np->set("protocolVersion", NetworkPackage::ProtocolVersion);
np->set("IncomingCapabilities", PluginLoader::instance()->incomingInterfaces());
np->set("OutgoingCapabilities", PluginLoader::instance()->outgoingInterfaces());
//qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize(); //qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
} }