Merge lp:~unity-api-team/indicator-network/modeminfo into lp:indicator-network/14.10

[Antti Kaijanmäki]

Add ModemInfoItem.

ModemInfoItem.

also requires:
https://code.launchpad.net/~unity-api-team/unity8/modeminfo/+merge/225159
https://code.launchpad.net/~unity-api-team/unity8/default-indicator-page-loader-visible-fix/+merge/228943

silo: https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/landing-001

New indicator item that displays modem information and allows unlocking of a cellular modems.

Example of the different variations:
http://imgur.com/W52T6nV

Actual result when combined with the indicator:
http://imgur.com/XK0fEWt

[Pete Woods (pete-woods)]

LGTM.

review: Approve

[Charles Kerr (charlesk)]

Tested on N4, seems to be working as advertised. :-)

review: Approve

[Nick Dedekind (nick-dedekind)]

On Mako

https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim1.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim2.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim3.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim4.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim5.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim6.png
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim7.png

locked_sim1.png) this is how it comes up on boot. looks ok
locked_sim2.png) after unlocking phone. Note it still says "SIM Locked"
locked_sim3.png) restart indicator-network
locked_sim4.png) called the phone when it was in state 3. rejected
locked_sim5.png) restart indicator-network. called phone again. Can see the notification for accepting call, but see is still "Offline" & no strength icon
locked_sim6.png) restarted phone. came up without a locked sim icon in panel as in 1
locked_sim7.png) resarted again and unlocked. finally went into searching, then picked up a network. But it doesn't match with the designs you provided where there is the phone number above the carrier. There is no way to tell the sims apart if connected on same network.

/usr/share/ofono/scripts/list-modems output for each state.
1) http://paste.ubuntu.com/7969273/
2) http://paste.ubuntu.com/7969275/
3) http://paste.ubuntu.com/7969276/
4) http://paste.ubuntu.com/7969279/
5) http://paste.ubuntu.com/7969280/
6) can't reproduce
7) http://paste.ubuntu.com/7969282/

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/modeminfo]

360. By Antti Kaijanmäki on 2014-08-06

Forgot to bind to the modem online property in the panel icon side.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/modeminfo]

361. By Antti Kaijanmäki on 2014-08-07

add default sim identifiers and make sure modems are ordered correctly in the menu.

[Antti Kaijanmäki (kaijanmaki)]

> On Mako
>
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim1.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim2.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim3.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim4.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim5.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim6.png
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim7.png
>
> locked_sim1.png) this is how it comes up on boot. looks ok
> locked_sim2.png) after unlocking phone. Note it still says "SIM Locked"
> locked_sim3.png) restart indicator-network
> locked_sim4.png) called the phone when it was in state 3. rejected
> locked_sim5.png) restart indicator-network. called phone again. Can see the
> notification for accepting call, but see is still "Offline" & no strength icon
> locked_sim6.png) restarted phone. came up without a locked sim icon in panel
> as in 1
> locked_sim7.png) resarted again and unlocked. finally went into searching,
> then picked up a network.

Thank you for in-depth testing!

I nailed a couple of bugs and hopefully all of the above problems are now solved.

> But it doesn't match with the designs you provided
> where there is the phone number above the carrier.

The phone number is not always available. We need to investigate a bit more to figure out what additional information to have in there.

> There is no way to tell the
> sims apart if connected on same network.

Agreed.

I added default SIM identifiers (SIM 1, SIM 2) which are visible when using a dual sim device.

on a single sim device there is no reason to show the identifier as there is only one sim.

[lp:~unity-api-team/indicator-network/modeminfo]

362. By Antti Kaijanmäki on 2014-08-07

review adjustments.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[lp:~unity-api-team/indicator-network/modeminfo]

363. By Antti Kaijanmäki on 2014-08-07

make sure cellular icons are ordered correctly in the panel.

[Charles Kerr (charlesk)]

Code inspection LGTM after r362 + r363, thanks for the fixes.

I do not have dual sim so I have /not/ done Real World testing on this -- DO NOT merge this based on my approval until Nick's had another pass at it :)

review: Approve

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Nick Dedekind (nick-dedekind)]

Seems to be a little better now, but after a few tries of rebooting phone and unlocking I got this:

This is after unlocking. Note missing text & disabled signal icon in panel.
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim8.png

After restarting indicator-network.
https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim9.png

The state text should never be empty. If it's in an unknown state, it should say "Unknown".

review: Needs Fixing

[lp:~unity-api-team/indicator-network/modeminfo]

364. By Antti Kaijanmäki on 2014-08-07

Improve the panel modemTechIcon handling a bit on dual sim.

365. By Antti Kaijanmäki on 2014-08-07

Handle NetworkRegistration::Status::unknown better.

[Antti Kaijanmäki (kaijanmaki)]

> Seems to be a little better now, but after a few tries of rebooting phone and
> unlocking I got this:
>
> This is after unlocking. Note missing text & disabled signal icon in panel.
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim8.png

OK. seems your phone gets an unknown state from networkregistration and unfortunately the unknown case was accidentally clearing the connectivity-icon instead of status icon. Fixed now.

> After restarting indicator-network.
> https://dl.dropboxusercontent.com/u/85539674/locked_sim/locked_sim9.png
>
> The state text should never be empty. If it's in an unknown state, it should
> say "Unknown".

Agreed and fixed.

[Pete Woods (pete-woods)]

The last two changes look sensible to me.

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-07-22 20:21:50 +0000
+++ debian/control	2014-08-07 11:23:41 +0000
@@ -41,7 +41,7 @@
          ubuntu-mobile-icons (>= 13.04+13.10.20131014),
 # For apport hook
          python3-xdg,
-         unity8 (>= 7.82),
+         unity8 (>= 8.00+14.10.20140806),
 Conflicts: chewie,
            indicators-client-plugin-network,
 Description: Systems settings menu service - Network indicator
 
=== modified file 'network/CMakeLists.txt'
--- network/CMakeLists.txt	2014-05-22 08:32:45 +0000
+++ network/CMakeLists.txt	2014-08-07 11:23:41 +0000
@@ -28,6 +28,7 @@
 
     menuitems/access-point-item.h
     menuitems/item.h
