diff --git a/kded/modemmonitor.cpp b/kded/modemmonitor.cpp index b256f8b4..ced3cea2 100644 --- a/kded/modemmonitor.cpp +++ b/kded/modemmonitor.cpp @@ -1,209 +1,209 @@ /* Copyright 2009 Will Stephenson Copyright 2013 Lukas Tinkl Copyright 2014 Jan Grulich This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) version 3, or any later version accepted by the membership of KDE e.V. (or its successor approved by the membership of KDE e.V.), which shall act as a proxy defined in Section 6 of version 3 of the license. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library. If not, see . */ #include "debug.h" #include "modemmonitor.h" #include #include #include #include #include #include #include #include #include #include #include #include #include #include "pindialog.h" class ModemMonitorPrivate { public: - QWeakPointer dialog; + QPointer dialog; }; ModemMonitor::ModemMonitor(QObject * parent) :QObject(parent), d_ptr(new ModemMonitorPrivate) { Q_D(ModemMonitor); d->dialog.clear(); KSharedConfigPtr config = KSharedConfig::openConfig(QLatin1String("plasma-nm")); KConfigGroup grp(config, QLatin1String("General")); if (grp.isValid()) { if (grp.readEntry(QLatin1String("UnlockModemOnDetection"), true)) { connect(ModemManager::notifier(), &ModemManager::Notifier::modemAdded, this, &ModemMonitor::unlockModem); for (const ModemManager::ModemDevice::Ptr &iface : ModemManager::modemDevices()) { unlockModem(iface->uni()); } } } } ModemMonitor::~ModemMonitor() { delete d_ptr; } void ModemMonitor::unlockModem(const QString &modemUni) { Q_D(ModemMonitor); ModemManager::Modem::Ptr modem; ModemManager::ModemDevice::Ptr modemDevice = ModemManager::findModemDevice(modemUni); if (modemDevice) { modem = modemDevice->interface(ModemManager::ModemDevice::ModemInterface).objectCast(); } else { return; } connect(modem.data(), &ModemManager::Modem::unlockRequiredChanged, this, &ModemMonitor::requestPin, Qt::UniqueConnection); if (d->dialog || (modem && modem->unlockRequired() == MM_MODEM_LOCK_NONE) || (modem && modem->unlockRequired() == MM_MODEM_LOCK_UNKNOWN)) { return; } if (modem) { // Using queued invocation to prevent kded stalling here until user enters the pin. QMetaObject::invokeMethod(modem.data(), "unlockRequiredChanged", Qt::QueuedConnection, Q_ARG(MMModemLock, modem->unlockRequired())); } } void ModemMonitor::requestPin(MMModemLock lock) { Q_D(ModemMonitor); qCDebug(PLASMA_NM) << "unlockRequired == " << lock; // Handle just SIM-PIN and SIM-PUK, because some other types may cause problems and they are not also handled by nm-applet if (lock == MM_MODEM_LOCK_NONE || lock == MM_MODEM_LOCK_UNKNOWN || (lock != MM_MODEM_LOCK_SIM_PIN && lock != MM_MODEM_LOCK_SIM_PUK)) { return; } ModemManager::Modem *modem = qobject_cast(sender()); if (!modem) { return; } if (d->dialog) { qCDebug(PLASMA_NM) << "PinDialog already running"; return; } if (lock == MM_MODEM_LOCK_SIM_PIN) { - d->dialog = new PinDialog(modem, PinDialog::SimPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::SimPin)); } else if (lock == MM_MODEM_LOCK_SIM_PIN2) { - d->dialog = new PinDialog(modem, PinDialog::SimPin2); + d->dialog = QPointer(new PinDialog(modem, PinDialog::SimPin2)); } else if (lock == MM_MODEM_LOCK_SIM_PUK) { - d->dialog = new PinDialog(modem, PinDialog::SimPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::SimPuk)); } else if (lock == MM_MODEM_LOCK_SIM_PUK2 ) { - d->dialog = new PinDialog(modem, PinDialog::SimPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::SimPuk)); } else if (lock == MM_MODEM_LOCK_PH_SP_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemServiceProviderPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemServiceProviderPin)); } else if (lock == MM_MODEM_LOCK_PH_SP_PUK) { - d->dialog = new PinDialog(modem, PinDialog::ModemServiceProviderPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemServiceProviderPuk)); } else if (lock == MM_MODEM_LOCK_PH_NET_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemNetworkPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemNetworkPin)); } else if (lock == MM_MODEM_LOCK_PH_NET_PUK) { - d->dialog = new PinDialog(modem, PinDialog::ModemNetworkPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemNetworkPuk)); } else if (lock == MM_MODEM_LOCK_PH_SIM_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemPin)); } else if (lock == MM_MODEM_LOCK_PH_CORP_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemCorporatePin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemCorporatePin)); } else if (lock == MM_MODEM_LOCK_PH_CORP_PUK) { - d->dialog = new PinDialog(modem, PinDialog::ModemCorporatePuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemCorporatePuk)); } else if (lock == MM_MODEM_LOCK_PH_FSIM_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemPhFsimPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemPhFsimPin)); } else if (lock == MM_MODEM_LOCK_PH_FSIM_PUK) { - d->dialog = new PinDialog(modem, PinDialog::ModemPhFsimPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemPhFsimPuk)); } else if (lock == MM_MODEM_LOCK_PH_NETSUB_PIN) { - d->dialog = new PinDialog(modem, PinDialog::ModemNetworkSubsetPin); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemNetworkSubsetPin)); } else if (lock == MM_MODEM_LOCK_PH_NETSUB_PUK) { - d->dialog = new PinDialog(modem, PinDialog::ModemNetworkSubsetPuk); + d->dialog = QPointer(new PinDialog(modem, PinDialog::ModemNetworkSubsetPuk)); } - if (d->dialog.toStrongRef().data()->exec() != QDialog::Accepted) { + if (d->dialog.data()->exec() != QDialog::Accepted) { goto OUT; } qCDebug(PLASMA_NM) << "Sending unlock code"; { ModemManager::Sim::Ptr sim; ModemManager::ModemDevice::Ptr modemDevice = ModemManager::findModemDevice(modem->uni()); if (modemDevice && modemDevice->sim()) { sim = modemDevice->sim(); } if (!sim) { return; } QDBusPendingCallWatcher *watcher = nullptr; - PinDialog::Type type = d->dialog.toStrongRef().data()->type(); + PinDialog::Type type = d->dialog.data()->type(); if (type == PinDialog::SimPin || type == PinDialog::SimPin2 || type == PinDialog::ModemServiceProviderPin || type == PinDialog::ModemNetworkPin || type == PinDialog::ModemPin || type == PinDialog::ModemCorporatePin || type == PinDialog::ModemPhFsimPin || type == PinDialog::ModemNetworkSubsetPin) { - QDBusPendingCall reply = sim->sendPin(d->dialog.toStrongRef().data()->pin()); + QDBusPendingCall reply = sim->sendPin(d->dialog.data()->pin()); watcher = new QDBusPendingCallWatcher(reply, sim.data()); } else if (type == PinDialog::SimPuk || type == PinDialog::SimPuk2 || type == PinDialog::ModemServiceProviderPuk || type == PinDialog::ModemNetworkPuk || type == PinDialog::ModemCorporatePuk || type == PinDialog::ModemPhFsimPuk || type == PinDialog::ModemNetworkSubsetPuk) { - QDBusPendingCall reply = sim->sendPuk(d->dialog.toStrongRef().data()->puk(), d->dialog.toStrongRef().data()->pin()); + QDBusPendingCall reply = sim->sendPuk(d->dialog.data()->puk(), d->dialog.data()->pin()); watcher = new QDBusPendingCallWatcher(reply, sim.data()); } connect(watcher, &QDBusPendingCallWatcher::finished, this, &ModemMonitor::onSendPinArrived); } OUT: if(d->dialog) { - d->dialog.toStrongRef().data()->deleteLater(); + d->dialog.data()->deleteLater(); } d->dialog.clear(); } void ModemMonitor::onSendPinArrived(QDBusPendingCallWatcher * watcher) { QDBusPendingReply<> reply = *watcher; if (reply.isValid()) { // Automatically enabling this for cell phones with expensive data plans is not a good idea. //NetworkManager::setWwanEnabled(true); } else { KMessageBox::error(nullptr, i18nc("Text in GSM PIN/PUK unlock error dialog", "Error unlocking modem: %1", reply.error().message()), i18nc("Title for GSM PIN/PUK unlock error dialog", "PIN/PUK unlock error")); } watcher->deleteLater(); }