Fixed unpair still using the old KConfig

This commit is contained in:
Albert Vaca 2015-03-15 19:13:54 -07:00
parent 021bb1781a
commit 563233cac7
2 changed files with 9 additions and 9 deletions

View file

@ -212,18 +212,20 @@ void Device::requestPair()
void Device::unpair()
{
m_pairStatus = Device::NotPaired;
KdeConnectConfig::instance()->removeTrustedDevice(id());
NetworkPackage np(PACKAGE_TYPE_PAIR);
np.set("pair", false);
sendPackage(np);
unpairInternal();
}
void Device::unpairInternal()
{
m_pairStatus = Device::NotPaired;
KdeConnectConfig::instance()->removeTrustedDevice(id());
reloadPlugins(); //Will unload the plugins
Q_EMIT unpaired();
}
void Device::pairingTimeout()
@ -377,10 +379,7 @@ void Device::privateReceivedPackage(const NetworkPackage& np)
m_pairingTimeut.stop();
Q_EMIT pairingFailed(i18n("Canceled by other peer"));
} else if (prevPairStatus == Device::Paired) {
KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc");
config->group("trusted_devices").deleteGroup(id());
reloadPlugins();
Q_EMIT unpaired();
unpairInternal();
}
}

View file

@ -125,6 +125,7 @@ Q_SIGNALS:
private:
void setName(const QString &name);
void unpairInternal();
const QString m_deviceId;
QString m_deviceName;