+    menuitems/modem-info-item.cpp
     menuitems/section.h
     menuitems/switch-item.h
     menuitems/text-item.h
 
=== added file 'network/menuitems/modem-info-item.cpp'
--- network/menuitems/modem-info-item.cpp	1970-01-01 00:00:00 +0000
+++ network/menuitems/modem-info-item.cpp	2014-08-07 11:23:41 +0000
@@ -0,0 +1,148 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include "modem-info-item.h"
+
+class ModemInfoItem::Private
+{
+public:
+    core::Signal<void> m_unlock;
+
+    std::vector<core::Connection> m_connections;
+
+    Action::Ptr m_actionStatusLabel;
+    Action::Ptr m_actionStatusIcon;
+    Action::Ptr m_actionConnectivityIcon;
+    Action::Ptr m_actionSimIdentifier;
+    Action::Ptr m_actionRoaming;
+    Action::Ptr m_actionLocked;
+
+    MenuItem::Ptr m_item;
+};
+
+ModemInfoItem::ModemInfoItem()
+{
+    d.reset(new Private);
+
+    static int id = 0;
+    ++id; /// @todo guard me.
+
+    std::string actionIdBase = "modem." + std::to_string(id);
+
+    std::string statusLabelActionId = actionIdBase + "::status-label";
+    std::string statusIconActionId = actionIdBase + "::status-icon";
+    std::string connectivityIconActionId = actionIdBase + "::connectivity-icon";
+    std::string simIdentifierActionId = actionIdBase + "::sim-identifier-label";
+    std::string roamingActionId = actionIdBase + "::roaming";
+    std::string lockedActionId = actionIdBase + "::locked";
+
+    d->m_item = std::make_shared<MenuItem>();
+
+    d->m_item->setAttribute("x-canonical-type", TypedVariant<std::string>("com.canonical.indicator.network.modeminfoitem"));
+    d->m_item->setAttribute("x-canonical-modem-status-label-action", TypedVariant<std::string>("indicator." + statusLabelActionId));
+    d->m_item->setAttribute("x-canonical-modem-status-icon-action", TypedVariant<std::string>("indicator." + statusIconActionId));
+    d->m_item->setAttribute("x-canonical-modem-connectivity-icon-action", TypedVariant<std::string>("indicator." +  connectivityIconActionId));
+    d->m_item->setAttribute("x-canonical-modem-sim-identifier-label-action", TypedVariant<std::string>("indicator." +  simIdentifierActionId));
+    d->m_item->setAttribute("x-canonical-modem-roaming-action", TypedVariant<std::string>("indicator." +  roamingActionId));
+    d->m_item->setAttribute("x-canonical-modem-locked-action", TypedVariant<std::string>("indicator." +  lockedActionId));
+
+
+
+    d->m_actionStatusLabel = std::make_shared<Action>(statusLabelActionId,
+                                                      nullptr,
+                                                      TypedVariant<std::string>());
+    d->m_actionStatusIcon = std::make_shared<Action>(statusIconActionId,
+                                                     nullptr,
+                                                     TypedVariant<std::string>());
+    d->m_actionConnectivityIcon = std::make_shared<Action>(connectivityIconActionId,
+                                                           nullptr,
+                                                           TypedVariant<std::string>());
+    d->m_actionSimIdentifier = std::make_shared<Action>(simIdentifierActionId,
+                                                        nullptr,
+                                                        TypedVariant<std::string>());
+    d->m_actionRoaming = std::make_shared<Action>(roamingActionId,
+                                                  nullptr,
+                                                  TypedVariant<bool>(false));
+    d->m_actionLocked = std::make_shared<Action>(lockedActionId,
+                                                 nullptr,
+                                                 TypedVariant<bool>(false));
+    m_actionGroup->add(d->m_actionStatusLabel);
+    m_actionGroup->add(d->m_actionStatusIcon);
+    m_actionGroup->add(d->m_actionConnectivityIcon);
+    m_actionGroup->add(d->m_actionSimIdentifier);
+    m_actionGroup->add(d->m_actionRoaming);
+    m_actionGroup->add(d->m_actionLocked);
+
+    d->m_actionLocked->activated().connect([this](Variant){ d->m_unlock(); });
+}
+
+ModemInfoItem::~ModemInfoItem()
+{
+
+}
+
+void
+ModemInfoItem::setStatusIcon(const std::string &name)
+{
+    d->m_actionStatusIcon->setState(TypedVariant<std::string>(name));
+}
+
+void
+ModemInfoItem::setStatusText(const std::string &value)
+{
+    d->m_actionStatusLabel->setState(TypedVariant<std::string>(value));
+}
+
+void
+ModemInfoItem::setConnectivityIcon(const std::string &name)
+{
+    d->m_actionConnectivityIcon->setState(TypedVariant<std::string>(name));
+}
+
+void
+ModemInfoItem::setSimIdentifierText(const std::string &value)
+
+{
+    d->m_actionSimIdentifier->setState(TypedVariant<std::string>(value));
+}
+
+void
+ModemInfoItem::setLocked(bool value)
+{
+    d->m_actionLocked->setState(TypedVariant<bool>(value));
+}
+
+void
+ModemInfoItem::setRoaming(bool value)
+{
+    d->m_actionRoaming->setState(TypedVariant<bool>(value));
+}
+
+MenuItem::Ptr
+ModemInfoItem::menuItem()
+{
+    return d->m_item;
+}
+
+core::Signal<void> &
+ModemInfoItem::unlock()
+{
+    return d->m_unlock;
+}
+
 
