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

Use the pairing handler instead of accessing the device directly on error

Browse source
This commit is contained in:
Albert Vaca 2016-07-12 12:34:56 +02:00
parent 0b3de33d74
commit 7da30ddbb1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -287,6 +287,8 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
disconnect(socket, SIGNAL(encrypted()), this, SLOT(encrypted()));
disconnect(socket, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(sslErrors(QList<QSslError>)));
QString deviceId = socket->peerVerifyName();
Q_FOREACH (const QSslError &error, errors) {
switch (error.error()) {
case QSslError::CertificateSignatureFailed:
@ -295,11 +297,8 @@ void LanLinkProvider::sslErrors(const QList<QSslError>& errors)
case QSslError::CertificateUntrusted:
case QSslError::SelfSignedCertificate: {
qCDebug(KDECONNECT_CORE) << "Failing due to " << error.errorString();
// Due to simultaneous multiple connections, it may be possible that device instance does not exist anymore
Device *device = Daemon::instance()->getDevice(socket->peerVerifyName());
if (device != Q_NULLPTR) {
device->unpair();
}
LanPairingHandler* ph = createPairingHandler(mLinks.value(deviceId));
ph->unpair();
break;
}
default:
@ -395,7 +394,6 @@ void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink)
mLinks.erase(linkIterator);
mPairingHandlers.remove(id);
}
}
void LanLinkProvider::configureSslSocket(QSslSocket* socket, const QString& deviceId, bool isDeviceTrusted)

1
core/daemon.h
View file

@ -52,6 +52,7 @@ public:
virtual void reportError(const QString &title, const QString &description) = 0;
virtual QNetworkAccessManager* networkAccessManager();
protected:
Device* getDevice(const QString& deviceId);
public Q_SLOTS: