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

Revert "Simplify contains + get value"

Browse source 
Broke the tests 🤷

This reverts commit f7e86ed131.
This commit is contained in:
Albert Vaca Cintora 2019-07-05 00:58:33 +02:00
parent f7e86ed131
commit b8e50e976f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/daemon.cpp
View file

@ -212,9 +212,9 @@ void Daemon::onNewDeviceLink(const NetworkPacket& identityPacket, DeviceLink* dl
//qCDebug(KDECONNECT_CORE) << "Device discovered" << id << "via" << dl->provider()->name();
Device* device = d->m_devices.value(id, nullptr);
if (device) {
if (d->m_devices.contains(id)) {
qCDebug(KDECONNECT_CORE) << "It is a known device" << identityPacket.get<QString>(QStringLiteral("deviceName"));
Device* device = d->m_devices[id];
bool wasReachable = device->isReachable();
device->addLink(identityPacket, dl);
if (!wasReachable) {
@ -223,7 +223,7 @@ void Daemon::onNewDeviceLink(const NetworkPacket& identityPacket, DeviceLink* dl
}
} else {
qCDebug(KDECONNECT_CORE) << "It is a new device" << identityPacket.get<QString>(QStringLiteral("deviceName"));
device = new Device(this, identityPacket, dl);
Device* device = new Device(this, identityPacket, dl);
//we discard the connections that we created but it's not paired.
if (!isDiscoveringDevices() && !device->isTrusted() && !dl->linkShouldBeKeptAlive()) {