=== added file 'network/menuitems/modem-info-item.h'
--- network/menuitems/modem-info-item.h	1970-01-01 00:00:00 +0000
+++ network/menuitems/modem-info-item.h	2014-08-07 11:23:41 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2014 Canonical, Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#ifndef MODEM_INFO_ITEM_H
+#define MODEM_INFO_ITEM_H
+
+#include "item.h"
+#include "menumodel-cpp/action.h"
+#include "menumodel-cpp/menu-item.h"
+#include "menumodel-cpp/gio-helpers/variant.h"
+
+#include <core/signal.h>
+
+#include <functional>
+#include <vector>
+
+class ModemInfoItem : public Item
+{
+    class Private;
+    std::unique_ptr<Private> d;
+
+public:
+    typedef std::shared_ptr<ModemInfoItem> Ptr;
+
+    ModemInfoItem();
+    virtual ~ModemInfoItem();
+
+    void setStatusIcon(const std::string &name);
+    void setStatusText(const std::string &value);
+    void setConnectivityIcon(const std::string &name);
+    void setSimIdentifierText(const std::string &value);
+    void setLocked(bool value);
+    void setRoaming(bool value);
+
+    virtual MenuItem::Ptr menuItem();
+
+    core::Signal<void> &unlock();
+};
+
+#endif // MODEM_INFO_ITEM_H
 
=== modified file 'network/menumodel-cpp/menu-merger.h'
--- network/menumodel-cpp/menu-merger.h	2014-04-23 13:18:25 +0000
+++ network/menumodel-cpp/menu-merger.h	2014-08-07 11:23:41 +0000
@@ -127,7 +127,14 @@
         m_startPositions.erase(*menu);
         m_gmodelToMenu.erase(*menu);
         m_menus.erase(std::remove(m_menus.begin(), m_menus.end(), menu), m_menus.end());
-        }
+    }
+
+    void clear()
+    {
+        std::vector<MenuModel::Ptr> tmp = m_menus;
+        for (auto menu : tmp)
+            remove(menu);
+    }
 
     operator GMenuModel*() { return G_MENU_MODEL(m_gmenu.get()); }
 };
 
=== modified file 'network/modem.cpp'
--- network/modem.cpp	2014-05-02 14:05:12 +0000
+++ network/modem.cpp	2014-08-07 11:23:41 +0000
@@ -22,49 +22,91 @@
 class Modem::Private
 {
 public:
+    core::Property<bool> m_online;
+
     org::ofono::Interface::Modem::Ptr m_ofonoModem;
     core::Property<Modem::SimStatus> m_simStatus;
     core::Property<Modem::PinType> m_requiredPin;
     core::Property<std::map<Modem::PinType, std::uint8_t>> m_retries;
-    core::Property<std::string> m_subscriberIdentity;
 
     core::Property<std::string> m_operatorName;
     core::Property<org::ofono::Interface::NetworkRegistration::Status> m_status;
     core::Property<std::int8_t> m_strength;
     core::Property<org::ofono::Interface::NetworkRegistration::Technology> m_technology;
 
+    core::Property<std::string> m_simIdentifier;
+    int m_index = -1;
+
     void networkRegistrationChanged(org::ofono::Interface::NetworkRegistration::Ptr netreg);
     void simManagerChanged(org::ofono::Interface::SimManager::Ptr simmgr);
 
-    void simPresentChanged(bool value);
-    void pinRequiredChanged(org::ofono::Interface::SimManager::PinType pin);
-    void retriesChanged(std::map<org::ofono::Interface::SimManager::PinType, std::uint8_t> retries) ;
+    void update();
 };
 
 void
-Modem::Private::networkRegistrationChanged(org::ofono::Interface::NetworkRegistration::Ptr netreg)
+Modem::Private::update()
 {
+    auto simmgr = m_ofonoModem->simManager.get();
+    if (simmgr) {
+        // update requiredPin
+        switch(simmgr->pinRequired.get())
+        {
+        case org::ofono::Interface::SimManager::PinType::none:
+            m_requiredPin.set(PinType::none);
+            break;
+        case org::ofono::Interface::SimManager::PinType::pin:
+            m_requiredPin.set(PinType::pin);
+            break;
+        case org::ofono::Interface::SimManager::PinType::puk:
+            m_requiredPin.set(PinType::puk);
+            break;
+        default:
+            throw std::runtime_error("Ofono requires a PIN we have not been prepared to handle (" +
+                                     org::ofono::Interface::SimManager::pin2str(simmgr->pinRequired.get()) +
+                                     "). Bailing out.");
+        }
+
+        // update retries
+        std::map<Modem::PinType, std::uint8_t> tmp;
+        for (auto element : simmgr->retries.get()) {
+            switch(element.first) {
+            case org::ofono::Interface::SimManager::PinType::pin:
+                tmp[Modem::PinType::pin] = element.second;
+                break;
+            case org::ofono::Interface::SimManager::PinType::puk:
+                tmp[Modem::PinType::puk] = element.second;
+                break;
+            default:
+                // don't care
+                break;
+            }
+        }
+        m_retries.set(tmp);
+
+        // update simStatus
+        if (!simmgr->present.get()) {
+            m_simStatus.set(SimStatus::missing);
+        } else if (m_requiredPin == PinType::none){
+            m_simStatus.set(SimStatus::ready);
+        } else {
+            if (m_retries->count(PinType::puk) != 0 && m_retries->at(PinType::puk) == 0)
+                m_simStatus.set(SimStatus::permanentlyLocked);
+            else
+                m_simStatus.set(SimStatus::locked);
+        }
+
+    } else {
+        m_requiredPin.set(PinType::none);
+        m_retries.set({});
+        m_simStatus.set(SimStatus::missing);
+    }
+
+    auto netreg = m_ofonoModem->networkRegistration.get();
     if (netreg) {
-        netreg->operatorName.changed().connect([this](std::string value){
-            m_operatorName.set(value);
-        });
         m_operatorName.set(netreg->operatorName.get());
-
-        netreg->status.changed().connect([this](org::ofono::Interface::NetworkRegistration::Status value){
-            m_status.set(value);
-        });
         m_status.set(netreg->status.get());
-
-        netreg->strength.changed().connect([this](std::int8_t value){
-            m_strength.set(value);
-        });
         m_strength.set(netreg->strength.get());
-
-        netreg->technology.changed().connect([this](org::ofono::Interface::NetworkRegistration::Technology value){
-            m_technology.set(value);
-        });
         m_technology.set(netreg->technology.get());
-
     } else {
         m_operatorName.set("");
         m_status.set(org::ofono::Interface::NetworkRegistration::Status::unknown);
@@ -73,96 +115,58 @@
     }
 }
 
