Merge lp:~pete-woods/indicator-network/sim-unlock-debugging-lp1465214 into lp:indicator-network/15.10

[Pete Woods]

Wait for SIM Manager interface to be fully initialised before we try and unlock any SIMs

Wait for SIM Manager interface to be fully initialised before we try and unlock any SIMs

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/349/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/349/rebuild

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/indicator-network/sim-unlock-debugging-lp1465214]

496. By Pete Woods on 2015-06-17

Wait for all SimManager properties to be set before declaring it valid

497. By Pete Woods on 2015-06-17

Log when we launch the unlock dialogue

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:497
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/350/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/350/rebuild

review: Needs Fixing (continuous-integration)

[lp:~pete-woods/indicator-network/sim-unlock-debugging-lp1465214]

498. By Pete Woods on 2015-06-18

Schedule the modem to tell us about the unlock, don't let it spam us

499. By Pete Woods on 2015-06-18

Just warn, rather than throw

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:499
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/351/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/indicator-network-ci/351/rebuild

review: Needs Fixing (continuous-integration)

[Marcus Tomlinson (marcustomlinson)]

Does this branch actually need a review? or is this just a test MP?

[Charles Kerr (charlesk)]

review: Approve

[Marcus Tomlinson (marcustomlinson)]

I take that as a yes ;)

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2015-04-23 10:02:23 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2015-06-18 12:30:37 +0000
@@ -144,6 +144,15 @@
         }
     }
 
+    void modemReadyToUnlock(const QString& name)
+    {
+        auto modem = m_ofonoLinks[name];
+        if (modem)
+        {
+            p.unlockModem(modem);
+        }
+    }
+
     void modems_changed(const QStringList& value)
     {
         QSet<QString> modemPaths(value.toSet());
@@ -162,6 +171,7 @@
             {
                 m_unlockDialog->cancel();
                 m_pendingUnlocks.removeOne(modem);
+                disconnect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
             }
         }
 
@@ -172,6 +182,7 @@
 
             auto modem = make_shared<wwan::Modem>(modemInterface);
             m_ofonoLinks[path] = modem;
+            connect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
         }
 
         Q_EMIT p.linksUpdated();
@@ -466,10 +477,21 @@
             return;
 
         if (d->m_unlockDialog->state() == SimUnlockDialog::State::ready
-                && d->m_pendingUnlocks.size() == 0)
-            d->m_unlockDialog->unlock(modem);
+                && (d->m_pendingUnlocks.size() == 0))
+        {
+            if (modem->isReadyToUnlock())
+            {
+                d->m_unlockDialog->unlock(modem);
+            }
+            else
+            {
+                modem->notifyWhenReadyToUnlock();
+            }
+        }
         else
+        {
             d->m_pendingUnlocks.push_back(modem);
+        }
     } catch(const exception &e) {
         // Something unexpected has happened. As an example, unity8 might have
         // crashed taking the notification server with it. There is no graceful

=== modified file 'src/indicator/nmofono/wwan/modem.cpp'
--- src/indicator/nmofono/wwan/modem.cpp	2015-04-24 08:47:08 +0000
+++ src/indicator/nmofono/wwan/modem.cpp	2015-06-18 12:30:37 +0000
@@ -92,6 +92,10 @@
     Modem::PinType m_requiredPin;
     RetriesType m_retries;
 
+    bool m_simStatusSet = false;
+    bool m_requiredPinSet = false;
+    bool m_retriesSet = false;
+
     QString m_operatorName;
     Modem::ModemStatus m_status;
     int8_t m_strength;
@@ -110,6 +114,8 @@
 
     QTimer m_updatedTimer;
 
+    bool m_shouldTriggerUnlock = false;
+
     Private(Modem& parent, shared_ptr<QOfonoModem> ofonoModem)
         : p(parent), m_ofonoModem{ofonoModem}
     {
@@ -142,6 +148,12 @@
     void fireUpdate()
     {
         Q_EMIT p.updated(p);
+
+        if (p.isReadyToUnlock() && m_shouldTriggerUnlock)
+        {
+            m_shouldTriggerUnlock = false;
+            Q_EMIT p.readyToUnlock(p.name());
+        }
     }
 
     void connectionManagerChanged(shared_ptr<QOfonoConnectionManager> conmgr)
@@ -249,6 +261,9 @@
                                          "). Bailing out.");
             }
 
+            m_requiredPinSet = true;
+
+            bool retriesWasSet = true;
             // update retries
             RetriesType tmp;
             QVariantMap retries = m_simManager->pinRetries();
@@ -257,6 +272,10 @@
                 i.next();
                 QOfonoSimManager::PinType type = (QOfonoSimManager::PinType) i.key().toInt();
                 int count = i.value().toInt();
+                if (count < 0)
+                {
+                    retriesWasSet = false;
+                }
                 switch(type)
                 {
                     case QOfonoSimManager::PinType::SimPin:
@@ -271,6 +290,8 @@
             }
             setRetries(tmp);
 
+            m_retriesSet = retriesWasSet;
+
             // update simStatus
             bool present = m_simManager->present();
             if (!present)
@@ -294,10 +315,16 @@
                 }
             }
 
+            m_simStatusSet = true;
+
         } else {
             setRequiredPin(PinType::none);
             setRetries({});
             setSimStatus(SimStatus::not_available);
+
+            m_requiredPinSet = false;
+            m_retriesSet = false;
+            m_simStatusSet = false;
         }
 
         if (m_networkRegistration)
@@ -695,6 +722,19 @@
 {
     return 0;
 }
+
+bool
+Modem::isReadyToUnlock() const
+{
+    return d->m_simStatusSet && d->m_requiredPinSet && d->m_retriesSet
+            && (d->m_requiredPin != PinType::none);
+}
+
+void
+Modem::notifyWhenReadyToUnlock()
+{
+    d->m_shouldTriggerUnlock = true;
+}
 }
 
 }

=== modified file 'src/indicator/nmofono/wwan/modem.h'
--- src/indicator/nmofono/wwan/modem.h	2015-04-24 08:47:08 +0000
+++ src/indicator/nmofono/wwan/modem.h	2015-06-18 12:30:37 +0000
@@ -144,6 +144,10 @@
 
     Id id() const override;
 
+    bool isReadyToUnlock() const;
+
+    void notifyWhenReadyToUnlock();
+
 Q_SIGNALS:
     void onlineUpdated(bool);
 
@@ -174,6 +178,8 @@
     void resetPinSuceeded();
 
     void resetPinFailed(const QString& error);
+
+    bool readyToUnlock(const QString& name);
 };
 
 }

=== modified file 'src/indicator/sim-unlock-dialog.cpp'
--- src/indicator/sim-unlock-dialog.cpp	2015-05-13 15:46:54 +0000
+++ src/indicator/sim-unlock-dialog.cpp	2015-06-18 12:30:37 +0000
@@ -435,7 +435,8 @@
 {
     if (d->m_modem)
     {
-        throw std::logic_error("Unlocking already in progress.");
+        qWarning() << "Unlocking already in progress.";
+        return;
     }
 
     d->m_modem = modem;
@@ -474,6 +475,9 @@
         pukRetries = retries[wwan::Modem::PinType::puk];
     }
 
+    qDebug() << __PRETTY_FUNCTION__ << modem->name() << "pinRetries ="
+            << pinRetries << "pukRetries =" << pukRetries;
+
     // remind the user
     if (type == wwan::Modem::PinType::pin && pinRetries == 1)
     {