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

Fixed crash when pairing old Android apps.

Browse source
This commit is contained in:
Albert Vaca 2016-03-02 16:38:03 -08:00
parent ebd429629a
commit 8f9fde8f40
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
core/backends/lan/landevicelink.cpp
View file

@ -140,6 +140,11 @@ void LanDeviceLink::userRequestsUnpair()
void LanDeviceLink::setPairStatus(PairStatus status)
{
if (status == Paired && mSocketLineReader->peerCertificate().isNull()) {
Q_EMIT pairingError(i18n("This device can't be paired because is running an old version of KDE Connect."));
return;
}
DeviceLink::setPairStatus(status);
if (status == Paired) {
Q_ASSERT(KdeConnectConfig::instance()->trustedDevices().contains(deviceId()));

2
core/backends/lan/lanlinkprovider.cpp
View file

@ -235,7 +235,7 @@ void LanLinkProvider::connected()
return; // Return statement prevents from deleting received package, needed in slot "encrypted"
} else {
qWarning() << "Incompatible protocol version, this won't work";
addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
//addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
}
} else {