+void
+Modem::Private::networkRegistrationChanged(org::ofono::Interface::NetworkRegistration::Ptr netreg)
+{
+    if (netreg) {
+        netreg->operatorName.changed().connect(std::bind(&Private::update, this));
+        netreg->status.changed().connect(std::bind(&Private::update, this));
+        netreg->strength.changed().connect(std::bind(&Private::update, this));
+        netreg->technology.changed().connect(std::bind(&Private::update, this));
+    }
+    update();
+}
+
 
 void
 Modem::Private::simManagerChanged(org::ofono::Interface::SimManager::Ptr simmgr)
 {
     if (simmgr) {
-        simmgr->present.changed().connect(std::bind(&Private::simPresentChanged, this, std::placeholders::_1));
-        simPresentChanged(simmgr->present.get());
-
-        simmgr->pinRequired.changed().connect(std::bind(&Private::pinRequiredChanged, this, std::placeholders::_1));
-        pinRequiredChanged(simmgr->pinRequired.get());
-
-        simmgr->retries.changed().connect(std::bind(&Private::retriesChanged, this, std::placeholders::_1));
-        retriesChanged(simmgr->retries.get());
-
-        /// @todo subscriberIdentity
-
-    } else {
-        m_simStatus.set(SimStatus::offline);
-        m_requiredPin.set(PinType::none);
-        m_retries.set({});
-    }
-}
-
-void
-Modem::Private::pinRequiredChanged(org::ofono::Interface::SimManager::PinType pin)
-{
-    switch(pin)
-    {
-    case org::ofono::Interface::SimManager::PinType::none:
-        m_requiredPin.set(PinType::none);
-        m_simStatus.set(SimStatus::ready);
-        break;
-    case org::ofono::Interface::SimManager::PinType::pin:
-        m_requiredPin.set(PinType::pin);
-        m_simStatus.set(SimStatus::locked);
-        break;
-    case org::ofono::Interface::SimManager::PinType::puk:
-        m_requiredPin.set(PinType::puk);
-        m_simStatus.set(SimStatus::locked);
-        break;
-    default:
-        throw std::runtime_error("Ofono requires a PIN we have not been prepared to handle (" +
-                                 org::ofono::Interface::SimManager::pin2str(pin) +
-                                 "). Bailing out.");
-    }
-}
-
-void
-Modem::Private::retriesChanged(std::map<org::ofono::Interface::SimManager::PinType, std::uint8_t> retries)
-{
-    std::map<Modem::PinType, std::uint8_t> tmp;
-    for (auto element : retries) {
-        switch(element.first) {
-        case org::ofono::Interface::SimManager::PinType::pin:
-            tmp[Modem::PinType::pin] = element.second;
-            break;
-        case org::ofono::Interface::SimManager::PinType::puk:
-            tmp[Modem::PinType::puk] = element.second;
-            break;
-        default:
-            // don't care
-            break;
-        }
-    }
-    m_retries.set(tmp);
-}
-
-void
-Modem::Private::simPresentChanged(bool value)
-{
-    if (!value) {
-        m_simStatus.set(SimStatus::missing);
-    }
-}
-
+        simmgr->present.changed().connect(std::bind(&Private::update, this));
+        simmgr->pinRequired.changed().connect(std::bind(&Private::update, this));
+        simmgr->retries.changed().connect(std::bind(&Private::update, this));
+    }
+    update();
+}
 
 Modem::Modem(org::ofono::Interface::Modem::Ptr ofonoModem)
 {
     d.reset(new Private);
     d->m_ofonoModem = ofonoModem;
 
+    d->m_online.set(d->m_ofonoModem->online.get());
+    d->m_ofonoModem->online.changed().connect([this](bool value){
+        d->m_online.set(value);
+    });
+
     d->simManagerChanged(d->m_ofonoModem->simManager.get());
-    d->m_ofonoModem->simManager.changed().connect([this](org::ofono::Interface::SimManager::Ptr value){
-        d->simManagerChanged(value);
-    });
+    d->m_ofonoModem->simManager.changed().connect(std::bind(&Private::simManagerChanged, d.get(), std::placeholders::_1));
 
     d->networkRegistrationChanged(d->m_ofonoModem->networkRegistration.get());
-    d->m_ofonoModem->networkRegistration.changed().connect([this](org::ofono::Interface::NetworkRegistration::Ptr value){
-        d->networkRegistrationChanged(value);
-    });
+    d->m_ofonoModem->networkRegistration.changed().connect(std::bind(&Private::networkRegistrationChanged, d.get(), std::placeholders::_1));
+
+    /// @todo hook up with system-settings to allow changing the identifier.
+    ///       for now just provide the defaults
+    const auto path = ofonoModem->object->path().as_string();
+    if (path == "/ril_0") {
+        d->m_simIdentifier.set("SIM 1");
+        d->m_index = 1;
+    } else if (path == "/ril_1") {
+        d->m_simIdentifier.set("SIM 2");
+        d->m_index = 2;
+    } else {
+        d->m_simIdentifier.set(path);
+    }
 }
 
 Modem::~Modem()
@@ -240,6 +244,12 @@
     throw std::logic_error("code should not be reached.");
 }
 
+const core::Property<bool> &
+Modem::online()
+{
+    return d->m_online;
+}
+
 const core::Property<Modem::SimStatus> &
 Modem::simStatus()
 {
@@ -259,12 +269,6 @@
 }
 
 const core::Property<std::string> &
