Merge lp:~unity-api-team/indicator-network/no-ofono-fix into lp:indicator-network/14.10

[Antti Kaijanmäki]

Fix crash when ofono is not running.

* Ensure the project compiles and the test suite executes without error
done.

* Ensure that non-obvious code has comments explaining it
It's clear as black.

* If the change works on specific profiles, please include those in the merge description
Affects all profiles.

TestPlan: https://wiki.ubuntu.com/Process/Merges/TestPlan/indicator-network
silo: https://launchpad.net/~ci-train-ppa-service/+archive/landing-011/

Note to Reviewers:
No need to run the autopilot tests.

All you need to test is that after installing the silo and rebooting:
1) indicator-network is available in the panel
2) the indicator has "Wifi" toggle
3) toggling the wifi toggle enables / disables wifi
4) you can connect to a wifi network
5) there is no roaming "R" icon on tablets without modem and indicator does not contain "Cellular Settings..." item OR if the device has a modem the indicator contains "Cellular Settings..." item
6) system-settings wifi page also contains wifi toggle and list of access points if wifi is enabled.

[Antti Kaijanmäki (kaijanmaki)]

The crash was caused by "use before init" in modem-manager.cpp as ofono_disappeared() was getting called before m_unlockDialog got constructed.

Change in wwan-section.cpp makes sure we don't show the "Cellular Settings..." item on a system where there are no modems.

[Jussi Pakkanen (jpakkane)]

Yes from me and Pete.

review: Approve

[Pete Woods (pete-woods)]

review: Approve

[lp:~unity-api-team/indicator-network/no-ofono-fix]

331. By Antti Kaijanmäki on 2014-05-16

merge trunk.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:330
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/135/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/9
        deb: http://jenkins.qa.ubuntu.com/job/indicator-network-utopic-armhf-ci/9/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/no-ofono-fix]

332. By Antti Kaijanmäki on 2014-05-16

RootState: initialize m_roaming properly.

[Antti Kaijanmäki (kaijanmaki)]

Tested on mako:

1) indicator-network is available in the panel

Yes.

2) the indicator has "Wifi" toggle

Yes.

3) toggling the wifi toggle enables / disables wifi

Yes.

4) you can connect to a wifi network

Yes.

5) there is no roaming "R" icon on tablets without modem and indicator does not contain "Cellular Settings..." item OR if the device has a modem the indicator contains "Cellular Settings..." item

mako has a modem and cellular settings item is in the indicator

6) system-settings wifi page also contains wifi toggle and list of access points if wifi is enabled.

Yes.

[Antti Kaijanmäki (kaijanmaki)]

Satoris tested also with mako.

18:56 < Satoris> Wellark: the six list check passes with silo11.

=== modified file 'network/modem-manager.cpp'
--- network/modem-manager.cpp	2014-04-30 21:32:28 +0000
+++ network/modem-manager.cpp	2014-05-16 14:36:29 +0000
@@ -56,16 +56,6 @@
 
         m_dbus.reset(new core::dbus::DBus(m_bus));
 
-        auto names = m_dbus->list_names();
-        if (std::find(names.begin(), names.end(), org::ofono::Service::name()) != names.end()) {
-            ofono_appeared();
-        } else {
-            ofono_disappeared();
-        }
-        m_watcher = m_dbus->make_service_watcher(org::ofono::Service::name());
-        m_watcher->service_registered().connect([this]()  { ofono_appeared();    });
-        m_watcher->service_unregistered().connect([this](){ ofono_disappeared(); });
-
         m_unlockDialog = std::make_shared<SimUnlockDialog>();
         m_unlockDialog->state().changed().connect([this](SimUnlockDialog::State state){
             switch (state) {
@@ -82,6 +72,16 @@
                 break;
             }
         });
+
+        auto names = m_dbus->list_names();
+        if (std::find(names.begin(), names.end(), org::ofono::Service::name()) != names.end()) {
+            ofono_appeared();
+        } else {
+            ofono_disappeared();
+        }
+        m_watcher = m_dbus->make_service_watcher(org::ofono::Service::name());
+        m_watcher->service_registered().connect([this]()  { ofono_appeared();    });
+        m_watcher->service_unregistered().connect([this](){ ofono_disappeared(); });
     }
 
     ~Private()

=== modified file 'network/root-state.cpp'
--- network/root-state.cpp	2014-05-15 15:52:51 +0000
+++ network/root-state.cpp	2014-05-16 14:36:29 +0000
@@ -62,7 +62,8 @@
 
 RootState::Private::Private(std::shared_ptr<networking::Manager> manager, ModemManager::Ptr modemManager)
     : m_manager{manager},
-      m_modemManager{modemManager}
+      m_modemManager{modemManager},
+      m_roaming{false}
 {    
     m_manager->flightMode().changed().connect(std::bind(&Private::flightModeChanged, this, std::placeholders::_1));
     flightModeChanged(m_manager->flightMode().get());

=== modified file 'network/wwan-section.cpp'
--- network/wwan-section.cpp	2014-04-23 13:18:25 +0000
+++ network/wwan-section.cpp	2014-05-16 14:36:29 +0000
@@ -76,9 +76,6 @@
     m_topMenu = std::make_shared<Menu>();
     m_topMenu->append(m_topItem);
 
-    m_modemManager->modems().changed().connect(std::bind(&Private::modemsChanged, this, std::placeholders::_1));
-    modemsChanged(m_modemManager->modems());
-
     m_openCellularSettings = std::make_shared<TextItem>(_("Cellular settings…"), "cellular", "settings");
     m_openCellularSettings->activated().connect([](){
         UrlDispatcher::send("settings:///system/cellular", [](std::string url, bool success){
@@ -86,9 +83,10 @@
                 std::cerr << "URL Dispatcher failed on " << url << std::endl;
         });
     });
-
-    m_bottomMenu->append(*m_openCellularSettings);
     m_actionGroupMerger->add(*m_openCellularSettings);
+
+    m_modemManager->modems().changed().connect(std::bind(&Private::modemsChanged, this, std::placeholders::_1));
+    modemsChanged(m_modemManager->modems());
 }
 
 void
@@ -124,6 +122,13 @@
         m_actionGroupMerger->add(*item);
         m_items.push_back(std::make_pair(modem, item));
     }
+
+    if (modems.size() == 0) {
+        m_bottomMenu->clear();
+    } else {
+        if (m_bottomMenu->find(*m_openCellularSettings) == m_bottomMenu->end())
+            m_bottomMenu->append(*m_openCellularSettings);
+    }
 }
 
 WwanSection::WwanSection(ModemManager::Ptr modemManager)