-Modem::subscriberIdentity()
-{
-    return d->m_subscriberIdentity;
-}
-
-const core::Property<std::string> &
 Modem::operatorName()
 {
     return d->m_operatorName;
@@ -287,3 +291,15 @@
 {
     return d->m_technology;
 }
+const core::Property<std::string> &
+Modem::simIdentifier()
+{
+    return d->m_simIdentifier;
+}
+
+int
+Modem::index()
+{
+    return d->m_index;
+}
+
 
=== modified file 'network/modem.h'
--- network/modem.h	2014-04-23 13:18:25 +0000
+++ network/modem.h	2014-08-07 11:23:41 +0000
@@ -42,7 +42,6 @@
 
     enum class SimStatus
     {
-        offline,
         missing,
         error,
         locked,
@@ -70,17 +69,56 @@
                    const std::string &oldPin,
                    const std::string &newPin);
 
+    const core::Property<bool> &online();
 
     const core::Property<SimStatus> &simStatus();
     const core::Property<PinType> &requiredPin();
     const core::Property<std::map<PinType, std::uint8_t>> &retries();
-    const core::Property<std::string> &subscriberIdentity();
 
     const core::Property<std::string> &operatorName();
     const core::Property<org::ofono::Interface::NetworkRegistration::Status> &status();
     const core::Property<std::int8_t> &strength();
     const core::Property<org::ofono::Interface::NetworkRegistration::Technology> &technology();
 
+    const core::Property<std::string> &simIdentifier();
+    int index();
+
+    static const std::string strengthIcon(int8_t strength)
+    {
+        /* Using same values as used by Android, not linear (LP: #1329945)*/
+        if (strength >= 39)
+            return "gsm-3g-full";
+        else if (strength >= 26)
+            return "gsm-3g-high";
+        else if (strength >= 16)
+            return "gsm-3g-medium";
+        else if (strength >= 6)
+            return "gsm-3g-low";
+        else
+            return "gsm-3g-none";
+    }
+
+    static const std::string technologyIcon(org::ofono::Interface::NetworkRegistration::Technology tech)
+    {
+        switch (tech){
+        case org::ofono::Interface::NetworkRegistration::Technology::notAvailable:
+        case org::ofono::Interface::NetworkRegistration::Technology::gsm:
+            return "network-cellular-pre-edge";
+        case org::ofono::Interface::NetworkRegistration::Technology::edge:
+            return "network-cellular-edge";
+        case org::ofono::Interface::NetworkRegistration::Technology::umts:
+            return "network-cellular-3g";
+        case org::ofono::Interface::NetworkRegistration::Technology::hspa:
+            return "network-cellular-hspa";
+        /// @todo oFono can't tell us about hspa+ yet
+        //case org::ofono::Interface::NetworkRegistration::Technology::hspaplus:
+        //    break;
+        case org::ofono::Interface::NetworkRegistration::Technology::lte:
+            return "network-cellular-lte";
+        }
+        // shouldn't be reached
+        return "";
+    }
 };
 
 #endif
 
=== modified file 'network/root-state.cpp'
--- network/root-state.cpp	2014-06-17 12:27:05 +0000
+++ network/root-state.cpp	2014-08-07 11:23:41 +0000
@@ -33,7 +33,6 @@
     ModemManager::Ptr m_modemManager;
     core::Property<Variant> m_state;
 
-    std::string m_preLabel;
     std::string m_label;
 
     /// @todo multiple adapters etc..
@@ -41,15 +40,11 @@
 
     std::string m_modemTechIcon;
 
-    bool m_inFlightMode;
-    bool m_roaming;
-
     std::map<Modem::Ptr, std::string> m_cellularIcons;
 
     Private() = delete;
     Private(std::shared_ptr<networking::Manager> manager, ModemManager::Ptr modemManager);
 
-    void flightModeChanged(networking::Manager::FlightModeStatus status);
     void modemsChanged(const std::set<Modem::Ptr> &modems);
 
     void updateModem(Modem::WeakPtr weakModem);
@@ -62,39 +57,23 @@
 
 RootState::Private::Private(std::shared_ptr<networking::Manager> manager, ModemManager::Ptr modemManager)
     : m_manager{manager},
-      m_modemManager{modemManager},
-      m_roaming{false}
+      m_modemManager{modemManager}
 {    
-    m_manager->flightMode().changed().connect(std::bind(&Private::flightModeChanged, this, std::placeholders::_1));
-    flightModeChanged(m_manager->flightMode().get());
+    m_manager->flightMode().changed().connect(std::bind(&Private::updateRootState, this));
 
     m_modemManager->modems().changed().connect(std::bind(&Private::modemsChanged, this, std::placeholders::_1));
     modemsChanged(m_modemManager->modems().get());
 
     m_manager->status().changed().connect(std::bind(&Private::updateNetworkingIcon, this));
     m_manager->links().changed().connect(std::bind(&Private::updateNetworkingIcon, this));
+
+    // will also call updateRootState()
     updateNetworkingIcon();
 }
 
 void
-RootState::Private::flightModeChanged(networking::Manager::FlightModeStatus status)
-{
-    switch(status) {
-    case networking::Manager::FlightModeStatus::off:
-        m_inFlightMode = false;
-        break;
-    case networking::Manager::FlightModeStatus::on:
-        m_inFlightMode = true;
-        break;
-    }
-    updateRootState();
-}
-
-void
 RootState::Private::modemsChanged(const std::set<Modem::Ptr> &modems)
 {
-    /// @todo we have to address the correct ordering of the modems
-
     std::set<Modem::Ptr> current;
     for (auto element : m_cellularIcons)
         current.insert(element.first);
@@ -112,6 +91,7 @@
         m_cellularIcons.erase(modem);
 
     for (auto modem : added) {
+        modem->online().changed().connect(std::bind(&Private::updateModem, this, Modem::WeakPtr(modem)));
         modem->simStatus().changed().connect(std::bind(&Private::updateModem, this, Modem::WeakPtr(modem)));
         modem->status().changed().connect(std::bind(&Private::updateModem, this, Modem::WeakPtr(modem)));
         modem->technology().changed().connect(std::bind(&Private::updateModem, this, Modem::WeakPtr(modem)));
@@ -129,90 +109,56 @@
         return;
     }
 
-    /// @todo multisim for all of these
-    m_preLabel.clear();
-    m_roaming = false;
     m_modemTechIcon.clear();
-
     m_cellularIcons[modem] = "";
 
+    if (!modem->online().get()) {
+        // modem offline, nothing to show
+        updateRootState();
+        return;
+    }
 
     switch(modem->simStatus().get()) {
-    case Modem::SimStatus::offline:
-        /// @todo show something.
-        break;
     case Modem::SimStatus::missing:
-        m_preLabel = _("No SIM");
+        // no need to show anything in the panel
         break;
     case Modem::SimStatus::error:
-        m_preLabel = _("SIM Error");
+        m_cellularIcons[modem] = "simcard-error";
         break;
     case Modem::SimStatus::locked:
     case Modem::SimStatus::permanentlyLocked:
-        /// @todo handle perm blocked somehow
-        m_preLabel = _("SIM Locked");
+        m_cellularIcons[modem] = "simcard-locked";
         break;
     case Modem::SimStatus::ready:
     {
         switch (modem->status().get()) {
         case org::ofono::Interface::NetworkRegistration::Status::unregistered:
-            /// @todo show something?
-            break;
-        case org::ofono::Interface::NetworkRegistration::Status::denied:
-            /// @todo maybe show something like "Denied" ?
-            m_preLabel = _("No Signal");
-            break;
         case org::ofono::Interface::NetworkRegistration::Status::unknown:
         case org::ofono::Interface::NetworkRegistration::Status::searching:
+            m_cellularIcons[modem] = "gsm-3g-disabled";
+            break;
+        case org::ofono::Interface::NetworkRegistration::Status::denied:
+            /// @todo we might need network-error for this
+            m_cellularIcons[modem] = "gsm-3g-disabled";
+            break;
         case org::ofono::Interface::NetworkRegistration::Status::registered:
-            /// @todo show something?
-            break;
         case org::ofono::Interface::NetworkRegistration::Status::roaming:
-            /// @todo multisim
-            m_roaming = true;
-            break;
-        }
-
-        auto strength = modem->strength().get();
-        /* Using same values as used by Android, not linear (LP: #1329945)*/
-        if (strength >= 39)
-            m_cellularIcons[modem] = "gsm-3g-full";
-        else if (strength >= 26)
-            m_cellularIcons[modem] = "gsm-3g-high";
-        else if (strength >= 16)
-            m_cellularIcons[modem] = "gsm-3g-medium";
-        else if (strength >= 6)
-            m_cellularIcons[modem] = "gsm-3g-low";
-        else
-            m_cellularIcons[modem] = "gsm-3g-none";
-
-        switch (modem->technology().get()){
-        case org::ofono::Interface::NetworkRegistration::Technology::notAvailable:
-            /// @todo check this..
-            // "network-cellular-pre-edge"
-            //  a11ydesc = _("Network (cellular, %s)").printf(current_protocol)
-            break;
-        case org::ofono::Interface::NetworkRegistration::Technology::gsm:
-            m_modemTechIcon = "network-cellular-pre-edge";
-            break;
-        case org::ofono::Interface::NetworkRegistration::Technology::edge:
-            m_modemTechIcon = "network-cellular-edge";
-            break;
-        case org::ofono::Interface::NetworkRegistration::Technology::umts:
-            m_modemTechIcon = "network-cellular-3g";
-            break;
-        case org::ofono::Interface::NetworkRegistration::Technology::hspa:
-            m_modemTechIcon = "network-cellular-hspa";
-            break;
-        /// @todo oFono can't tell us about hspa+ yet
-        //case org::ofono::Interface::NetworkRegistration::Technology::hspaplus:
-        //    break;
-        case org::ofono::Interface::NetworkRegistration::Technology::lte:
-            m_modemTechIcon = "network-cellular-lte";
-            break;
-        }
-        // we might have changed the modem tech icon which affects the networkingIcon.
-        updateNetworkingIcon();
+            if (modem->strength().get() != 0) {
+                m_cellularIcons[modem] = Modem::strengthIcon(modem->strength().get());
+                /// @todo need to revise this once the modems are part of the connectivity-api
+                ///       this might get us wrong results on dual-sim
+                if (modem->index() == 1) {
+                    m_modemTechIcon = Modem::technologyIcon(modem->technology().get());
+                }
+            } else {
+                m_cellularIcons[modem] = "gsm-3g-no-service";
+
+            }
+
+            // we might have changed the modem tech icon which affects the networkingIcon.
+            updateNetworkingIcon();
+            break;
+        }
         break;
     }}
 
@@ -241,8 +187,12 @@
 
                 auto wifiLink = std::dynamic_pointer_cast<networking::wifi::Link>(link);
 
-                int strength = wifiLink->activeAccessPoint().get()->strength().get();
-                bool secured = wifiLink->activeAccessPoint().get()->secured();
+                int strength = -1;
+                bool secured = false;
+                if (wifiLink->activeAccessPoint().get()) {
+                    strength = wifiLink->activeAccessPoint().get()->strength().get();
+                    secured  = wifiLink->activeAccessPoint().get()->secured();
+                }
 
                 /// @todo deal with a11ydesc
 //                gchar *a11ydesc = nullptr;
@@ -305,15 +255,41 @@
     std::vector<std::string> icons;
     std::map<std::string, Variant> state;
 
-    if (m_inFlightMode)
+    switch(m_manager->flightMode().get()) {
+    case networking::Manager::FlightModeStatus::off:
+        break;
+    case networking::Manager::FlightModeStatus::on:
         icons.push_back("airplane-mode");
-
-    for (auto icon : m_cellularIcons)
-        if (!icon.second.empty())
-            icons.push_back(icon.second);
-
-    if (m_roaming)
-        icons.push_back("network-cellular-roaming");
+        break;
+    }
+
+    auto compare = [](int lhs, int rhs ){
+        // make sure index() == -1 goes as leftmost cellular icon
+        if (lhs == -1 && rhs == -1)
+            return false;
+        if (lhs == -1)
+            return false;
+        if (rhs == -1)
+            return true;
+        return lhs < rhs;
+    };
+    std::multimap<int, std::string, decltype(compare)> sorted(compare);
+
+    for (auto pair : m_cellularIcons) {
+        sorted.insert(std::make_pair(pair.first->index(), pair.second));
+    }
+    for (auto pair : sorted) {
+        if (!pair.second.empty())
+            icons.push_back(pair.second);
+    }
+
+    // if any of the modems is roaming, show the roaming icon
+    for (auto modem : m_modemManager->modems().get()) {
+        if (modem->status().get() == org::ofono::Interface::NetworkRegistration::Status::roaming) {
+            icons.push_back("network-cellular-roaming");
+            break;
+        }
+    }
 
     if (!m_networkingIcon.empty()) {
 
@@ -328,9 +304,6 @@
         icons.push_back(m_networkingIcon);
     }
 
-    if (!m_preLabel.empty())
-        state["pre-label"] = TypedVariant<std::string>(m_preLabel);
-
     if (!m_label.empty())
         state["label"] = TypedVariant<std::string>(m_label);
 
 
=== modified file 'network/service.h'
--- network/service.h	2014-05-16 19:39:19 +0000
+++ network/service.h	2014-08-07 11:23:41 +0000
@@ -112,18 +112,18 @@
         m_phoneMenu->addSection(m_quickAccessSection);
         m_phoneGreeterMenu->addSection(m_quickAccessSection);
 
+        m_wwanSection = std::make_shared<WwanSection>(m_modemManager);
+        m_desktopMenu->addSection(m_wwanSection);
+        m_desktopGreeterMenu->addSection(m_wwanSection);
+        m_phoneMenu->addSection(m_wwanSection);
+        m_phoneGreeterMenu->addSection(m_wwanSection);
+
         m_wifiSection = std::make_shared<WifiSection>(m_manager);
         m_desktopMenu->addSection(m_wifiSection);
         m_desktopGreeterMenu->addSection(m_wifiSection);
         m_phoneMenu->addSection(m_wifiSection);
         m_phoneGreeterMenu->addSection(m_wifiSection);
 
-        m_wwanSection = std::make_shared<WwanSection>(m_modemManager);
-        m_desktopMenu->addSection(m_wwanSection);
-        m_desktopGreeterMenu->addSection(m_wwanSection);
-        m_phoneMenu->addSection(m_wwanSection);
-        m_phoneGreeterMenu->addSection(m_wwanSection);
-
         m_desktopMenuExporter.reset(new MenuExporter(m_sessionBus, "/com/canonical/indicator/network/desktop", m_desktopMenu->menu()));
         m_desktopGreeterMenuExporter.reset(new MenuExporter(m_sessionBus, "/com/canonical/indicator/network/desktop_greeter", m_desktopGreeterMenu->menu()));
         m_desktopWifiSettingsMenuExporter.reset(new MenuExporter(m_sessionBus, "/com/canonical/indicator/network/desktop_wifi_settings", m_wifiSection->settingsModel()));
 
=== modified file 'network/wwan-link-item.cpp'
--- network/wwan-link-item.cpp	2014-05-21 17:56:25 +0000
+++ network/wwan-link-item.cpp	2014-08-07 11:23:41 +0000
@@ -19,7 +19,7 @@
 
 #include "wwan-link-item.h"
 
-#include "menuitems/text-item.h"
+#include "menuitems/modem-info-item.h"
 
 #include "menumodel-cpp/menu.h"
 
@@ -33,13 +33,14 @@
     Modem::Ptr m_modem;
     ModemManager::Ptr m_modemManager;
 
-    TextItem::Ptr m_unlockSim;
-    bool m_wasLocked;
+    ModemInfoItem::Ptr m_infoItem;
+
+    core::Property<bool> m_showIdentifier;
 
     Private() = delete;
     Private(Modem::Ptr modem, ModemManager::Ptr modemManager);
 
-    void simStatusChanged(Modem::SimStatus status);
+    void update();
     void unlockSim();
 };
 
@@ -50,33 +51,97 @@
     m_actionGroupMerger = std::make_shared<ActionGroupMerger>();
     m_menu = std::make_shared<Menu>();
 
-    /// @todo add stuff to control the link
-
-    m_unlockSim = std::make_shared<TextItem>(_("Unlock SIM…"), "sim", "unlock");
-    m_unlockSim->activated().connect(std::bind(&ModemManager::unlockModem, m_modemManager.get(), m_modem));
-
-    m_actionGroupMerger->add(*m_unlockSim);
-
-    m_wasLocked = false;
-    m_modem->simStatus().changed().connect(std::bind(&Private::simStatusChanged, this, std::placeholders::_1));
-    simStatusChanged(m_modem->simStatus().get());
+    m_infoItem = std::make_shared<ModemInfoItem>();
+    m_infoItem->unlock().connect(std::bind(&ModemManager::unlockModem, m_modemManager.get(), m_modem));
+
+    m_actionGroupMerger->add(*m_infoItem);
+    m_menu->append(*m_infoItem);
+
+    m_showIdentifier.set(false);
+    m_showIdentifier.changed().connect(std::bind(&Private::update, this));
+
+    m_modem->online().changed().connect(std::bind(&Private::update, this));
+    m_modem->simStatus().changed().connect(std::bind(&Private::update, this));
+    m_modem->operatorName().changed().connect(std::bind(&Private::update, this));
+    m_modem->status().changed().connect(std::bind(&Private::update, this));
+    m_modem->strength().changed().connect(std::bind(&Private::update, this));
+    m_modem->technology().changed().connect(std::bind(&Private::update, this));
+    m_modem->simIdentifier().changed().connect(std::bind(&Private::update, this));
+    update();
 }
 
 void
-WwanLinkItem::Private::simStatusChanged(Modem::SimStatus status)
+WwanLinkItem::Private::update()
 {
-    if (status == Modem::SimStatus::locked) {
-        if (!m_wasLocked) {
-            //m_actionGroupMerger->add(*m_unlockSim);
-            m_menu->append(*m_unlockSim);
-            m_wasLocked = true;
-        }
+    if (m_showIdentifier.get()) {
+        m_infoItem->setSimIdentifierText(m_modem->simIdentifier().get());
     } else {
-        if (m_wasLocked) {
-            //m_actionGroupMerger->remove(*m_unlockSim);
-            m_menu->remove(m_menu->find(*m_unlockSim));
-            m_wasLocked = false;
+        m_infoItem->setSimIdentifierText("");
+    }
+    /// @todo implement me.
+    m_infoItem->setConnectivityIcon("");
+
+    switch(m_modem->simStatus().get()) {
+    case Modem::SimStatus::missing:
+        m_infoItem->setStatusIcon("no-simcard");
+        m_infoItem->setStatusText(_("No SIM"));
+        m_infoItem->setLocked(false);
+        m_infoItem->setRoaming(false);
+        break;
+    case Modem::SimStatus::error:
+        m_infoItem->setStatusIcon("simcard-error");
+        m_infoItem->setStatusText(_("SIM Error"));
+        m_infoItem->setLocked(false);
+        m_infoItem->setRoaming(false);
+        break;
+    case Modem::SimStatus::locked:
+    case Modem::SimStatus::permanentlyLocked:
+        m_infoItem->setStatusIcon("simcard-locked");
+        m_infoItem->setStatusText(_("SIM Locked"));
+        m_infoItem->setLocked(true);
+        m_infoItem->setRoaming(false);
+        break;
+    case Modem::SimStatus::ready:
+        m_infoItem->setLocked(false);
+        m_infoItem->setRoaming(false);
+
+        if (m_modem->online().get()) {
+            switch (m_modem->status().get()) {
+            case org::ofono::Interface::NetworkRegistration::Status::unregistered:
+                m_infoItem->setStatusIcon("gsm-3g-disabled");
+                m_infoItem->setStatusText(_("Unregistered"));
+                break;
+            case org::ofono::Interface::NetworkRegistration::Status::unknown:
+                m_infoItem->setStatusIcon("gsm-3g-disabled");
+                m_infoItem->setStatusText(_("Unknown"));
+                break;
+            case org::ofono::Interface::NetworkRegistration::Status::denied:
+                m_infoItem->setStatusIcon("gsm-3g-disabled");
+                m_infoItem->setStatusText(_("Denied"));
+                break;
+            case org::ofono::Interface::NetworkRegistration::Status::searching:
+                m_infoItem->setStatusIcon("gsm-3g-disabled");
+                m_infoItem->setStatusText(_("Searching"));
+                break;
+            case org::ofono::Interface::NetworkRegistration::Status::roaming:
+                m_infoItem->setRoaming(true);
+                /* fallthrough */
+            case org::ofono::Interface::NetworkRegistration::Status::registered:
+                if (m_modem->strength().get() != 0) {
+                    m_infoItem->setStatusIcon(Modem::strengthIcon(m_modem->strength().get()));
+                    m_infoItem->setStatusText(m_modem->operatorName());
+                } else {
+                    m_infoItem->setStatusIcon("gsm-3g-no-service");
+                    m_infoItem->setStatusText(_("No Signal"));
+                }
+                break;
+            }
+        } else {
+            m_infoItem->setStatusIcon("gsm-3g-disabled");
+            m_infoItem->setStatusText(_("Offline"));
         }
+
+        break;
     }
 }
 
@@ -99,3 +164,9 @@
 {
     return d->m_menu;
 }
+
+void
+WwanLinkItem::showSimIdentifier(bool value)
+{
+    d->m_showIdentifier.set(value);
+}
 
=== modified file 'network/wwan-link-item.h'
--- network/wwan-link-item.h	2014-04-23 13:18:25 +0000
+++ network/wwan-link-item.h	2014-08-07 11:23:41 +0000
@@ -37,6 +37,8 @@
     // from Section
     virtual ActionGroup::Ptr actionGroup();
     virtual MenuModel::Ptr menuModel();
+
+    void showSimIdentifier(bool value);
 };
 
 #endif // WWAN_LINK_ITEM_H
 
=== modified file 'network/wwan-section.cpp'
--- network/wwan-section.cpp	2014-05-16 12:38:53 +0000
+++ network/wwan-section.cpp	2014-08-07 11:23:41 +0000
@@ -92,8 +92,6 @@
 void
 WwanSection::Private::modemsChanged(const std::set<Modem::Ptr> &modems)
 {
-    /// @todo we have to address the correct ordering of the modems
-
     std::set<Modem::Ptr> current;
     for (auto element : m_items)
         current.insert(element.first);
@@ -118,9 +116,31 @@
 
     for (auto modem : added) {
         auto item = std::make_shared<WwanLinkItem>(modem, m_modemManager);
-        m_linkMenuMerger->append(*item);
+
+        m_items.push_back(std::make_pair(modem, item));
         m_actionGroupMerger->add(*item);
-        m_items.push_back(std::make_pair(modem, item));
+
+        // for now just throw everything away and rebuild
+        /// @todo add MenuMerger::insert() and ::find()
+        m_linkMenuMerger->clear();
+
+        auto compare = [](int lhs, int rhs ){
+            // make sure index() == -1 goes to the bottom of the menu
+            if (lhs == -1 && rhs == -1)
+                return false;
+            if (lhs == -1)
+                return false;
+            if (rhs == -1)
+                return true;
+            return lhs < rhs;
+        };
+        std::multimap<int, WwanLinkItem::Ptr, decltype(compare)> sorted(compare);
+
+        for (auto pair : m_items) {
+            sorted.insert(std::make_pair(pair.first->index(), pair.second));
+        }
+        for (auto pair : sorted)
+            m_linkMenuMerger->append(*(pair.second));
     }
 
     if (modems.size() == 0) {
@@ -129,6 +149,14 @@
         if (m_bottomMenu->find(*m_openCellularSettings) == m_bottomMenu->end())
             m_bottomMenu->append(*m_openCellularSettings);
     }
+
+    if (m_items.size() > 1) {
+        for(auto i : m_items)
+            i.second->showSimIdentifier(true);
+    } else {
+        for(auto i : m_items)
+            i.second->showSimIdentifier(false);
+    }
 }
 
 WwanSection::WwanSection(ModemManager::Ptr modemManager)