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

[Antti Kaijanmäki]

New Connectivity Service Private API for managing mobile data and SIM cards.

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

576. By Antti Kaijanmäki on 2016-03-15

add stuff to .Private

577. By Antti Kaijanmäki on 2016-03-15

add switch to the menu

578. By Antti Kaijanmäki on 2016-03-15

.

579. By Antti Kaijanmäki on 2016-03-17

add sim and modem ADAPTORS

580. By Antti Kaijanmäki on 2016-03-18

modem and sim Interfaces.

581. By Antti Kaijanmäki on 2016-03-21

some test skeletons

582. By Antti Kaijanmäki on 2016-03-21

Sim: add Primmary phone number

583. By Antti Kaijanmäki on 2016-03-21

some more test skeletons

584. By Antti Kaijanmäki on 2016-03-21

introduce wwan::Sim

585. By Antti Kaijanmäki on 2016-03-21

factory: introduce mobileDataSwitch

586. By Antti Kaijanmäki on 2016-03-21

Augment nmofono::Manager interface.

587. By Antti Kaijanmäki on 2016-04-06

commit for a while..

588. By Antti Kaijanmäki on 2016-04-12

added scripts/

589. By Antti Kaijanmäki on 2016-04-18

Get the ConnectionManager interface for actually managing the data connection.

590. By Antti Kaijanmäki on 2016-04-18

add phonesim/general_sim.xml

591. By Antti Kaijanmäki on 2016-04-18

QML API start

592. By Antti Kaijanmäki on 2016-04-18

merge upstream

593. By Antti Kaijanmäki on 2016-04-26

finish qml bindings.

594. By Antti Kaijanmäki on 2016-04-26

add simple qml program

595. By Antti Kaijanmäki on 2016-04-26

cleanups

Unmerged revisions

595. By Antti Kaijanmäki on 2016-04-26

cleanups

594. By Antti Kaijanmäki on 2016-04-26

add simple qml program

593. By Antti Kaijanmäki on 2016-04-26

finish qml bindings.

592. By Antti Kaijanmäki on 2016-04-18

merge upstream

591. By Antti Kaijanmäki on 2016-04-18

QML API start

590. By Antti Kaijanmäki on 2016-04-18

add phonesim/general_sim.xml

589. By Antti Kaijanmäki on 2016-04-18

Get the ConnectionManager interface for actually managing the data connection.

588. By Antti Kaijanmäki on 2016-04-12

added scripts/

587. By Antti Kaijanmäki on 2016-04-06

commit for a while..

586. By Antti Kaijanmäki on 2016-03-21

Augment nmofono::Manager interface.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-15 09:31:38 +0000
+++ CMakeLists.txt	2016-04-26 11:24:03 +0000
@@ -139,3 +139,5 @@
 )
 
 endif()
+
+add_subdirectory(scripts)

=== added file 'data/com.ubuntu.connectivity1.Modem.xml'
--- data/com.ubuntu.connectivity1.Modem.xml	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.connectivity1.Modem.xml	2016-04-26 11:24:03 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node>
+    <interface name="com.ubuntu.connectivity1.Modem">
+        <property name="Index" type="i" access="read" />
+        <property name="Serial" type="s" access="read" />
+        <property name="Sim" type="o" access="read" />
+    </interface>
+</node>

=== modified file 'data/com.ubuntu.connectivity1.Private.xml'
--- data/com.ubuntu.connectivity1.Private.xml	2015-12-04 13:18:04 +0000
+++ data/com.ubuntu.connectivity1.Private.xml	2016-04-26 11:24:03 +0000
@@ -52,6 +52,14 @@
         
         <property name="VpnConnections" type="ao" access="read"/>
 
+        <property name="MobileDataEnabled" type="b" access="readwrite"/>
+
+        <property name="SimForMobileData" type="o" access="readwrite"/>
+
+        <property name="Modems" type="ao" access="read"/>
+
+        <property name="Sims" type="ao" access="read"/>
+
         <signal name="ReportError">
             <arg type="i" direction="out" name="reason"/>
         </signal>

=== added file 'data/com.ubuntu.connectivity1.Sim.xml'
--- data/com.ubuntu.connectivity1.Sim.xml	1970-01-01 00:00:00 +0000
+++ data/com.ubuntu.connectivity1.Sim.xml	2016-04-26 11:24:03 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+
+<node>
+    <interface name="com.ubuntu.connectivity1.Sim">
+        <property name="Imsi" type="s" access="read" />
+        <property name="PrimaryPhoneNumber" type="s" access="read" />
+        <property name="Locked" type="b" access="read" />
+        <property name="Present" type="b" access="read" />
+        <property name="Mcc" type="s" access="read" />
+        <property name="Mnc" type="s" access="read" />
+        <property name="PreferredLanguages" type="as" access="read" />
+        <property name="DataRoamingEnabled" type="b" access="readwrite" />
+
+        <method name="Unlock" />
+    </interface>
+</node>

=== added directory 'scripts'
=== added file 'scripts/CMakeLists.txt'
--- scripts/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ scripts/CMakeLists.txt	2016-04-26 11:24:03 +0000
@@ -0,0 +1,5 @@
+
+file(GLOB_RECURSE SCRIPT_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.sh
+)
+add_custom_target(scriptfiles SOURCES ${SCRIPT_FILES})

=== added file 'scripts/disable-mobile-data.sh'
--- scripts/disable-mobile-data.sh	1970-01-01 00:00:00 +0000
+++ scripts/disable-mobile-data.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,8 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Set     \
+    string:com.ubuntu.connectivity1.Private \
+    string:MobileDataEnabled                \
+    variant:boolean:false
+sh get-mobile-data-enabled.sh

=== added file 'scripts/enable-mobile-data.sh'
--- scripts/enable-mobile-data.sh	1970-01-01 00:00:00 +0000
+++ scripts/enable-mobile-data.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,8 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Set     \
+    string:com.ubuntu.connectivity1.Private \
+    string:MobileDataEnabled                \
+    variant:boolean:true
+sh get-mobile-data-enabled.sh

=== added file 'scripts/get-mobile-data-enabled.sh'
--- scripts/get-mobile-data-enabled.sh	1970-01-01 00:00:00 +0000
+++ scripts/get-mobile-data-enabled.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,6 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Get     \
+    string:com.ubuntu.connectivity1.Private \
+    string:MobileDataEnabled

=== added file 'scripts/get-modems.sh'
--- scripts/get-modems.sh	1970-01-01 00:00:00 +0000
+++ scripts/get-modems.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,6 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Get     \
+    string:com.ubuntu.connectivity1.Private \
+    string:Modems

=== added file 'scripts/get-sim-for-mobile-data.sh'
--- scripts/get-sim-for-mobile-data.sh	1970-01-01 00:00:00 +0000
+++ scripts/get-sim-for-mobile-data.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,6 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Get     \
+    string:com.ubuntu.connectivity1.Private \
+    string:SimForMobileData

=== added file 'scripts/get-sims.sh'
--- scripts/get-sims.sh	1970-01-01 00:00:00 +0000
+++ scripts/get-sims.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,6 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Get     \
+    string:com.ubuntu.connectivity1.Private \
+    string:Sims

=== added file 'scripts/monitor-private-properties.sh'
--- scripts/monitor-private-properties.sh	1970-01-01 00:00:00 +0000
+++ scripts/monitor-private-properties.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,7 @@
+dbus-monitor --session \
+    "type=signal,
+     sender='com.ubuntu.connectivity1',
+     path=/com/ubuntu/connectivity1/Private,
+     interface=org.freedesktop.DBus.Properties,
+     member=PropertiesChanged"
+

=== added file 'scripts/set-sim-for-mobile-data.sh'
--- scripts/set-sim-for-mobile-data.sh	1970-01-01 00:00:00 +0000
+++ scripts/set-sim-for-mobile-data.sh	2016-04-26 11:24:03 +0000
@@ -0,0 +1,8 @@
+dbus-send --session --print-reply           \
+    --dest=com.ubuntu.connectivity1         \
+    /com/ubuntu/connectivity1/Private       \
+    org.freedesktop.DBus.Properties.Set     \
+    string:com.ubuntu.connectivity1.Private \
+    string:SimForMobileData                 \
+    variant:objpath:$1
+sh get-sim-for-mobile-data.sh

=== modified file 'src/connectivity-api/connectivity-qml/CMakeLists.txt'
--- src/connectivity-api/connectivity-qml/CMakeLists.txt	2015-05-19 13:49:21 +0000
+++ src/connectivity-api/connectivity-qml/CMakeLists.txt	2016-04-26 11:24:03 +0000
@@ -8,7 +8,7 @@
 )
 
 set(CONNECTIVITY_QML_SRC
-  plugin.cpp
+    plugin.cpp
 )
 
 add_library(connectivity-qml SHARED

=== modified file 'src/connectivity-api/connectivity-qml/plugin.cpp'
--- src/connectivity-api/connectivity-qml/plugin.cpp	2015-12-04 13:18:04 +0000
+++ src/connectivity-api/connectivity-qml/plugin.cpp	2016-04-26 11:24:03 +0000
@@ -21,6 +21,13 @@
 #include <connectivityqt/connectivity.h>
 #include <connectivityqt/openvpn-connection.h>
 
+#include <connectivityqt/path.h>
+#include <connectivityqt/sim.h>
+
+#include <connectivityqt/modems-list-model.h>
+#include <connectivityqt/sims-list-model.h>
+
+
 #include <QtQml>
 
 namespace
@@ -44,10 +51,16 @@
 {
     connectivityqt::Connectivity::registerMetaTypes();
     qmlRegisterSingletonType<connectivityqt::Connectivity>(uri, 1, 0, "NetworkingStatus", connectivitySingletonProvider);
-    qmlRegisterSingletonType<connectivityqt::Connectivity>(uri, 1, 0, "Connectivity", connectivitySingletonProvider);
+    qmlRegisterSingletonType<connectivityqt::Connectivity>(uri, 1, 1, "Connectivity", connectivitySingletonProvider);
     qmlRegisterUncreatableType<connectivityqt::VpnConnectionsListModel>(uri, 1, 0, "VpnConnectionsListModel", "Access VpnConnectionsListModel via Connectivity object");
     qmlRegisterUncreatableType<connectivityqt::VpnConnection>(uri, 1, 0, "VpnConnection", "Access VpnConnection via VpnConnectionsListModel object");
     qmlRegisterUncreatableType<connectivityqt::OpenvpnConnection>(uri, 1, 0, "OpenvpnConnection", "Access OpenvpnConnection via VpnConnectionsListModel object");
+
+    qmlRegisterUncreatableType<connectivityqt::Path>(uri, 1, 1, "Path", "");
+    qmlRegisterUncreatableType<connectivityqt::Sim>(uri, 1, 1, "Sim", "");
+
+    qmlRegisterUncreatableType<connectivityqt::ModemsListModel>(uri, 1, 1, "ModemsListModel", "");
+    qmlRegisterUncreatableType<connectivityqt::ModemsListModel>(uri, 1, 1, "SimsListModel", "");
 }
 
 void

=== added file 'src/connectivity-api/connectivity-qml/proxy-model.cpp'
=== added file 'src/connectivity-api/connectivity-qml/proxy-model.h'
--- src/connectivity-api/connectivity-qml/proxy-model.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qml/proxy-model.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,80 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QAbstractItemModel>
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+
+#include <memory>
+
+namespace connectivityqt
+{
+
+class Q_DECL_EXPORT ModemsListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+
+    enum Roles
+    {
+        RoleIndex = Qt::UserRole + 1,
+        RoleSerial,
+        RoleSimPath
+    };
+
+    ModemsListModel(const QDBusConnection &connection, QObject *parent);
+
+    ~ModemsListModel();
+
+    int columnCount(const QModelIndex &parent) const override;
+
+    int rowCount(const QModelIndex &parent) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
+
+    Qt::ItemFlags flags(const QModelIndex & index) const override;
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleIndex] = "Index";
+        roles[RoleSerial] = "Serial";
+        roles[RoleSimPath] = "SimPath";
+        return roles;
+    }
+
+    void updateModemDBusPaths(QList<QDBusObjectPath> values);
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== modified file 'src/connectivity-api/connectivity-qt/CMakeLists.txt'
--- src/connectivity-api/connectivity-qt/CMakeLists.txt	2016-02-17 10:58:27 +0000
+++ src/connectivity-api/connectivity-qt/CMakeLists.txt	2016-04-26 11:24:03 +0000
@@ -22,6 +22,11 @@
     CONNECTIVITY_QT_SRC
     connectivityqt/internal/dbus-property-cache.cpp
     connectivityqt/connectivity.cpp
+    connectivityqt/modem.cpp
+    connectivityqt/modems-list-model.cpp
+    connectivityqt/sim.cpp
+    connectivityqt/sims-list-model.cpp
+    connectivityqt/path.cpp
     connectivityqt/openvpn-connection.cpp
     connectivityqt/pptp-connection.cpp
     connectivityqt/vpn-connection.cpp
@@ -33,6 +38,8 @@
     "${DATA_DIR}/org.freedesktop.DBus.Properties.xml"
     "${DATA_DIR}/com.ubuntu.connectivity1.NetworkingStatus.xml"
     "${DATA_DIR}/com.ubuntu.connectivity1.Private.xml"
+    "${DATA_DIR}/com.ubuntu.connectivity1.Modem.xml"
+    "${DATA_DIR}/com.ubuntu.connectivity1.Sim.xml"
     "${DATA_DIR}/com.ubuntu.connectivity1.vpn.VpnConnection.xml"
     "${DATA_DIR}/com.ubuntu.connectivity1.vpn.VpnConnection.OpenVpn.xml"
     "${DATA_DIR}/com.ubuntu.connectivity1.vpn.VpnConnection.Pptp.xml"
@@ -54,6 +61,18 @@
 
 qt5_add_dbus_interface(
     CONNECTIVITY_QT_SRC
+    "${DATA_DIR}/com.ubuntu.connectivity1.Modem.xml"
+    ModemInterface
+)
+
+qt5_add_dbus_interface(
+    CONNECTIVITY_QT_SRC
+    "${DATA_DIR}/com.ubuntu.connectivity1.Sim.xml"
+    SimInterface
+)
+
+qt5_add_dbus_interface(
+    CONNECTIVITY_QT_SRC
     "${DATA_DIR}/com.ubuntu.connectivity1.vpn.VpnConnection.xml"
     VpnConnectionInterface
 )
@@ -99,8 +118,8 @@
     ${CONNECTIVITY_QT_LIB_TARGET}
     PROPERTIES
     SOVERSION ${SO_VERSION}
-    LINK_FLAGS "-Wl,--version-script,${SYMBOL_MAP}"
-    LINK_DEPENDS "${SYMBOL_MAP}"
+#    LINK_FLAGS "-Wl,--version-script,${SYMBOL_MAP}"
+#    LINK_DEPENDS "${SYMBOL_MAP}"
 )
 
 install(

=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2015-12-04 13:18:04 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.cpp	2016-04-26 11:24:03 +0000
@@ -20,6 +20,8 @@
 #include <connectivityqt/connectivity.h>
 #include <connectivityqt/internal/vpn-connection-list-model-parameters.h>
 #include <connectivityqt/vpn-connections-list-model.h>
+#include <connectivityqt/modems-list-model.h>
+#include <connectivityqt/sims-list-model.h>
 #include <dbus-types.h>
 #include <NetworkingStatusInterface.h>
 #include <NetworkingStatusPrivateInterface.h>
@@ -57,6 +59,11 @@
 
     VpnConnectionsListModel::SPtr m_vpnConnectionsModel;
 
+    SimsListModel *m_simsModel;
+    ModemsListModel *m_modemsModel;
+
+    Sim *m_simForMobileData = nullptr;
+
     static QVector<Limitations> toLimitations(const QVariant& value)
     {
         auto l = value.toStringList();
@@ -100,6 +107,8 @@
         {
             Q_EMIT p.initialized();
         }
+        QList<QDBusObjectPath> tmp;
+        qvariant_cast<QDBusArgument>(m_writePropertyCache->get("Modems")) >> tmp;
     }
 
     void propertyChanged(const QString& name, const QVariant& value)
@@ -164,6 +173,29 @@
         {
             Q_EMIT p.hotspotStoredUpdated(value.toBool());
         }
+        else if (name == "MobileDataEnabled")
+        {
+            Q_EMIT p.mobileDataEnabledUpdated(value.toBool());
+        }
+        else if (name == "SimForMobileData")
+        {
+            auto path = value.value<QDBusObjectPath>();
+            auto sim = m_simsModel->getSimByPath(path);
+            p.setSimForMobileData(sim);
+        }
+        else if (name == "Modems")
+        {
+            QList<QDBusObjectPath> tmp;
+            qvariant_cast<QDBusArgument>(m_writePropertyCache->get("Modems")) >> tmp;
+            m_modemsModel->updateModemDBusPaths(tmp);
+        }
+        else if (name == "Sims")
+        {
+            QList<QDBusObjectPath> tmp;
+            qvariant_cast<QDBusArgument>(m_writePropertyCache->get("Sims")) >> tmp;
+            m_simsModel->updateSimDBusPaths(tmp);
+        }
+
     }
 
 };
@@ -178,6 +210,8 @@
 
     qRegisterMetaType<connectivityqt::VpnConnection*>("VpnConnection*");
     qRegisterMetaType<connectivityqt::VpnConnection::Type>("VpnConnection::Type");
+
+    qRegisterMetaType<connectivityqt::Sim*>("Sim*");
 }
 
 Connectivity::Connectivity(const QDBusConnection& sessionConnection, QObject* parent) :
@@ -196,6 +230,9 @@
 {
     d->m_objectOwner = objectOwner;
 
+    d->m_simsModel = new SimsListModel(sessionConnection, this);
+    d->m_modemsModel = new ModemsListModel(sessionConnection, d->m_simsModel, this);
+
     d->m_readInterface = make_shared<
             ComUbuntuConnectivity1NetworkingStatusInterface>(
             DBusTypes::DBUS_NAME, DBusTypes::SERVICE_PATH,
@@ -225,6 +262,17 @@
             &internal::DBusPropertyCache::initialized, d.get(),
             &Connectivity::Priv::interfaceInitialized);
 
+    if (d->m_writePropertyCache->isInitialized()) {
+        QList<QDBusObjectPath> tmp;
+        qvariant_cast<QDBusArgument>(d->m_writePropertyCache->get("Sims")) >> tmp;
+        d->m_simsModel->updateSimDBusPaths(tmp);
+        tmp.clear();
+        qvariant_cast<QDBusArgument>(d->m_writePropertyCache->get("Modems")) >> tmp;
+        d->m_modemsModel->updateModemDBusPaths(tmp);
+
+        d->m_simForMobileData = d->m_simsModel->getSimByPath(d->m_writePropertyCache->get("SimForMobileData").value<QDBusObjectPath>());
+    }
+
     connect(d->m_writeInterface.get(),
             &ComUbuntuConnectivity1PrivateInterface::ReportError, this,
             &Connectivity::reportError);
@@ -384,6 +432,50 @@
     return d->m_vpnConnectionsModel.get();
 }
 
+bool Connectivity::mobileDataEnabled() const
+{
+    return d->m_writePropertyCache->get("MobileDataEnabled").toBool();
+}
+
+void Connectivity::setMobileDataEnabled(bool enabled)
+{
+    d->m_writeInterface->setMobileDataEnabled(enabled);
+}
+
+Sim *Connectivity::simForMobileData() const
+{
+    return d->m_simForMobileData;
+}
+
+void Connectivity::setSimForMobileData(Sim *sim)
+{
+    if (d->m_simForMobileData == sim)
+    {
+        return;
+    }
+    d->m_simForMobileData = sim;
+    if (sim)
+    {
+        d->m_writeInterface->setSimForMobileData(sim->path());
+    }
+    else
+    {
+        d->m_writeInterface->setSimForMobileData(QDBusObjectPath("/"));
+    }
+    Q_EMIT simForMobileDataUpdated(sim);
+}
+
+QAbstractItemModel* Connectivity::modems() const
+{
+    return d->m_modemsModel;
+}
+
+QAbstractItemModel *Connectivity::sims() const
+{
+    return d->m_simsModel;
+}
+
+
 }
 
 #include "connectivity.moc"

=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2016-01-14 13:38:38 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2016-04-26 11:24:03 +0000
@@ -30,9 +30,13 @@
 
 #include <connectivityqt/vpn-connections-list-model.h>
 
+#include <QDBusObjectPath>
+
 namespace connectivityqt
 {
 
+class Sim;
+
 class Q_DECL_EXPORT Connectivity: public QObject
 {
     Q_OBJECT
@@ -138,6 +142,18 @@
     Q_PROPERTY(QAbstractItemModel* vpnConnections READ vpnConnections NOTIFY vpnConnectionsUpdated)
     QAbstractItemModel* vpnConnections() const;
 
+    Q_PROPERTY(bool mobileDataEnabled READ mobileDataEnabled WRITE setMobileDataEnabled NOTIFY mobileDataEnabledUpdated)
+    bool mobileDataEnabled() const;
+
+    Q_PROPERTY(Sim* simForMobileData READ simForMobileData WRITE setSimForMobileData NOTIFY simForMobileDataUpdated)
+    Sim* simForMobileData() const;
+
+    Q_PROPERTY(QAbstractItemModel* modems READ modems CONSTANT)
+    QAbstractItemModel* modems() const;
+
+    Q_PROPERTY(QAbstractItemModel* sims READ sims CONSTANT)
+    QAbstractItemModel* sims() const;
+
 public Q_SLOTS:
     void setFlightMode(bool enabled);
 
@@ -153,6 +169,10 @@
 
     void setHotspotAuth(const QString& auth);
 
+    void setMobileDataEnabled(bool enabled);
+
+    void setSimForMobileData(Sim *sim);
+
 Q_SIGNALS:
     void flightModeUpdated(bool);
 
@@ -194,6 +214,10 @@
 
     void vpnConnectionsUpdated(QAbstractItemModel*);
 
+    void mobileDataEnabledUpdated(bool);
+
+    void simForMobileDataUpdated(Sim* sim);
+
 protected:
     class Priv;
     std::shared_ptr<Priv> d;

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modem.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,112 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <connectivityqt/internal/dbus-property-cache.h>
+#include <connectivityqt/modem.h>
+#include <dbus-types.h>
+
+#include <ModemInterface.h>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class Modem::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(Modem& parent) :
+        p(parent)
+    {
+    }
+
+public Q_SLOTS:
+    void propertyChanged(const QString& name, const QVariant& value)
+    {
+        if (name == "Sim")
+        {
+            m_sim = m_sims->getSimByPath(value.value<QDBusObjectPath>());
+            Q_EMIT p.simChanged(m_sim);
+        }
+    }
+
+public:
+    Modem& p;
+
+    Sim *m_sim;
+    SimsListModel *m_sims;
+
+    unique_ptr<ComUbuntuConnectivity1ModemInterface> m_modemInterface;
+
+    internal::DBusPropertyCache::UPtr m_propertyCache;
+};
+
+Modem::Modem(const QDBusObjectPath& path,
+             const QDBusConnection& connection,
+             SimsListModel *sims,
+             QObject* parent) :
+        QObject(parent), d(new Priv(*this))
+{
+    d->m_sims = sims;
+    d->m_modemInterface = make_unique<
+            ComUbuntuConnectivity1ModemInterface>(
+            DBusTypes::DBUS_NAME, path.path(), connection);
+
+    d->m_propertyCache =
+            make_unique<internal::DBusPropertyCache>(
+                    DBusTypes::DBUS_NAME,
+                    ComUbuntuConnectivity1ModemInterface::staticInterfaceName(),
+                    path.path(), connection);
+
+    connect(d->m_propertyCache.get(),
+                &internal::DBusPropertyCache::propertyChanged, d.get(),
+                &Priv::propertyChanged);
+
+    d->m_sim = d->m_sims->getSimByPath(d->m_propertyCache->get("Sim").value<QDBusObjectPath>());
+}
+
+Modem::~Modem()
+{
+}
+
+QDBusObjectPath Modem::path() const
+{
+    return QDBusObjectPath(d->m_modemInterface->path());
+}
+
+int Modem::index() const
+{
+    return d->m_propertyCache->get("Index").toInt();
+}
+
+Sim *Modem::sim() const
+{
+    return d->m_sim;
+}
+
+QString Modem::serial() const
+{
+    return d->m_propertyCache->get("Serial").toString();
+}
+
+}
+
+#include "modem.moc"

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/modem.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/modem.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modem.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,68 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QObject>
+
+#include <unity/util/DefinesPtrs.h>
+#include <connectivityqt/sims-list-model.h>
+
+namespace connectivityqt
+{
+
+class Q_DECL_EXPORT Modem : public QObject
+{
+    Q_OBJECT
+
+public:
+    UNITY_DEFINES_PTRS(Modem);
+
+    Modem(const QDBusObjectPath& path,
+          const QDBusConnection& connection,
+          SimsListModel *sims,
+          QObject* parent = 0);
+
+    virtual ~Modem();
+
+    Q_PROPERTY(QDBusObjectPath path READ path)
+    QDBusObjectPath path() const;
+
+    Q_PROPERTY(QString serial READ serial)
+    QString serial() const;
+
+    Q_PROPERTY(int index READ index CONSTANT)
+    int index() const;
+
+    Q_PROPERTY(connectivityqt::Sim* sim READ sim NOTIFY simChanged)
+    Sim* sim() const;
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+    void simChanged(Sim *sim);
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,172 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <connectivityqt/modems-list-model.h>
+#include <connectivityqt/modem.h>
+#include <connectivityqt/path.h>
+
+#include <QDebug>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class ModemsListModel::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(ModemsListModel& parent, const QDBusConnection &connection) :
+        p(parent),
+        m_connection(connection)
+    {
+    }
+
+    void updateModemDBusPaths(QList<QDBusObjectPath> values)
+    {
+        auto paths = values.toSet();
+
+        QSet<QDBusObjectPath> current;
+        for (const auto& m: m_modems)
+        {
+            current << m->path();
+        }
+
+        auto toRemove(current);
+        toRemove.subtract(paths);
+
+        auto toAdd(paths);
+        toAdd.subtract(current);
+
+        QMutableListIterator<Modem::SPtr> i(m_modems);
+        int idx = 0;
+        while (i.hasNext())
+        {
+            auto modem(i.next());
+            if (toRemove.contains(modem->path()))
+            {
+                p.beginRemoveRows(QModelIndex(), idx, idx);
+                i.remove();
+                p.endRemoveRows();
+            }
+            else
+            {
+                ++idx;
+            }
+        }
+
+        if (!toAdd.isEmpty())
+        {
+            p.beginInsertRows(QModelIndex(), m_modems.size(), m_modems.size() + toAdd.size() - 1);
+            for (const auto& path: toAdd)
+            {
+                auto modem = std::make_shared<Modem>(path, m_connection, m_sims, this);
+                m_modems << modem;
+                connect(modem.get(), &Modem::simChanged, this, &Priv::simChanged);
+            }
+            p.endInsertRows();
+        }
+    }
+
+    QModelIndex findModem(QObject* o)
+    {
+        auto modem = qobject_cast<Modem*>(o);
+        for (auto i = m_modems.constBegin(); i != m_modems.constEnd(); ++i)
+        {
+            if (i->get() == modem)
+            {
+                return p.index(std::distance(m_modems.constBegin(), i));
+            }
+        }
+        return QModelIndex();
+    }
+
+public Q_SLOTS:
+    void simChanged(Sim *sim)
+    {
+        auto idx = findModem(sender());
+        p.dataChanged(idx, idx, {ModemsListModel::Roles::RoleSim});
+    }
+
+public:
+    ModemsListModel& p;
+    SimsListModel *m_sims;
+    QList<QDBusObjectPath> m_dbus_paths;
+    QList<Modem::SPtr> m_modems;
+
+    const QDBusConnection &m_connection;
+};
+
+ModemsListModel::ModemsListModel(const QDBusConnection& connection, SimsListModel *sims, QObject *parent) :
+    QAbstractListModel(parent),
+    d(new Priv(*this, connection))
+{
+    d->m_sims = sims;
+}
+
+ModemsListModel::~ModemsListModel()
+{
+}
+
+int ModemsListModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+int ModemsListModel::rowCount(const QModelIndex &) const
+{
+    return d->m_modems.size();
+}
+
+QVariant ModemsListModel::data(const QModelIndex &index, int role) const
+{
+    int row(index.row());
+    if (row < 0 || row >= d->m_modems.size())
+    {
+        return QVariant();
+    }
+
+    auto modem = d->m_modems.value(row);
+
+    switch (role)
+    {
+        case Roles::RoleIndex:
+            return modem->index();
+            break;
+        case Roles::RoleSerial:
+            return modem->serial();
+            break;
+        case Roles::RoleSim:
+            return QVariant::fromValue<Sim*>(modem->sim());
+            break;
+    }
+
+    return QVariant();
+}
+
+void ModemsListModel::updateModemDBusPaths(QList<QDBusObjectPath> values)
+{
+    d->updateModemDBusPaths(values);
+}
+
+
+}
+
+#include "modems-list-model.moc"

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/modems-list-model.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QAbstractItemModel>
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+
+#include <memory>
+
+namespace connectivityqt
+{
+
+class SimsListModel;
+
+class Q_DECL_EXPORT ModemsListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+
+    enum Roles
+    {
+        RoleIndex = Qt::UserRole + 1,
+        RoleSerial,
+        RoleSim
+    };
+
+    ModemsListModel(const QDBusConnection &connection, SimsListModel *sims, QObject *parent);
+
+    ~ModemsListModel();
+
+    int columnCount(const QModelIndex &parent) const override;
+
+    int rowCount(const QModelIndex &parent) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleIndex] = "Index";
+        roles[RoleSerial] = "Serial";
+        roles[RoleSim] = "Sim";
+        return roles;
+    }
+
+    void updateModemDBusPaths(QList<QDBusObjectPath> values);
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/path.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/path.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/path.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <connectivityqt/path.h>
+#include <QDBusObjectPath>
+
+#include <QDebug>
+
+namespace connectivityqt
+{
+
+class Path::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(Path& parent) :
+        p(parent)
+    {
+    }
+
+public Q_SLOTS:
+
+public:
+    Path& p;
+
+    QDBusObjectPath m_path;
+};
+
+Path::Path(QObject* parent)
+    : Path("", parent)
+{}
+
+Path::Path(const QString& path, QObject* parent) :
+        QObject(parent), d(new Priv(*this))
+{
+    setPath(path);
+}
+
+Path::Path(const Path& path, QObject* parent) :
+        QObject(parent), d(new Priv(*this))
+{
+    setPath(path.path());
+}
+
+
+Path::~Path()
+{
+}
+
+QString Path::path() const
+{
+    if (d->m_path == QDBusObjectPath("/"))
+        return "";
+    return d->m_path.path();
+}
+
+void Path::setPath(const QString &value)
+{
+    QString tmp = value;
+    if (tmp == "")
+    {
+        tmp = "/";
+    }
+    if (d->m_path == QDBusObjectPath(tmp))
+    {
+        return;
+    }
+    d->m_path = QDBusObjectPath(tmp);
+    Q_EMIT pathChanged(value);
+
+    /// @todo emit emptyChanged..
+}
+
+void Path::clear()
+{
+    setPath("");
+}
+
+bool Path::empty() const
+{
+    return d->m_path == QDBusObjectPath("/");
+}
+
+}
+
+#include "path.moc"

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/path.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/path.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/path.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <memory>
+
+namespace connectivityqt
+{
+
+class Q_DECL_EXPORT Path : public QObject
+{
+    Q_OBJECT
+
+public:
+    Path(QObject* parent = 0);
+    Path(const QString& path, QObject* parent = 0);
+    Path(const Path& path, QObject* parent = 0);
+    ~Path();
+
+    Q_PROPERTY(QString path READ path WRITE setPath NOTIFY pathChanged)
+    QString path() const;
+    void setPath(const QString &value);
+
+    Q_PROPERTY(bool empty READ empty NOTIFY emptyChanged)
+    bool empty() const;
+
+public Q_SLOTS:
+    void clear();
+
+Q_SIGNALS:
+    void pathChanged(const QString &value);
+    void emptyChanged(bool value);
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}
+
+Q_DECLARE_METATYPE(connectivityqt::Path*)

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,153 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <connectivityqt/internal/dbus-property-cache.h>
+#include <connectivityqt/sim.h>
+#include <dbus-types.h>
+
+#include <SimInterface.h>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class Sim::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(Sim& parent) :
+        p(parent)
+    {
+    }
+
+public Q_SLOTS:
+    void propertyChanged(const QString& name, const QVariant& value)
+    {
+        if (name == "Locked")
+        {
+            Q_EMIT p.lockedChanged(value.toBool());
+        } else if (name == "Present")
+        {
+            Q_EMIT p.presentChanged(value.toBool());
+        } else if (name == "DataRoamingEnabled")
+        {
+            Q_EMIT p.dataRoamingEnabledChanged(value.toBool());
+        } else {
+            qWarning() << "connectivityqt::Sim::Priv::propertyChanged(): "
+                       << "Unexpected property: " << name;
+        }
+
+    }
+
+public:
+    Sim& p;
+
+    unique_ptr<ComUbuntuConnectivity1SimInterface> m_simInterface;
+
+    internal::DBusPropertyCache::UPtr m_propertyCache;
+};
+
+Sim::Sim(const QDBusObjectPath& path, const QDBusConnection& connection, QObject* parent) :
+        QObject(parent), d(new Priv(*this))
+{
+    d->m_simInterface = make_unique<
+            ComUbuntuConnectivity1SimInterface>(
+            DBusTypes::DBUS_NAME, path.path(), connection);
+
+    d->m_propertyCache =
+            make_unique<internal::DBusPropertyCache>(
+                    DBusTypes::DBUS_NAME,
+                    ComUbuntuConnectivity1SimInterface::staticInterfaceName(),
+                    path.path(), connection);
+
+    connect(d->m_propertyCache.get(),
+                &internal::DBusPropertyCache::propertyChanged, d.get(),
+                &Priv::propertyChanged);
+}
+
+Sim::~Sim()
+{
+}
+
+QDBusObjectPath Sim::path() const
+{
+    return QDBusObjectPath(d->m_simInterface->path());
+}
+
+QString Sim::imsi() const
+{
+    return d->m_propertyCache->get("Imsi").toString();
+}
+
+QString Sim::primaryPhoneNumber() const
+{
+    return d->m_propertyCache->get("PrimaryPhoneNumber").toString();
+}
+
+QList<QString> Sim::phoneNumbers() const
+{
+    return d->m_propertyCache->get("PhoneNumbers").toStringList();
+}
+
+bool Sim::locked() const
+{
+    return d->m_propertyCache->get("Locked").toBool();
+}
+
+bool Sim::present() const
+{
+    return d->m_propertyCache->get("Present").toBool();
+}
+
+QString Sim::mcc() const
+{
+    return d->m_propertyCache->get("Mcc").toString();
+}
+
+QString Sim::mnc() const
+{
+    return d->m_propertyCache->get("Mnc").toString();
+}
+
+QList<QString> Sim::preferredLanguages() const
+{
+    return d->m_propertyCache->get("PreferredLanguages").toStringList();
+}
+
+bool Sim::dataRoamingEnabled() const
+{
+    return d->m_propertyCache->get("DataRoamingEnabled").toBool();
+}
+
+void Sim::setDataRoamingEnabled(bool value)
+{
+    d->m_propertyCache->set("DataRoamingEnabled", QVariant(value));
+}
+
+void Sim::unlock()
+{
+    d->m_simInterface->Unlock();
+}
+
+}
+
+#include "sim.moc"
+

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/sim.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/sim.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sim.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,90 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <QObject>
+
+#include <unity/util/DefinesPtrs.h>
+
+namespace connectivityqt
+{
+
+class Q_DECL_EXPORT Sim : public QObject
+{
+    Q_OBJECT
+
+public:
+    UNITY_DEFINES_PTRS(Sim);
+
+    Sim(const QDBusObjectPath& path, const QDBusConnection& connection, QObject* parent = 0);
+
+    virtual ~Sim();
+
+    Q_PROPERTY(QDBusObjectPath path READ path)
+    QDBusObjectPath path() const;
+
+    Q_PROPERTY(QString Imsi READ imsi CONSTANT)
+    QString imsi() const;
+
+    Q_PROPERTY(QString PrimaryPhoneNumber READ primaryPhoneNumber CONSTANT)
+    QString primaryPhoneNumber() const;
+
+    Q_PROPERTY(QList<QString> PhoneNumbers READ phoneNumbers CONSTANT)
+    QList<QString> phoneNumbers() const;
+
+    Q_PROPERTY(bool Locked READ locked NOTIFY lockedChanged)
+    bool locked() const;
+
+    Q_PROPERTY(bool Present READ present NOTIFY presentChanged)
+    bool present() const;
+
+    Q_PROPERTY(QString Mcc READ mcc CONSTANT)
+    QString mcc() const;
+
+    Q_PROPERTY(QString Mnc READ mnc CONSTANT)
+    QString mnc() const;
+
+    Q_PROPERTY(QList<QString> PreferredLanguages READ preferredLanguages CONSTANT)
+    QList<QString> preferredLanguages() const;
+
+    Q_PROPERTY(bool DataRoamingEnabled READ dataRoamingEnabled WRITE setDataRoamingEnabled NOTIFY dataRoamingEnabledChanged)
+    bool dataRoamingEnabled() const;
+    void setDataRoamingEnabled(bool value);
+
+public Q_SLOTS:
+
+    void unlock();
+
+Q_SIGNALS:
+    void lockedChanged(bool value);
+    void presentChanged(bool value);
+    void dataRoamingEnabledChanged(bool value);
+
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}
+
+Q_DECLARE_METATYPE(connectivityqt::Sim*)

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp'
--- src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,214 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#include <connectivityqt/sims-list-model.h>
+#include <connectivityqt/path.h>
+
+#include <QDebug>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class SimsListModel::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(SimsListModel& parent, const QDBusConnection &connection) :
+        p(parent),
+        m_connection(connection)
+    {
+    }
+
+    void updateSimDBusPaths(QList<QDBusObjectPath> values)
+    {
+        auto paths = values.toSet();
+
+        QSet<QDBusObjectPath> current;
+        for (const auto& m: m_sims)
+        {
+            current << m->path();
+        }
+
+        auto toRemove(current);
+        toRemove.subtract(paths);
+
+        auto toAdd(paths);
+        toAdd.subtract(current);
+
+        QMutableListIterator<Sim::SPtr> i(m_sims);
+        int idx = 0;
+        while (i.hasNext())
+        {
+            auto sim(i.next());
+            if (toRemove.contains(sim->path()))
+            {
+                p.beginRemoveRows(QModelIndex(), idx, idx);
+                i.remove();
+                p.endRemoveRows();
+            }
+            else
+            {
+                ++idx;
+            }
+        }
+
+        if (!toAdd.isEmpty())
+        {
+            p.beginInsertRows(QModelIndex(), m_sims.size(), m_sims.size() + toAdd.size() - 1);
+            for (const auto& path: toAdd)
+            {
+                auto sim = std::make_shared<Sim>(path, m_connection, this);
+                m_sims << sim;
+                connect(sim.get(), &Sim::lockedChanged, this, &Priv::lockedChanged);
+                connect(sim.get(), &Sim::presentChanged, this, &Priv::presentChanged);
+                connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Priv::dataRoamingEnabledChanged);
+            }
+            p.endInsertRows();
+        }
+    }
+
+    QModelIndex findSim(QObject* o)
+    {
+        auto sim = qobject_cast<Sim*>(o);
+        for (auto i = m_sims.constBegin(); i != m_sims.constEnd(); ++i)
+        {
+            if (i->get() == sim)
+            {
+                return p.index(std::distance(m_sims.constBegin(), i));
+            }
+        }
+        return QModelIndex();
+    }
+
+public Q_SLOTS:
+    void lockedChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RoleLocked});
+    }
+
+    void presentChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RolePresent});
+    }
+    void dataRoamingEnabledChanged()
+    {
+        auto idx = findSim(sender());
+        p.dataChanged(idx, idx, {SimsListModel::Roles::RoleDataRoamingEnabled});
+    }
+
+public:
+    SimsListModel& p;
+    QList<QDBusObjectPath> m_dbus_paths;
+    QList<Sim::SPtr> m_sims;
+
+    const QDBusConnection &m_connection;
+};
+
+SimsListModel::SimsListModel(const QDBusConnection& connection, QObject *parent) :
+    QAbstractListModel(parent),
+    d(new Priv(*this, connection))
+{
+}
+
+SimsListModel::~SimsListModel()
+{
+}
+
+int SimsListModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+int SimsListModel::rowCount(const QModelIndex &) const
+{
+    return d->m_sims.size();
+}
+
+QVariant SimsListModel::data(const QModelIndex &index, int role) const
+{
+    int row(index.row());
+    if (row < 0 || row >= d->m_sims.size())
+    {
+        return QVariant();
+    }
+
+    auto sim = d->m_sims.value(row);
+
+    switch (role)
+    {
+        case Roles::RoleImsi:
+            return sim->imsi();
+            break;
+        case Roles::RolePrimaryPhoneNumber:
+            return sim->primaryPhoneNumber();
+            break;
+        case Roles::RolePhoneNumbers:
+            return QVariant::fromValue<QStringList>(sim->phoneNumbers());
+            break;
+        case RoleLocked:
+            return sim->locked();
+            break;
+        case RolePresent:
+            return sim->present();
+            break;
+        case Roles::RoleMcc:
+            return sim->mcc();
+            break;
+        case Roles::RoleMnc:
+            return sim->mnc();
+        case Roles::RolePreferredLanguages:
+            return QVariant::fromValue<QStringList>(sim->preferredLanguages());
+            break;
+        case Roles::RoleDataRoamingEnabled:
+            return sim->dataRoamingEnabled();
+            break;
+        case Roles::RoleSimObject:
+            return QVariant::fromValue<Sim*>(sim.get());
+            break;
+    }
+
+
+    return QVariant();
+}
+
+void SimsListModel::updateSimDBusPaths(QList<QDBusObjectPath> values)
+{
+    d->updateSimDBusPaths(values);
+}
+
+Sim *SimsListModel::getSimByPath(const QDBusObjectPath &path) const
+{
+    for (auto sim : d->m_sims)
+    {
+        if (sim->path() == path) {
+            return sim.get();
+        }
+    }
+    return nullptr;
+}
+
+
+}
+
+#include "sims-list-model.moc"

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/sims-list-model.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2016 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser 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 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 program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *     Antti Kaijanmäki <[e-mail]>
+ */
+
+#pragma once
+
+#include <QAbstractItemModel>
+#include <QDBusConnection>
+#include <QDBusObjectPath>
+#include <connectivityqt/sim.h>
+
+#include <memory>
+
+namespace connectivityqt
+{
+
+class Q_DECL_EXPORT SimsListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+
+    enum Roles
+    {
+        RoleImsi = Qt::UserRole + 1,
+        RolePrimaryPhoneNumber,
+        RolePhoneNumbers,
+        RoleLocked,
+        RolePresent,
+        RoleMcc,
+        RoleMnc,
+        RolePreferredLanguages,
+        RoleDataRoamingEnabled,
+        RoleSimObject
+    };
+
+    SimsListModel(const QDBusConnection &connection, QObject *parent);
+
+    ~SimsListModel();
+
+    int columnCount(const QModelIndex &parent) const override;
+
+    int rowCount(const QModelIndex &parent) const override;
+
+    QVariant data(const QModelIndex &index, int role) const override;
+
+    QHash<int, QByteArray> roleNames() const override
+    {
+        QHash<int, QByteArray> roles;
+        roles[RoleImsi] = "Imsi";
+        roles[RolePrimaryPhoneNumber] = "PrimaryPhoneNumber";
+        roles[RolePhoneNumbers] = "PhoneNumbers";
+        roles[RoleLocked] = "Locked";
+        roles[RolePresent] = "Present";
+        roles[RoleMcc] = "Mcc";
+        roles[RoleMnc] = "Mnc";
+        roles[RolePreferredLanguages] = "PreferredLanguages";
+        roles[RoleDataRoamingEnabled] = "DataRoamingEnabled";
+        roles[RoleSimObject] = "SimObject";
+        return roles;
+    }
+
+    void updateSimDBusPaths(QList<QDBusObjectPath> values);
+
+    Sim *getSimByPath(const QDBusObjectPath &path) const;
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== modified file 'src/indicator/CMakeLists.txt'
--- src/indicator/CMakeLists.txt	2016-02-15 09:31:38 +0000
+++ src/indicator/CMakeLists.txt	2016-04-26 11:24:03 +0000
@@ -32,6 +32,9 @@
     nmofono/wifi/grouped-access-point.cpp
     nmofono/wifi/wifi-link-impl.cpp
     nmofono/wwan/modem.cpp
+    nmofono/wwan/sim.cpp
+    nmofono/wwan/sim-manager.cpp
+    nmofono/wwan/qofono-sim-wrapper.cpp
     nmofono/vpn/openvpn-connection.cpp
     nmofono/vpn/pptp-connection.cpp
     nmofono/vpn/vpn-connection.cpp
@@ -53,6 +56,8 @@
     connectivity-service/dbus-openvpn-connection.cpp
     connectivity-service/dbus-pptp-connection.cpp
     connectivity-service/dbus-vpn-connection.cpp
+    connectivity-service/dbus-modem.cpp
+    connectivity-service/dbus-sim.cpp
 
     menuitems/access-point-item.cpp
     menuitems/switch-item.cpp
@@ -73,6 +78,22 @@
 
 qt5_add_dbus_adaptor(
     NETWORK_SERVICE_SOURCES
+    "${DATA_DIR}/com.ubuntu.connectivity1.Modem.xml"
+    connectivity-service/dbus-modem.h
+    connectivity_service::DBusModem
+    ModemAdaptor
+)
+
+qt5_add_dbus_adaptor(
+    NETWORK_SERVICE_SOURCES
+    "${DATA_DIR}/com.ubuntu.connectivity1.Sim.xml"
+    connectivity-service/dbus-sim.h
+    connectivity_service::DBusSim
+    SimAdaptor
+)
+
+qt5_add_dbus_adaptor(
+    NETWORK_SERVICE_SOURCES
     "${DATA_DIR}/com.ubuntu.connectivity1.Private.xml"
     connectivity-service/connectivity-service.h
     connectivity_service::PrivateService

=== modified file 'src/indicator/connectivity-service/connectivity-service.cpp'
--- src/indicator/connectivity-service/connectivity-service.cpp	2016-01-14 11:40:59 +0000
+++ src/indicator/connectivity-service/connectivity-service.cpp	2016-04-26 11:24:03 +0000
@@ -19,6 +19,8 @@
  */
 
 #include <connectivity-service/connectivity-service.h>
+#include <connectivity-service/dbus-modem.h>
+#include <connectivity-service/dbus-sim.h>
 #include <connectivity-service/dbus-vpn-connection.h>
 #include <connectivity-service/dbus-openvpn-connection.h>
 #include <connectivity-service/dbus-pptp-connection.h>
@@ -48,6 +50,9 @@
 
     QMap<QDBusObjectPath, DBusVpnConnection::SPtr> m_vpnConnections;
 
+    QMap<QString, DBusModem::SPtr> m_modems;
+    QMap<QString, DBusSim::SPtr> m_sims;
+
     shared_ptr<PrivateService> m_privateService;
 
     QStringList m_limitations;
@@ -166,6 +171,111 @@
         });
     }
 
+    void mobileDataEnabledUpdated(bool value)
+    {
+        Q_UNUSED(value)
+        notifyPrivateProperties({
+            "MobileDataEnabled"
+        });
+    }
+
+    void simForMobileDataUpdated()
+    {
+        notifyPrivateProperties({
+            "SimForMobileData"
+        });
+    }
+
+    void updateSims()
+    {
+        qDebug() << "updateSims()";
+        auto current_imsis = m_sims.keys().toSet();
+        QMap<QString, nmofono::wwan::Sim::Ptr> sims;
+        for (auto i : m_manager->sims())
+        {
+            sims[i->imsi()] = i;
+        }
+        auto toAdd(sims.keys().toSet());
+        toAdd.subtract(current_imsis);
+
+        auto toRemove(current_imsis);
+        toRemove.subtract(sims.keys().toSet());
+
+        for (auto imsi : toRemove)
+        {
+            qDebug() << "Removing " << imsi;
+            m_sims.remove(imsi);
+        }
+
+        for (auto imsi : toAdd)
+        {
+            qDebug() << "Adding " << imsi;
+
+            DBusSim::SPtr dbussim = make_shared<DBusSim>(sims[imsi], m_connection);
+            m_sims[imsi] = dbussim;
+        }
+
+        notifyPrivateProperties({
+            "Sims"
+        });
+    }
+
+    void updateModems()
+    {
+        qDebug() << "updateModems() " << m_manager->modems().length();
+        auto current_serials = m_modems.keys().toSet();
+        QMap<QString, nmofono::wwan::Modem::Ptr> modems;
+        for (auto i : m_manager->modems())
+        {
+            modems[i->serial()] = i;
+       }
+        auto toAdd(modems.keys().toSet());
+        toAdd.subtract(current_serials);
+
+        auto toRemove(current_serials);
+        toRemove.subtract(modems.keys().toSet());
+
+        for (auto serial : toRemove)
+        {
+            qDebug() << "Removing " << serial;
+            m_modems.remove(serial);
+        }
+
+        for (auto serial : toAdd)
+        {
+            qDebug() << "Adding " << serial;
+
+            wwan::Modem::Ptr m = modems[serial];
+
+            DBusModem::SPtr dbusmodem = make_shared<DBusModem>(m, m_connection);
+            m_modems[serial] = dbusmodem;
+            qDebug() << "asdfghjklm,nghff: " << m_modems.size();
+            updateModemSimPath(dbusmodem, m->sim());
+            connect(m.get(), &wwan::Modem::simUpdated, this, &Private::modemSimUpdated);
+        }
+        notifyPrivateProperties({
+            "Modems"
+        });
+    }
+
+    void modemSimUpdated()
+    {
+        auto modem_raw = qobject_cast<wwan::Modem*>(sender());
+        updateModemSimPath(m_modems[modem_raw->serial()], modem_raw->sim());
+    }
+
+    void updateModemSimPath(DBusModem::SPtr modem, wwan::Sim::Ptr sim)
+    {
+        if (!sim)
+        {
+            modem->setSim(QDBusObjectPath("/"));
+        }
+        else
+        {
+            modem->setSim(m_sims[sim->imsi()]->path());
+        }
+    }
+
     void updateNetworkingStatus()
     {
         QStringList changed;
@@ -293,10 +403,17 @@
     connect(d->m_manager.get(), &Manager::hotspotAuthChanged, d.get(), &Private::hotspotAuthUpdated);
     connect(d->m_manager.get(), &Manager::hotspotStoredChanged, d.get(), &Private::hotspotStoredUpdated);
 
+    connect(d->m_manager.get(), &Manager::mobileDataEnabledChanged, d.get(), &Private::mobileDataEnabledUpdated);
+    connect(d->m_manager.get(), &Manager::simsChanged, d.get(), &Private::updateSims);
+    connect(d->m_manager.get(), &Manager::modemsChanged, d.get(), &Private::updateModems);
+    connect(d->m_manager.get(), &Manager::simForMobileDataChanged, d.get(), &Private::simForMobileDataUpdated);
+
     connect(d->m_manager.get(), &Manager::reportError, d->m_privateService.get(), &PrivateService::ReportError);
 
     connect(d->m_vpnManager.get(), &vpn::VpnManager::connectionsChanged, d.get(), &Private::updateVpnList);
 
+    d->updateSims();
+    d->updateModems();
     d->updateNetworkingStatus();
     d->updateVpnList();
 
@@ -508,6 +625,74 @@
     return paths;
 }
 
+bool PrivateService::mobileDataEnabled() const
+{
+    return p.d->m_manager->mobileDataEnabled();
+}
+
+void PrivateService::setMobileDataEnabled(bool enabled)
+{
+    p.d->m_manager->setMobileDataEnabled(enabled);
+}
+
+QDBusObjectPath PrivateService::simForMobileData() const
+{
+    wwan::Sim::Ptr sim = p.d->m_manager->simForMobileData();
+    if (!sim)
+    {
+        return QDBusObjectPath("/");
+    }
+
+    Q_ASSERT(p.d->m_sims.contains(sim->imsi()));
+    return p.d->m_sims[sim->imsi()]->path();
+}
+
+void PrivateService::setSimForMobileData(const QDBusObjectPath &path)
+{
+    if (path.path() == "/")
+    {
+        p.d->m_manager->setSimForMobileData(wwan::Sim::Ptr());
+        return;
+    }
+
+    bool found = false;
+    for (DBusSim::SPtr dbussim: p.d->m_sims)
+    {
+        if (dbussim->path() == path)
+        {
+            found = true;
+            p.d->m_manager->setSimForMobileData(dbussim->sim());
+        }
+    }
+
+    if (!found)
+    {
+        sendErrorReply(QDBusError::UnknownObject);
+    }
+}
+
+QList<QDBusObjectPath> PrivateService::modems() const
+{
+    auto list = QList<QDBusObjectPath>();
+    for (DBusModem::SPtr modem : p.d->m_modems)
+    {
+        list << modem->path();
+    }
+    qDebug() << "FGHJKLKJHG " << list.length();
+    return list;
+}
+
+QList<QDBusObjectPath> PrivateService::sims() const
+{
+    QList<QDBusObjectPath> paths;
+
+    for (auto dbussim : p.d->m_sims)
+    {
+        paths.append(dbussim->path());
+    }
+    return paths;
+}
+
 }
 
 #include "connectivity-service.moc"

=== modified file 'src/indicator/connectivity-service/connectivity-service.h'
--- src/indicator/connectivity-service/connectivity-service.h	2015-12-04 13:18:04 +0000
+++ src/indicator/connectivity-service/connectivity-service.h	2016-04-26 11:24:03 +0000
@@ -109,6 +109,18 @@
     Q_PROPERTY(QList<QDBusObjectPath> VpnConnections READ vpnConnections)
     QList<QDBusObjectPath> vpnConnections() const;
 
+    Q_PROPERTY(bool MobileDataEnabled READ mobileDataEnabled WRITE setMobileDataEnabled)
+    bool mobileDataEnabled() const;
+
+    Q_PROPERTY(QDBusObjectPath SimForMobileData READ simForMobileData WRITE setSimForMobileData)
+    QDBusObjectPath simForMobileData() const;
+
+    Q_PROPERTY(QList<QDBusObjectPath> Modems READ modems)
+    QList<QDBusObjectPath> modems() const;
+
+    Q_PROPERTY(QList<QDBusObjectPath> Sims READ sims)
+    QList<QDBusObjectPath> sims() const;
+
 protected Q_SLOTS:
     void UnlockAllModems();
 
@@ -132,6 +144,11 @@
 
     void RemoveVpnConnection(const QDBusObjectPath &path);
 
+    void setMobileDataEnabled(bool enabled);
+
+    void setSimForMobileData(const QDBusObjectPath &path);
+
+
 Q_SIGNALS:
     void ReportError(int reason);
 

=== added file 'src/indicator/connectivity-service/dbus-modem.cpp'
--- src/indicator/connectivity-service/dbus-modem.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/connectivity-service/dbus-modem.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright (C) 2015 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 <connectivity-service/dbus-modem.h>
+#include <ModemAdaptor.h>
+#include <dbus-types.h>
+#include <util/dbus-utils.h>
+
+using namespace std;
+using namespace nmofono::wwan;
+
+namespace connectivity_service
+{
+
+DBusModem::DBusModem(Modem::Ptr modem,
+                     const QDBusConnection& connection) :
+    m_modem(modem),
+    m_connection(connection)
+{
+    m_path.setPath(DBusTypes::modemPath(m_modem->serial()));
+
+    new ModemAdaptor(this);
+
+    registerDBusObject();
+}
+
+DBusModem::~DBusModem()
+{
+}
+
+void DBusModem::registerDBusObject()
+{
+    if (!m_connection.registerObject(m_path.path(), this))
+    {
+        qWarning() << "Unable to register Modem object" << m_path.path();
+    }
+}
+
+void DBusModem::notifyProperties(const QStringList& propertyNames)
+{
+    DBusUtils::notifyPropertyChanged(
+        m_connection,
+        *this,
+        m_path.path(),
+        ModemAdaptor::staticMetaObject.classInfo(ModemAdaptor::staticMetaObject.indexOfClassInfo("D-Bus Interface")).value(),
+        propertyNames
+    );
+}
+
+QDBusObjectPath DBusModem::sim() const
+{
+    return m_simpath;
+}
+
+void DBusModem::setSim(QDBusObjectPath path)
+{
+    if (m_simpath == path)
+    {
+        return;
+    }
+    m_simpath = path;
+    notifyProperties({"Sim"});
+}
+
+int DBusModem::index() const
+{
+    return m_modem->index();
+}
+
+
+QString DBusModem::serial() const
+{
+    return m_modem->serial();
+}
+
+QDBusObjectPath
+DBusModem::path() const
+{
+    return m_path;
+}
+
+}

=== added file 'src/indicator/connectivity-service/dbus-modem.h'
--- src/indicator/connectivity-service/dbus-modem.h	1970-01-01 00:00:00 +0000
+++ src/indicator/connectivity-service/dbus-modem.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2015 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]>
+ */
+
+#pragma once
+
+#include <nmofono/wwan/modem.h>
+
+#include <QDBusConnection>
+#include <QDBusContext>
+#include <QDBusObjectPath>
+#include <QObject>
+#include <QString>
+
+#include <unity/util/DefinesPtrs.h>
+
+class ModemAdaptor;
+
+namespace connectivity_service
+{
+
+class DBusModem: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(DBusModem)
+
+    friend ModemAdaptor;
+
+public:
+    UNITY_DEFINES_PTRS(DBusModem);
+
+    DBusModem(nmofono::wwan::Modem::Ptr modem, const QDBusConnection& connection);
+
+    virtual ~DBusModem();
+
+    Q_PROPERTY(int Index READ index)
+    int index() const;
+
+    Q_PROPERTY(QString Serial READ serial)
+    QString serial() const;
+
+    Q_PROPERTY(QDBusObjectPath Sim READ sim)
+    QDBusObjectPath sim() const;
+
+    void setSim(QDBusObjectPath path);
+
+    QDBusObjectPath path() const;
+
+Q_SIGNALS:
+
+protected Q_SLOTS:
+
+private:
+    void notifyProperties(const QStringList& propertyNames);
+
+protected:
+    void registerDBusObject();
+
+    nmofono::wwan::Modem::Ptr m_modem;
+
+    QDBusConnection m_connection;
+
+    QDBusObjectPath m_path;
+    QDBusObjectPath m_simpath;
+
+};
+
+}

=== added file 'src/indicator/connectivity-service/dbus-sim.cpp'
--- src/indicator/connectivity-service/dbus-sim.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/connectivity-service/dbus-sim.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,149 @@
+/*
+ * Copyright (C) 2015 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:
+ *     Pete Woods <[e-mail]>
+ */
+
+#include <connectivity-service/dbus-sim.h>
+#include <SimAdaptor.h>
+#include <dbus-types.h>
+#include <util/dbus-utils.h>
+
+#include <QDebug>
+
+using namespace std;
+using namespace nmofono::wwan;
+
+namespace connectivity_service
+{
+
+DBusSim::DBusSim(Sim::Ptr sim,
+                 const QDBusConnection& connection) :
+    m_sim(sim),
+    m_connection(connection)
+{
+    m_path.setPath(DBusTypes::simPath(m_sim->imsi()));
+
+    new SimAdaptor(this);
+
+    registerDBusObject();
+
+    connect(sim.get(), &Sim::lockedChanged, this, &DBusSim::lockedChanged);
+    connect(sim.get(), &Sim::presentChanged, this, &DBusSim::presentChanged);
+    connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &DBusSim::dataRoamingEnabledChanged);
+}
+
+DBusSim::~DBusSim()
+{
+}
+
+QDBusObjectPath DBusSim::path() const
+{
+    return m_path;
+}
+
+void DBusSim::registerDBusObject()
+{
+    if (!m_connection.registerObject(m_path.path(), this))
+    {
+        qWarning() << "Unable to register SIM object" << m_path.path();
+    }
+}
+
+void DBusSim::notifyProperties(const QStringList& propertyNames)
+{
+    DBusUtils::notifyPropertyChanged(
+        m_connection,
+        *this,
+        m_path.path(),
+        SimAdaptor::staticMetaObject.classInfo(SimAdaptor::staticMetaObject.indexOfClassInfo("D-Bus Interface")).value(),
+        propertyNames
+    );
+}
+
+QString DBusSim::imsi() const
+{
+    return m_sim->imsi();
+}
+
+QString DBusSim::primaryPhoneNumber() const
+{
+    return m_sim->primaryPhoneNumber();
+}
+
+bool DBusSim::locked() const
+{
+    return false;
+}
+
+bool DBusSim::present() const
+{
+    return m_sim->present();
+}
+
+QString DBusSim::mcc() const
+{
+    return m_sim->mcc();
+}
+
+QString DBusSim::mnc() const
+{
+    return m_sim->mnc();
+}
+
+QStringList DBusSim::preferredLanguages() const
+{
+    return m_sim->preferredLanguages();
+}
+
+bool DBusSim::dataRoamingEnabled() const
+{
+    return m_sim->dataRoamingEnabled();
+}
+
+void DBusSim::setDataRoamingEnabled(bool value) const
+{
+    m_sim->setDataRoamingEnabled(value);
+}
+
+void DBusSim::Unlock()
+{
+    m_sim->unlock();
+}
+
+void DBusSim::lockedChanged()
+{
+    notifyProperties({"Locked"});
+}
+
+void DBusSim::presentChanged()
+{
+    notifyProperties({"Present"});
+}
+
+void DBusSim::dataRoamingEnabledChanged()
+{
+    qDebug() << "DATAROAMINGENABLEDCHANGED";
+    notifyProperties({"DataRoamingEnabled"});
+}
+
+nmofono::wwan::Sim::Ptr DBusSim::sim() const
+{
+    return m_sim;
+}
+
+
+}

=== added file 'src/indicator/connectivity-service/dbus-sim.h'
--- src/indicator/connectivity-service/dbus-sim.h	1970-01-01 00:00:00 +0000
+++ src/indicator/connectivity-service/dbus-sim.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2015 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]>
+ */
+
+#pragma once
+
+#include <nmofono/wwan/sim.h>
+
+#include <QDBusConnection>
+#include <QDBusContext>
+#include <QDBusObjectPath>
+#include <QObject>
+#include <QString>
+
+#include <unity/util/DefinesPtrs.h>
+
+class SimAdaptor;
+
+namespace connectivity_service
+{
+
+class DBusSim: public QObject, protected QDBusContext
+{
+    Q_OBJECT
+    Q_DISABLE_COPY(DBusSim)
+
+    friend SimAdaptor;
+
+public:
+    UNITY_DEFINES_PTRS(DBusSim);
+
+    DBusSim(nmofono::wwan::Sim::Ptr sim, const QDBusConnection& connection);
+
+    virtual ~DBusSim();
+
+    Q_PROPERTY(QString Imsi READ imsi)
+    QString imsi() const;
+
+    Q_PROPERTY(QString PrimaryPhoneNumber READ primaryPhoneNumber)
+    QString primaryPhoneNumber() const;
+
+    Q_PROPERTY(bool Locked READ locked)
+    bool locked() const;
+
+    Q_PROPERTY(bool Present READ present)
+    bool present() const;
+
+    Q_PROPERTY(QString Mcc READ mcc)
+    QString mcc() const;
+
+    Q_PROPERTY(QString Mnc READ mnc)
+    QString mnc() const;
+
+    Q_PROPERTY(QStringList PreferredLanguages READ preferredLanguages)
+    QStringList preferredLanguages() const;
+
+    Q_PROPERTY(bool DataRoamingEnabled READ dataRoamingEnabled WRITE setDataRoamingEnabled)
+    bool dataRoamingEnabled() const;
+    void setDataRoamingEnabled(bool value) const;
+
+    QDBusObjectPath path() const;
+
+    nmofono::wwan::Sim::Ptr sim() const;
+
+Q_SIGNALS:
+
+protected Q_SLOTS:
+
+    void Unlock();
+
+    void lockedChanged();
+    void presentChanged();
+    void dataRoamingEnabledChanged();
+
+private:
+    void notifyProperties(const QStringList& propertyNames);
+
+protected:
+    void registerDBusObject();
+
+    nmofono::wwan::Sim::Ptr m_sim;
+
+    QDBusConnection m_connection;
+
+    QDBusObjectPath m_path;
+};
+
+}

=== modified file 'src/indicator/factory.cpp'
--- src/indicator/factory.cpp	2016-02-15 09:31:38 +0000
+++ src/indicator/factory.cpp	2016-04-26 11:24:03 +0000
@@ -155,9 +155,9 @@
     return make_unique<QuickAccessSection>(d->singletonNmofono(), flightModeSwitch);
 }
 
-unique_ptr<WwanSection> Factory::newWwanSection(SwitchItem::Ptr hotspotSwitch)
+unique_ptr<WwanSection> Factory::newWwanSection(SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch)
 {
-    return make_unique<WwanSection>(d->singletonNmofono(), hotspotSwitch);
+    return make_unique<WwanSection>(d->singletonNmofono(), mobileDataSwitch, hotspotSwitch);
 }
 
 unique_ptr<VpnSection> Factory::newVpnSection()
@@ -203,6 +203,16 @@
     return flightModeSwitch;
 }
 
+SwitchItem::UPtr Factory::newMobileDataSwitch()
+{
+    auto s = make_unique<SwitchItem>(_("Cellular data"), "mobiledata", "enabled");
+    auto manager = d->singletonNmofono();
+    //s->setState(manager->flightMode());
+    //QObject::connect(manager.get(), &nmofono::Manager::flightModeUpdated, flightModeSwitch.get(), &SwitchItem::setState);
+    //QObject::connect(flightModeSwitch.get(), &SwitchItem::stateUpdated, manager.get(), &nmofono::Manager::setFlightMode);
+    return s;
+}
+
 SwitchItem::UPtr Factory::newHotspotSwitch()
 {
     // TODO Move this into a new class

=== modified file 'src/indicator/factory.h'
--- src/indicator/factory.h	2016-02-15 09:31:38 +0000
+++ src/indicator/factory.h	2016-04-26 11:24:03 +0000
@@ -56,7 +56,7 @@
 
     virtual std::unique_ptr<QuickAccessSection> newQuickAccessSection(SwitchItem::Ptr flightModeSwitch);
 
-    virtual std::unique_ptr<WwanSection> newWwanSection(SwitchItem::Ptr hotspotSwitch);
+    virtual std::unique_ptr<WwanSection> newWwanSection(SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch);
 
     virtual std::unique_ptr<WifiSection> newWiFiSection(SwitchItem::Ptr wifiSwitch);
 
@@ -68,6 +68,8 @@
 
     virtual SwitchItem::UPtr newWifiSwitch();
 
+    virtual SwitchItem::UPtr newMobileDataSwitch();
+
     virtual SwitchItem::UPtr newFlightModeSwitch();
 
     virtual SwitchItem::UPtr newHotspotSwitch();

=== modified file 'src/indicator/menu-builder.cpp'
--- src/indicator/menu-builder.cpp	2015-10-06 10:14:57 +0000
+++ src/indicator/menu-builder.cpp	2016-04-26 11:24:03 +0000
@@ -43,6 +43,7 @@
     RootState::Ptr m_rootState;
 
     SwitchItem::Ptr m_flightModeSwitch;
+    SwitchItem::Ptr m_mobileDataSwitch;
     SwitchItem::Ptr m_hotspotSwitch;
     SwitchItem::Ptr m_wifiSwitch;
 
@@ -111,6 +112,7 @@
     d->m_ubiquityMenu = factory.newIndicatorMenu(d->m_rootState, "ubiquity");
 
     d->m_flightModeSwitch = factory.newFlightModeSwitch();
+    d->m_mobileDataSwitch = factory.newMobileDataSwitch();
     d->m_hotspotSwitch = factory.newHotspotSwitch();
     d->m_wifiSwitch = factory.newWifiSwitch();
 
@@ -125,7 +127,7 @@
             d.get(), &Priv::updateHotspotSwitch);
 
     d->m_quickAccessSection = factory.newQuickAccessSection(d->m_flightModeSwitch);
-    d->m_wwanSection = factory.newWwanSection(d->m_hotspotSwitch);
+    d->m_wwanSection = factory.newWwanSection(d->m_mobileDataSwitch, d->m_hotspotSwitch);
     d->m_wifiSection = factory.newWiFiSection(d->m_wifiSwitch);
     d->m_vpnSection = factory.newVpnSection();
 

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2016-04-06 09:30:45 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2016-04-26 11:24:03 +0000
@@ -20,6 +20,7 @@
 
 #include <nmofono/manager-impl.h>
 #include <nmofono/wifi/wifi-link-impl.h>
+#include <nmofono/wwan/sim-manager.h>
 #include <NetworkManagerActiveConnectionInterface.h>
 #include <NetworkManagerDeviceInterface.h>
 #include <NetworkManagerInterface.h>
@@ -30,6 +31,7 @@
 #include <qofono-qt5/qofonomanager.h>
 #include <qofono-qt5/qofonomodem.h>
 #undef slots
+#include <ofono/dbus.h>
 
 #include <notify-cpp/notification-manager.h>
 #include <notify-cpp/snapdecision/sim-unlock.h>
@@ -39,6 +41,7 @@
 #include <QMap>
 #include <QList>
 #include <QRegularExpression>
+#include <QSettings>
 #include <NetworkManager.h>
 #include <QDebug>
 #include <algorithm>
@@ -76,9 +79,113 @@
 
     HotspotManager::SPtr m_hotspotManager;
 
+    bool m_mobileDataEnabled = false;
+    bool m_mobileDataEnabledPending = false;
+
+    wwan::Sim::Ptr m_simForMobileData;
+    bool m_simForMobileDataPending = false;
+
+    QList<wwan::Modem::Ptr> m_modems;
+    QList<wwan::Sim::Ptr> m_sims;
+
+    wwan::SimManager::Ptr m_simManager;
+
+    QSettings *m_settings;
+
     Private(Manager& parent) :
         p(parent)
     {
+         m_simManager = make_shared<wwan::SimManager>();
+         m_sims = m_simManager->knownSims();
+         connect(m_simManager.get(), &wwan::SimManager::simAdded, this, &Private::simAdded);
+
+         m_settings = new QSettings(QSettings::IniFormat,
+                                    QSettings::UserScope,
+                                    "Ubuntu",
+                                    "connectivityservice",
+                                    this);
+        QVariant ret = m_settings->value("MobileDataEnabled");
+        if (ret.isNull())
+        {
+            /* This is the first time we are running on a system.
+             *
+             * We need to figure out the status of mobile data from looking
+             * at the individual modems.
+             */
+            m_mobileDataEnabledPending = true;
+            m_settings->setValue("MobileDataEnabled", true);
+        }
+        else
+        {
+            m_mobileDataEnabled = ret.toBool();
+        }
+
+        ret = m_settings->value("SimForMobileData");
+        if (ret.isNull())
+        {
+            /* This is the first time we are running on a system.
+             *
+             * We need to figure out the SIM used for mobile data
+             * from the individual modems.
+             */
+            m_simForMobileDataPending = true;
+            m_settings->setValue("SimForMobileData", QString());
+        }
+        else
+        {
+            QString imsi = ret.toString();
+            wwan::Sim::Ptr sim;
+            for(auto i = m_sims.begin(); i != m_sims.end(); i++)
+            {
+                if ((*i)->imsi() == imsi) {
+                    sim = *i;
+                    break;
+                }
+            }
+            m_simForMobileData = sim;
+        }
+
+    }
+
+    void matchModemsAndSims()
+    {
+        for (wwan::Modem::Ptr modem: m_modems)
+        {
+            bool match = false;
+            for(wwan::Sim::Ptr sim : m_sims)
+            {
+                if (sim->ofonoPath() == modem->ofonoPath())
+                {
+                    match = true;
+                    modem->setSim(sim);
+                    break;
+                }
+            }
+            if (!match)
+            {
+                modem->setSim(wwan::Sim::Ptr());
+            }
+        }
+    }
+
+    void simAdded(wwan::Sim::Ptr sim)
+    {
+        m_sims.append(sim);
+        matchModemsAndSims();
+        Q_EMIT p.simsChanged();
+    }
+
+    void modemReady()
+    {
+        wwan::Modem *modem_raw = qobject_cast<wwan::Modem*>(sender());
+        if (!modem_raw)
+        {
+            qWarning() << "modem cast failed.";
+            return;
+        }
+        m_modems.append(m_ofonoLinks[modem_raw->name()]);
+        matchModemsAndSims();
+        Q_EMIT p.modemsChanged();
     }
 
     void setUnstoppableOperationHappening(bool happening)
@@ -192,6 +299,8 @@
                 m_pendingUnlocks.removeOne(modem);
                 disconnect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
             }
+            m_modems.removeAll(modem);
+            Q_EMIT p.modemsChanged();
         }
 
         for (const auto& path : toAdd)
@@ -202,6 +311,7 @@
             auto modem = make_shared<wwan::Modem>(modemInterface);
             m_ofonoLinks[path] = modem;
             connect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
+            connect(modem.get(), &wwan::Modem::ready, this, &Private::modemReady);
         }
 
         Q_EMIT p.linksUpdated();
@@ -209,6 +319,69 @@
 
         updateModemAvailable();
     }
+
+    void setMobileDataEnabled(bool value) {
+        if (m_mobileDataEnabled == value)
+        {
+            return;
+        }
+
+        m_settings->setValue("MobileDataEnabled", value);
+        m_settings->sync();
+
+        m_mobileDataEnabled = value;
+        Q_EMIT p.mobileDataEnabledChanged(value);
+
+        if (m_mobileDataEnabled)
+        {
+            for (wwan::Modem::Ptr modem : m_modems)
+            {
+                if (modem->sim() && modem->sim() == m_simForMobileData)
+                {
+                    modem->sim()->setMobileDataEnabled(true);
+                }
+            }
+        }
+        else
+        {
+            for (wwan::Modem::Ptr modem : m_modems)
+            {
+                if (modem->sim()) {
+                    modem->sim()->setMobileDataEnabled(false);
+                }
+            }
+        }
+    }
+
+    void setSimForMobileData(wwan::Sim::Ptr sim) {
+        if (m_simForMobileData == sim)
+        {
+            return;
+        }
+
+        if (m_simForMobileData)
+        {
+            m_simForMobileData->setMobileDataEnabled(false);
+        }
+
+        if (!sim)
+        {
+            m_settings->setValue("SimForMobileData", "");
+        }
+        else
+        {
+            m_settings->setValue("SimForMobileData", sim->imsi());
+        }
+        m_settings->sync();
+
+        m_simForMobileData = sim;
+        if (m_simForMobileData)
+        {
+            m_simForMobileData->setMobileDataEnabled(true);
+        }
+
+        Q_EMIT p.simForMobileDataChanged();
+    }
 };
 
 void
@@ -652,6 +825,43 @@
     d->m_hotspotManager->setAuth(auth);
 }
 
+bool
+ManagerImpl::mobileDataEnabled() const
+{
+    return d->m_mobileDataEnabled;
+}
+
+void
+ManagerImpl::setMobileDataEnabled(bool value)
+{
+    d->setMobileDataEnabled(value);
+}
+
+wwan::Sim::Ptr
+ManagerImpl::simForMobileData() const
+{
+    return d->m_simForMobileData;
+}
+
+void
+ManagerImpl::setSimForMobileData(wwan::Sim::Ptr sim)
+{
+    d->setSimForMobileData(sim);
+}
+
+QList<wwan::Modem::Ptr>
+ManagerImpl::modems() const
+{
+    return d->m_modems;
+}
+
+QList<wwan::Sim::Ptr>
+ManagerImpl::sims() const
+{
+    return d->m_sims;
+}
+
+
 }
 
 #include "manager-impl.moc"

=== modified file 'src/indicator/nmofono/manager-impl.h'
--- src/indicator/nmofono/manager-impl.h	2015-10-06 10:19:30 +0000
+++ src/indicator/nmofono/manager-impl.h	2016-04-26 11:24:03 +0000
@@ -91,6 +91,14 @@
 
     QString hotspotAuth() const override;
 
+    bool mobileDataEnabled() const override;
+
+    wwan::Sim::Ptr simForMobileData() const override;
+
+    QList<wwan::Modem::Ptr> modems() const override;
+
+    QList<wwan::Sim::Ptr> sims() const override;
+
     void setHotspotEnabled(bool) override;
 
     void setHotspotSsid(const QByteArray&) override;
@@ -101,6 +109,10 @@
 
     void setHotspotAuth(const QString&) override;
 
+    void setMobileDataEnabled(bool) override;
+
+    void setSimForMobileData(wwan::Sim::Ptr) override;
+
 private Q_SLOTS:
     void device_added(const QDBusObjectPath &path);
     void device_removed(const QDBusObjectPath &path);

=== modified file 'src/indicator/nmofono/manager.h'
--- src/indicator/nmofono/manager.h	2015-09-15 12:35:22 +0000
+++ src/indicator/nmofono/manager.h	2016-04-26 11:24:03 +0000
@@ -23,6 +23,7 @@
 #include <nmofono/link.h>
 #include <nmofono/wifi/wifi-link.h>
 #include <nmofono/wwan/modem.h>
+#include <nmofono/wwan/sim.h>
 
 #include <memory>
 #include <QSet>
@@ -143,6 +144,19 @@
     Q_PROPERTY(QString hotspotAuth READ hotspotAuth WRITE setHotspotAuth NOTIFY hotspotAuthChanged)
     virtual QString hotspotAuth() const = 0;
 
+    Q_PROPERTY(bool mobileDataEnabled READ mobileDataEnabled WRITE setMobileDataEnabled NOTIFY mobileDataEnabledChanged)
+    virtual bool mobileDataEnabled() const = 0;
+
+    Q_PROPERTY(wwan::Sim::Ptr simForMobileData READ simForMobileData WRITE setSimForMobileData NOTIFY simForMobileDataChanged)
+    virtual wwan::Sim::Ptr simForMobileData() const = 0;
+
+    Q_PROPERTY(QList<wwan::Modem::Ptr> modems READ modems NOTIFY modemsChanged)
+    virtual QList<wwan::Modem::Ptr> modems() const = 0;
+
+    Q_PROPERTY(QList<wwan::Sim::Ptr> sims READ sims NOTIFY simsChanged)
+    virtual QList<wwan::Sim::Ptr> sims() const = 0;
+
+
 Q_SIGNALS:
     void flightModeUpdated(bool);
 
@@ -174,6 +188,14 @@
 
     void unstoppableOperationHappeningUpdated(bool);
 
+    void mobileDataEnabledChanged(bool);
+
+    void simForMobileDataChanged();
+
+    void modemsChanged();
+
+    void simsChanged();
+
 public Q_SLOTS:
     virtual void setWifiEnabled(bool) = 0;
 
@@ -189,6 +211,10 @@
 
     virtual void setHotspotAuth(const QString&) = 0;
 
+    virtual void setMobileDataEnabled(bool) = 0;
+
+    virtual void setSimForMobileData(wwan::Sim::Ptr) = 0;
+
 protected:
     /**
      * @brief The default constructor is protected.

=== modified file 'src/indicator/nmofono/wwan/modem.cpp'
--- src/indicator/nmofono/wwan/modem.cpp	2015-08-05 15:14:28 +0000
+++ src/indicator/nmofono/wwan/modem.cpp	2016-04-26 11:24:03 +0000
@@ -96,6 +96,10 @@
     bool m_requiredPinSet = false;
     bool m_retriesSet = false;
 
+    QString m_serial;
+    bool m_serialSet = false;
+    bool m_readyFired = false;
+
     QString m_operatorName;
     Modem::ModemStatus m_status;
     int8_t m_strength;
@@ -108,6 +112,8 @@
 
     QSet<QString> m_interfaces;
 
+    Sim::Ptr m_sim;
+
     shared_ptr<QOfonoConnectionManager> m_connectionManager;
     shared_ptr<QOfonoNetworkRegistration> m_networkRegistration;
     shared_ptr<QOfonoSimManager> m_simManager;
@@ -125,6 +131,9 @@
         connect(m_ofonoModem.get(), &QOfonoModem::interfacesChanged, this, &Private::interfacesChanged);
         interfacesChanged(m_ofonoModem->interfaces());
 
+        connect(m_ofonoModem.get(), &QOfonoModem::serialChanged, this, &Private::serialChanged);
+        serialChanged(m_ofonoModem->serial());
+
         /// @todo hook up with system-settings to allow changing the identifier.
         ///       for now just provide the defaults
         auto path = m_ofonoModem->modemPath();
@@ -154,6 +163,28 @@
             m_shouldTriggerUnlock = false;
             Q_EMIT p.readyToUnlock(p.name());
         }
+
+        if (m_serialSet && !m_readyFired)
+        {
+            m_readyFired = true;
+            Q_EMIT p.ready();
+        }
+    }
+
+    void serialChanged(const QString &value) {
+        if (m_serial == value)
+        {
+            return;
+        }
+        if (m_serialSet)
+        {
+            qWarning() << "Unexpected update on SERIAL: " << m_serial << ", " << value;
+        }
+
+        m_serial = value;
+        m_serialSet = true;
+
+        update();
     }
 
     void connectionManagerChanged(shared_ptr<QOfonoConnectionManager> conmgr)
@@ -662,6 +693,12 @@
 QString
 Modem::name() const
 {
+    return ofonoPath();
+}
+
+QString
+Modem::ofonoPath() const
+{
     return d->m_ofonoModem->modemPath();
 }
 
@@ -725,8 +762,32 @@
 {
     d->m_shouldTriggerUnlock = true;
 }
-}
-
+
+Sim::Ptr Modem::sim() const
+{
+    return d->m_sim;
+}
+
+void
+Modem::setSim(Sim::Ptr sim)
+{
+    if (d->m_sim == sim)
+    {
+        return;
+    }
+    d->m_sim = sim;
+    Q_EMIT simUpdated();
+}
+
+QString
+Modem::serial() const
+{
+    return d->m_serial;
+}
+
+
+
+}
 }
 
 #include "modem.moc"

=== modified file 'src/indicator/nmofono/wwan/modem.h'
--- src/indicator/nmofono/wwan/modem.h	2015-08-05 15:14:28 +0000
+++ src/indicator/nmofono/wwan/modem.h	2016-04-26 11:24:03 +0000
@@ -21,6 +21,8 @@
 
 #include <nmofono/wwan/wwan-link.h>
 
+#include <nmofono/wwan/sim.h>
+
 #include <map>
 #include <memory>
 
@@ -127,8 +129,12 @@
     const QString &simIdentifier() const;
 
     int index() const;
+    Sim::Ptr sim() const;
+    void setSim(Sim::Ptr sim);
+    QString serial() const;
 
     QString name() const override;
+    QString ofonoPath() const;
 
     WwanType wwanType() const override;
 
@@ -176,6 +182,10 @@
     void resetPinFailed(const QString& error);
 
     bool readyToUnlock(const QString& name);
+
+    void simUpdated();
+
+    void ready();
 };
 
 }

=== added file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp'
--- src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,251 @@
+/*
+ * Copyright (C) 2016 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 <nmofono/wwan/qofono-sim-wrapper.h>
+
+#include <ofono/dbus.h>
+
+using namespace std;
+
+namespace nmofono
+{
+namespace wwan
+{
+namespace
+{
+
+}
+
+class QOfonoSimWrapper::Private : public QObject, public std::enable_shared_from_this<Private>
+{
+    Q_OBJECT
+
+public:
+
+    QOfonoSimWrapper& p;
+    shared_ptr<QOfonoSimManager> m_simManager;
+
+    QString m_imsi;
+    QStringList m_phoneNumbers;
+    QString m_mcc;
+    QString m_mnc;
+    QStringList m_preferredLanguages;
+
+    bool m_present = false;
+
+    bool m_imsiSet = false;
+    bool m_phoneNumbersSet = false;
+    bool m_mccSet = false;
+    bool m_mncSet = false;
+    bool m_preferredLanguagesSet = false;
+
+
+    Private(QOfonoSimWrapper& parent, shared_ptr<QOfonoSimManager> simmgr)
+        : p(parent), m_simManager{simmgr}
+    {
+        connect(simmgr.get(), &QOfonoSimManager::presenceChanged, this, &Private::presentChanged);
+        connect(simmgr.get(), &QOfonoSimManager::subscriberIdentityChanged, this, &Private::imsiChanged);
+        connect(simmgr.get(), &QOfonoSimManager::mobileCountryCodeChanged, this, &Private::mccChanged);
+        connect(simmgr.get(), &QOfonoSimManager::mobileNetworkCodeChanged, this, &Private::mncChanged);
+        connect(simmgr.get(), &QOfonoSimManager::subscriberNumbersChanged, this, &Private::phoneNumbersChanged);
+        connect(simmgr.get(), &QOfonoSimManager::preferredLanguagesChanged, this, &Private::preferredLanguagesChanged);
+    }
+
+public Q_SLOTS:
+
+    void presentChanged(bool value)
+    {
+        if (m_present == value)
+        {
+            return;
+        }
+        m_present = value;
+        if (!m_present) {
+            m_imsiSet = false;
+            m_phoneNumbersSet = false;
+            m_mccSet = false;
+            m_mncSet = false;
+            m_preferredLanguagesSet = false;
+            Q_EMIT p.readyChanged(false);
+        }
+        Q_EMIT p.presentChanged(value);
+    }
+
+    void imsiChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_imsiSet)
+        {
+            qWarning() << "Unexpected update on IMSI: " << m_imsi << ", " << value;
+        }
+
+        m_imsi = value;
+        m_imsiSet = true;
+        if (p.ready())
+        {
+            Q_EMIT p.readyChanged(true);
+        }
+    }
+
+    void mccChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_mccSet)
+        {
+            qWarning() << "Unexpected update on MCC: " << m_mcc << ", " << value;
+        }
+
+
+        m_mcc = value;
+        m_mccSet = true;
+        if (p.ready())
+        {
+            Q_EMIT p.readyChanged(true);
+        }
+    }
+
+    void mncChanged(const QString &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_mncSet)
+        {
+            qWarning() << "Unexpected update on MNC: " << m_mnc << ", " << value;
+        }
+
+        m_mnc = value;
+        m_mncSet = true;
+        if (p.ready())
+        {
+            Q_EMIT p.readyChanged(true);
+        }
+    }
+
+    void phoneNumbersChanged(const QStringList &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_phoneNumbersSet)
+        {
+            qWarning() << "Unexpected update on Phone Numbers: " << m_phoneNumbers << ", " << value;
+        }
+
+
+        m_phoneNumbers = value;
+        m_phoneNumbersSet = true;
+        if (p.ready())
+        {
+            Q_EMIT p.readyChanged(true);
+        }
+    }
+
+    void preferredLanguagesChanged(const QStringList &value)
+    {
+        if (value.isEmpty())
+        {
+            return;
+        }
+
+        if (m_preferredLanguagesSet)
+        {
+            qWarning() << "Unexpected update on Preferred Languages: " << m_preferredLanguages << ", " << value;
+        }
+
+
+        m_preferredLanguages = value;
+        m_preferredLanguagesSet = true;
+        if (p.ready())
+        {
+            Q_EMIT p.readyChanged(true);
+        }
+    }
+};
+
+
+
+QOfonoSimWrapper::QOfonoSimWrapper(std::shared_ptr<QOfonoSimManager> simmgr)
+    : d{new Private(*this, simmgr)}
+{
+}
+
+QOfonoSimWrapper::~QOfonoSimWrapper()
+{}
+
+QString QOfonoSimWrapper::imsi() const
+{
+    return d->m_imsi;
+}
+
+bool QOfonoSimWrapper::present() const
+{
+    return d->m_present;
+}
+
+QString QOfonoSimWrapper::mcc() const
+{
+    return d->m_mcc;
+}
+
+QString QOfonoSimWrapper::mnc() const
+{
+    return d->m_mnc;
+}
+
+QStringList QOfonoSimWrapper::phoneNumbers() const
+{
+    return d->m_phoneNumbers;
+}
+
+QStringList QOfonoSimWrapper::preferredLanguages() const
+{
+    return d->m_preferredLanguages;
+}
+
+bool QOfonoSimWrapper::ready() const {
+    return d->m_imsiSet &&
+            d->m_phoneNumbersSet &&
+            d->m_mccSet &&
+            d->m_mncSet &&
+            d->m_preferredLanguagesSet;
+}
+
+std::shared_ptr<QOfonoSimManager> QOfonoSimWrapper::ofonoSimManager() const
+{
+    return d->m_simManager;
+}
+
+
+}
+}
+
+#include "qofono-sim-wrapper.moc"

=== added file 'src/indicator/nmofono/wwan/qofono-sim-wrapper.h'
--- src/indicator/nmofono/wwan/qofono-sim-wrapper.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/qofono-sim-wrapper.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2016 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]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QSettings>
+
+#include <memory>
+
+#define slots
+#include <qofono-qt5/qofonomodem.h>
+#include <qofono-qt5/qofonosimmanager.h>
+#undef slots
+
+class QOfonoModem;
+
+namespace nmofono
+{
+class ManagerImpl;
+
+namespace wwan
+{
+
+class QOfonoSimWrapper : public QObject
+{
+    Q_OBJECT
+
+    class Private;
+    std::shared_ptr<Private> d;
+
+public:
+
+    typedef std::shared_ptr<QOfonoSimWrapper> Ptr;
+    typedef std::weak_ptr<QOfonoSimWrapper> WeakPtr;
+
+    QOfonoSimWrapper() = delete;
+
+
+    QOfonoSimWrapper(std::shared_ptr<QOfonoSimManager> simmgr);
+    ~QOfonoSimWrapper();
+
+    QString imsi() const;
+    bool present() const;
+    QString mcc() const;
+    QString mnc() const;
+    QStringList phoneNumbers() const;
+    QStringList preferredLanguages() const;
+    bool ready() const;
+
+    std::shared_ptr<QOfonoSimManager> ofonoSimManager() const;
+
+
+Q_SIGNALS:
+
+    void presentChanged(bool value);
+    void readyChanged(bool value);
+};
+
+}
+}

=== added file 'src/indicator/nmofono/wwan/sim-manager.cpp'
--- src/indicator/nmofono/wwan/sim-manager.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/sim-manager.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,271 @@
+/*
+ * Copyright (C) 2016 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 <nmofono/wwan/sim-manager.h>
+
+#include <nmofono/wwan/qofono-sim-wrapper.h>
+
+#define slots
+#include <qofono-qt5/qofonomanager.h>
+#include <qofono-qt5/qofonomodem.h>
+#include <qofono-qt5/qofonosimmanager.h>
+#undef slots
+#include <ofono/dbus.h>
+
+using namespace std;
+
+namespace nmofono
+{
+namespace wwan
+{
+namespace
+{
+
+}
+
+class SimManager::Private : public QObject, public std::enable_shared_from_this<Private>
+{
+    Q_OBJECT
+
+public:
+
+    SimManager& p;
+
+    QMap<QString, Sim::Ptr> m_knownSims;
+
+    shared_ptr<QOfonoManager> m_ofono;
+    QMap<QString, shared_ptr<QOfonoModem>> m_ofonoModems;
+    QMap<QString, QOfonoSimWrapper::Ptr> m_wrappers;
+
+    QSettings *m_settings;
+
+    Private(SimManager& parent)
+        : p(parent)
+    {
+        m_settings = new QSettings(QSettings::IniFormat,
+                                   QSettings::UserScope,
+                                   "Ubuntu",
+                                   "connectivityservice",
+                                   this);
+
+        QVariant ret;
+        ret = m_settings->value("KnownSims");
+        if (ret.isNull())
+        {
+            /* This is the first time we are running on a system.
+             */
+            m_settings->setValue("KnownSims", QVariant(QVariant::StringList));
+        }
+        else
+        {
+            QStringList imsis = ret.toStringList();
+            for(auto imsi : imsis) {
+                auto sim = wwan::Sim::createFromSettings(m_settings, imsi);
+                connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Private::simDataRoamingEnabledChanged);
+                if (!sim)
+                {
+                    continue;
+                }
+                m_knownSims[sim->imsi()] = sim;
+            }
+        }
+
+        m_ofono = make_shared<QOfonoManager>();
+        connect(m_ofono.get(), &QOfonoManager::modemsChanged, this, &Private::modemsChanged);
+        modemsChanged(m_ofono->modems());
+    }
+
+public Q_SLOTS:
+
+    void modemsChanged(const QStringList& value)
+    {
+        QSet<QString> modemPaths(value.toSet());
+        QSet<QString> currentModemPaths(m_ofonoModems.keys().toSet());
+
+        auto toRemove = currentModemPaths;
+        toRemove.subtract(modemPaths);
+
+        auto toAdd = modemPaths;
+        toAdd.subtract(currentModemPaths);
+
+        for (const auto& path : toRemove)
+        {
+            if (!m_ofonoModems.contains(path))
+            {
+                qWarning("Something went horribly wrong.");
+                continue;
+            }
+            auto modem = m_ofonoModems.take(path);
+            if (m_wrappers.contains(path))
+            {
+                auto wrapper = m_wrappers[path];
+                if (m_knownSims.contains(wrapper->imsi()))
+                {
+                    auto sim = m_knownSims[wrapper->imsi()];
+                    sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
+                }
+                m_wrappers.remove(path);
+            }
+        }
+
+        for (const auto& path : toAdd)
+        {
+            auto modem = make_shared<QOfonoModem>();
+            modem->setModemPath(path);
+
+            if (m_ofonoModems.contains(path))
+            {
+                qWarning("Something went horribly wrong.");
+            }
+            m_ofonoModems[path] = modem;
+
+            connect(modem.get(), &QOfonoModem::interfacesChanged, this, &Private::modemInterfacesChanged);
+            // use Q_EMIT to get the sender() set.
+            Q_EMIT modem->interfacesChanged(modem->interfaces());
+        }
+    }
+
+    void modemInterfacesChanged() {
+        QOfonoModem *modem = qobject_cast<QOfonoModem*>(sender());
+        if (!modem)
+        {
+            qWarning() << "Unable to cast sender().";
+            return;
+        }
+
+        QSet<QString> interfaces(modem->interfaces().toSet());
+        if (interfaces.contains(OFONO_SIM_MANAGER_INTERFACE))
+        {
+            if (!m_wrappers.contains(modem->modemPath()))
+            {
+                auto simmgr = make_shared<QOfonoSimManager>();
+                simmgr->setModemPath(modem->modemPath());
+
+                auto wrapper = make_shared<wwan::QOfonoSimWrapper>(simmgr);
+
+                connect(wrapper.get(), &wwan::QOfonoSimWrapper::presentChanged, this, &Private::ofonoSimPresentChanged);
+                connect(wrapper.get(), &wwan::QOfonoSimWrapper::readyChanged, this, &Private::ofonoSimReady);
+
+                m_wrappers[modem->modemPath()] = wrapper;
+            }
+
+        } else {
+            if (m_wrappers.contains(modem->modemPath()))
+            {
+                auto wrapper = m_wrappers[modem->modemPath()];
+                if (m_knownSims.contains(wrapper->imsi()))
+                {
+                    auto sim = m_knownSims[wrapper->imsi()];
+                    sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
+                }
+                m_wrappers.remove(modem->modemPath());
+            }
+        }
+    }
+
+    void ofonoSimPresentChanged(bool present)
+    {
+        auto wrapper = qobject_cast<QOfonoSimWrapper*>(sender());
+        if (!wrapper) {
+            qWarning("casting failed.");
+        }
+
+        if (!present) {
+            if (m_knownSims.contains(wrapper->imsi()))
+            {
+                auto sim = m_knownSims[wrapper->imsi()];
+                sim->setOfonoSimManager(std::shared_ptr<QOfonoSimManager>());
+            }
+        }
+    }
+
+    void ofonoSimReady(bool value)
+    {
+        if (!value)
+        {
+            // handled in present changed
+            return;
+        }
+
+        auto wrapper = qobject_cast<wwan::QOfonoSimWrapper*>(sender());
+        if (!wrapper)
+        {
+            qWarning("casting failed.");
+            return;
+        }
+
+        auto wrappers = m_wrappers;
+
+        bool found = false;
+        for (auto i : m_knownSims.values())
+        {
+            if (wrapper->imsi() == i->imsi())
+            {
+                found = true;
+                i->setOfonoSimManager(wrapper->ofonoSimManager());
+                break;
+            }
+        }
+        if (!found)
+        {
+            auto sim = Sim::fromQOfonoSimWrapper(wrapper);
+            connect(sim.get(), &Sim::dataRoamingEnabledChanged, this, &Private::simDataRoamingEnabledChanged);
+            wwan::Sim::saveToSettings(m_settings, sim);
+            m_knownSims[sim->imsi()] = sim;
+            m_settings->setValue("KnownSims", QVariant(m_knownSims.keys()));
+            Q_EMIT p.simAdded(sim);
+        }
+    }
+
+    void simDataRoamingEnabledChanged(bool value)
+    {
+        Q_UNUSED(value)
+
+        auto sim_raw = qobject_cast<Sim*>(sender());
+        auto sim = m_knownSims[sim_raw->imsi()];
+        if (!sim)
+        {
+            qWarning("foobar");
+            return;
+        }
+        Sim::saveToSettings(m_settings, sim);
+    }
+
+};
+
+
+
+SimManager::SimManager()
+    : d{new Private(*this)}
+{
+}
+
+SimManager::~SimManager()
+{}
+
+QList<Sim::Ptr>
+SimManager::knownSims() const
+{
+    return d->m_knownSims.values();
+}
+
+}
+}
+
+#include "sim-manager.moc"

=== added file 'src/indicator/nmofono/wwan/sim-manager.h'
--- src/indicator/nmofono/wwan/sim-manager.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/sim-manager.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2016 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]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QSettings>
+
+#include <memory>
+
+#include "sim.h"
+
+namespace nmofono
+{
+namespace wwan
+{
+
+class SimManager : public QObject
+{
+    Q_OBJECT
+
+    class Private;
+    std::shared_ptr<Private> d;
+
+public:
+
+    typedef std::shared_ptr<SimManager> Ptr;
+    typedef std::weak_ptr<SimManager> WeakPtr;
+
+    SimManager();
+    ~SimManager();
+
+    QList<Sim::Ptr> knownSims() const;
+
+Q_SIGNALS:
+    void simAdded(Sim::Ptr sim);
+};
+
+}
+}

=== added file 'src/indicator/nmofono/wwan/sim.cpp'
--- src/indicator/nmofono/wwan/sim.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/sim.cpp	2016-04-26 11:24:03 +0000
@@ -0,0 +1,582 @@
+/*
+ * Copyright (C) 2016 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 <nmofono/wwan/sim.h>
+
+#include <ofono/dbus.h>
+
+#define slots
+#include <qofono-qt5/qofonoconnectionmanager.h>
+#undef slots
+
+using namespace std;
+
+namespace nmofono
+{
+namespace wwan
+{
+namespace
+{
+
+}
+
+Sim::Ptr
+Sim::createFromSettings(QSettings *settings, const QString &imsi)
+{
+    settings->beginGroup(QString("Sims/%1/").arg(imsi));
+    QVariant primaryPhoneNumber_var = settings->value("PrimaryPhoneNumber");
+    QVariant mcc_var = settings->value("Mcc");
+    QVariant mnc_var = settings->value("Mnc");
+    QVariant preferredLanguages_var = settings->value("PreferredLanguages");
+    QVariant dataRoamingEnabled_var = settings->value("DataRoamingEnabled");
+    settings->endGroup();
+
+    if (imsi.isNull() ||
+            primaryPhoneNumber_var.isNull() ||
+            mcc_var.isNull() ||
+            mnc_var.isNull() ||
+            preferredLanguages_var.isNull() ||
+            dataRoamingEnabled_var.isNull())
+    {
+        qWarning() << "Corrupt settings for SIM: " << imsi;
+        settings->remove(QString("Sims/%1/").arg(imsi));
+        return Sim::Ptr();
+    }
+
+    return Sim::Ptr(new Sim(imsi,
+                            primaryPhoneNumber_var.toString(),
+                            mcc_var.toString(),
+                            mnc_var.toString(),
+                            preferredLanguages_var.toStringList(),
+                            dataRoamingEnabled_var.toBool()));
+}
+
+void
+Sim::saveToSettings(QSettings *settings, Sim::Ptr sim)
+{
+    settings->beginGroup(QString("Sims/%1/").arg(sim->imsi()));
+    settings->setValue("PrimaryPhoneNumber", QVariant(sim->primaryPhoneNumber()));
+    settings->setValue("Mcc", sim->mcc());
+    settings->setValue("Mnc", sim->mnc());
+    settings->setValue("PreferredLanguages", QVariant(sim->preferredLanguages()));
+    settings->setValue("DataRoamingEnabled", sim->dataRoamingEnabled());
+    settings->endGroup();
+    settings->sync();
+}
+
+Sim::Ptr Sim::fromQOfonoSimWrapper(const QOfonoSimWrapper *wrapper)
+{
+    auto sim = Sim::Ptr(new Sim(wrapper->imsi(),
+                                wrapper->phoneNumbers().first(), // default to the first number
+                                wrapper->mcc(),
+                                wrapper->mnc(),
+                                wrapper->preferredLanguages(),
+                                false));
+    sim->setOfonoSimManager(wrapper->ofonoSimManager());
+    return sim;
+}
+
+class Sim::Private : public QObject, public std::enable_shared_from_this<Private>
+{
+    Q_OBJECT
+
+public:
+
+    Sim& p;
+
+    Sim::PinType m_requiredPin;
+    RetriesType m_retries;
+    Sim::Status m_status = Sim::Status::missing;
+
+    bool m_requiredPinSet = false;
+    bool m_retriesSet = false;
+    bool m_statusSet = false;
+
+    int m_index = -1;
+
+    QString m_simIdentifier;
+
+    shared_ptr<QOfonoSimManager> m_simManager;
+    shared_ptr<QOfonoConnectionManager> m_connManager;
+
+    bool m_shouldTriggerUnlock = false;
+
+    QSet<QString> m_interfaces;
+
+    QTimer m_updatedTimer;
+
+    QString m_imsi;
+    QString m_primaryPhoneNumber;
+    QString m_mcc;
+    QString m_mnc;
+    QStringList m_preferredLanguages;
+    bool m_dataRoamingEnabled;
+    bool m_mobileDataEnabled = false;
+
+    bool m_locked = false;
+
+    Private(Sim &parent)
+        : p(parent)
+    {
+    }
+
+    Private(Sim& parent, shared_ptr<QOfonoSimManager> simmgr)
+        : p(parent)
+    {
+        simManagerChanged(simmgr);
+
+
+        /// @todo hook up with system-settings to allow changing the identifier.
+        if (m_simIdentifier.isEmpty())
+        {
+            setSimIdentifier(m_primaryPhoneNumber);
+        }
+
+        // Throttle the updates using a timer
+        m_updatedTimer.setInterval(0);
+        m_updatedTimer.setSingleShot(true);
+        connect(&m_updatedTimer, &QTimer::timeout, this, &Private::fireUpdate);
+    }
+
+public Q_SLOTS:
+
+    void fireUpdate()
+    {
+        Q_EMIT p.updated(p);
+
+        if (p.isReadyToUnlock() && m_shouldTriggerUnlock)
+        {
+            m_shouldTriggerUnlock = false;
+            Q_EMIT p.readyToUnlock(p.ofonoPath());
+        }
+    }
+
+    void simManagerChanged(shared_ptr<QOfonoSimManager> simmgr)
+    {
+        if (m_simManager == simmgr)
+        {
+            return;
+        }
+
+        m_simManager = simmgr;
+        if (m_simManager)
+        {
+            connect(m_simManager.get(),
+                    &QOfonoSimManager::pinRequiredChanged, this,
+                    &Private::update);
+
+            connect(m_simManager.get(),
+                    &QOfonoSimManager::pinRetriesChanged, this,
+                    &Private::update);
+
+            connect(m_simManager.get(),
+                    &QOfonoSimManager::enterPinComplete, this,
+                    &Private::enterPinComplete);
+
+            connect(m_simManager.get(),
+                    &QOfonoSimManager::resetPinComplete, this,
+                    &Private::resetPinComplete);
+        }
+
+        update();
+
+        Q_EMIT p.presentChanged(m_simManager.get() != nullptr);
+    }
+
+    void connManagerChanged(shared_ptr<QOfonoConnectionManager> connmgr)
+    {
+        if (m_connManager == connmgr)
+        {
+            return;
+        }
+
+        m_connManager = connmgr;
+        if (m_connManager)
+        {
+            connect(m_connManager.get(),
+                    &QOfonoConnectionManager::poweredChanged, this,
+                    &Private::update);
+            connect(m_connManager.get(),
+                    &QOfonoConnectionManager::roamingAllowedChanged, this,
+                    &Private::update);
+
+            m_connManager->setPowered(m_mobileDataEnabled);
+            m_connManager->setRoamingAllowed(m_dataRoamingEnabled);
+        }
+
+        update();
+    }
+
+    void update()
+    {
+        if (m_simManager) {
+            // update requiredPin
+            switch(m_simManager->pinRequired())
+            {
+            case QOfonoSimManager::PinType::NoPin:
+                setRequiredPin(PinType::none);
+                break;
+            case QOfonoSimManager::PinType::SimPin:
+                setRequiredPin(PinType::pin);
+                break;
+            case QOfonoSimManager::PinType::SimPuk:
+                setRequiredPin(PinType::puk);
+                break;
+            default:
+                throw std::runtime_error("Ofono requires a PIN we have not been prepared to handle (" +
+                                         to_string(m_simManager->pinRequired()) +
+                                         "). Bailing out.");
+            }
+
+            m_requiredPinSet = true;
+
+            bool retriesWasSet = true;
+            // update retries
+            RetriesType tmp;
+            QVariantMap retries = m_simManager->pinRetries();
+            QMapIterator<QString, QVariant> i(retries);
+            while (i.hasNext()) {
+                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:
+                        tmp[Sim::PinType::pin] = count;
+                        break;
+                    case QOfonoSimManager::PinType::SimPuk:
+                        tmp[Sim::PinType::puk] = count;
+                        break;
+                    default:
+                        break;
+                }
+            }
+            setRetries(tmp);
+
+            m_retriesSet = retriesWasSet;
+
+        } else {
+            setRequiredPin(PinType::none);
+            setRetries({});
+
+            m_requiredPinSet = false;
+            m_retriesSet = false;
+        }
+
+        if (m_connManager)
+        {
+            bool powered = m_connManager->powered();
+            bool roamingAllowed = m_connManager->roamingAllowed();
+
+            /*
+             * Connectivity Service is the policy manager for the system.
+             * If ofono has different settings force them back to stored values.
+             */
+            if (m_mobileDataEnabled != powered)
+            {
+                m_connManager->setPowered(m_mobileDataEnabled);
+            }
+            if (m_dataRoamingEnabled != roamingAllowed)
+            {
+                m_connManager->setRoamingAllowed(m_dataRoamingEnabled);
+            }
+        }
+        else
+        {
+            /* empty */
+        }
+    }
+
+    void enterPinComplete(QOfonoSimManager::Error error, const QString &errorString)
+    {
+        if (error == QOfonoSimManager::Error::NoError)
+        {
+            Q_EMIT p.enterPinSuceeded();
+        }
+        else
+        {
+            Q_EMIT p.enterPinFailed(errorString);
+        }
+    }
+
+    void resetPinComplete(QOfonoSimManager::Error error, const QString &errorString)
+    {
+        if (error == QOfonoSimManager::Error::NoError)
+        {
+            Q_EMIT p.resetPinSuceeded();
+        }
+        else
+        {
+            Q_EMIT p.resetPinFailed(errorString);
+        }
+    }
+
+    void setSimIdentifier(const QString& simIdentifier)
+    {
+        if (m_simIdentifier == simIdentifier)
+        {
+            return;
+        }
+
+        m_simIdentifier = simIdentifier;
+        Q_EMIT p.simIdentifierUpdated(m_simIdentifier);
+    }
+
+    void setRequiredPin(Sim::PinType requiredPin)
+    {
+        if (m_requiredPin == requiredPin)
+        {
+            return;
+        }
+
+        m_requiredPin = requiredPin;
+        Q_EMIT p.requiredPinUpdated(m_requiredPin);
+    }
+
+    void setRetries(const RetriesType& retries)
+    {
+        if (m_retries == retries)
+        {
+            return;
+        }
+
+        m_retries = retries;
+        Q_EMIT p.retriesUpdated();
+    }
+
+    void setStatus(Sim::Status value)
+    {
+        if (m_status == value)
+        {
+            return;
+        }
+
+        m_status = value;
+        Q_EMIT p.statusUpdated();
+    }
+
+    void setOfono(std::shared_ptr<QOfonoSimManager> simmgr)
+    {
+        simManagerChanged(simmgr);
+        if (simmgr)
+        {
+            m_connManager = std::make_shared<QOfonoConnectionManager>(this);
+            connManagerChanged(m_connManager);
+        }
+        else
+        {
+            m_connManager = std::shared_ptr<QOfonoConnectionManager>();
+            connManagerChanged(m_connManager);
+        }
+    }
+
+
+};
+
+Sim::Sim(const QString &imsi,
+         const QString &primaryPhoneNumber,
+         const QString &mcc,
+         const QString &mnc,
+         const QStringList &preferredLanguages,
+         bool dataRoamingEnabled)
+    : d{new Private(*this)}
+{
+    d->m_imsi = imsi;
+    d->m_primaryPhoneNumber = primaryPhoneNumber;
+    d->m_mcc = mcc;
+    d->m_mnc = mnc;
+    d->m_preferredLanguages = preferredLanguages;
+    d->m_dataRoamingEnabled = dataRoamingEnabled;
+}
+
+Sim::~Sim()
+{}
+
+void
+Sim::enterPin(PinType type, const QString &pin)
+{
+    if (!d->m_simManager)
+    {
+        throw std::runtime_error(std::string(__PRETTY_FUNCTION__) + ": no simManager.");
+    }
+
+    switch(type) {
+    case PinType::none:
+        break;
+    case PinType::pin:
+        d->m_simManager->enterPin(QOfonoSimManager::PinType::SimPin,
+                                pin);
+        break;
+    case PinType::puk:
+        d->m_simManager->enterPin(QOfonoSimManager::PinType::SimPuk,
+                                pin);
+        break;
+    }
+}
+
+
+void
+Sim::resetPin(PinType type, const QString &puk, const QString &pin)
+{
+    if (!d->m_simManager) {
+        throw std::runtime_error(std::string(__PRETTY_FUNCTION__) + ": no simManager.");
+    }
+
+    switch(type) {
+    case PinType::none:
+        break;
+    case PinType::puk:
+        d->m_simManager->resetPin(QOfonoSimManager::PinType::SimPuk,
+                                puk,
+                                pin);
+        break;
+    default:
+        throw std::runtime_error(std::string(__PRETTY_FUNCTION__) + ": Not Supported.");
+    }
+}
+
+Sim::PinType
+Sim::requiredPin() const
+{
+    return d->m_requiredPin;
+}
+
+const Sim::RetriesType&
+Sim::retries() const
+{
+    return d->m_retries;
+}
+
+const QString&
+Sim::simIdentifier() const
+{
+    return d->m_simIdentifier;
+}
+
+bool
+Sim::isReadyToUnlock() const
+{
+    return d->m_statusSet && d->m_requiredPinSet && d->m_retriesSet
+            && (d->m_requiredPin != PinType::none);
+}
+
+void
+Sim::notifyWhenReadyToUnlock()
+{
+    d->m_shouldTriggerUnlock = true;
+}
+
+
+Sim::Status Sim::status() const
+{
+    return d->m_status;
+}
+
+QString Sim::imsi() const
+{
+    return d->m_imsi;
+}
+
+QString Sim::primaryPhoneNumber() const
+{
+    return d->m_primaryPhoneNumber;
+}
+
+bool Sim::locked() const
+{
+    return d->m_locked;
+}
+
+bool Sim::present() const
+{
+    return d->m_simManager.get() != nullptr;
+}
+
+QString Sim::mcc() const
+{
+    return d->m_mcc;
+}
+
+QString Sim::mnc() const
+{
+    return d->m_mnc;
+}
+
+QList<QString> Sim::preferredLanguages() const
+{
+    return d->m_preferredLanguages;
+}
+
+bool Sim::dataRoamingEnabled() const
+{
+    return d->m_dataRoamingEnabled;
+}
+
+void Sim::setDataRoamingEnabled(bool value)
+{
+    if (d->m_dataRoamingEnabled == value)
+        return;
+    d->m_dataRoamingEnabled = value;
+    Q_EMIT dataRoamingEnabledChanged(value);
+}
+
+bool Sim::mobileDataEnabled() const
+{
+    return d->m_mobileDataEnabled;
+}
+
+void Sim::setMobileDataEnabled(bool value)
+{
+    if (d->m_mobileDataEnabled == value)
+        return;
+    d->m_mobileDataEnabled = value;
+    if (d->m_connManager)
+    {
+        d->m_connManager->setPowered(d->m_mobileDataEnabled);
+    }
+    Q_EMIT mobileDataEnabledChanged(value);
+}
+
+void Sim::unlock()
+{
+
+}
+
+QString Sim::ofonoPath() const
+{
+    if (d->m_simManager) {
+        return d->m_simManager->objectPath();
+    }
+    return QString();
+}
+
+void Sim::setOfonoSimManager(std::shared_ptr<QOfonoSimManager> simmgr)
+{
+    d->setOfono(simmgr);
+}
+
+
+}
+}
+
+#include "sim.moc"

=== added file 'src/indicator/nmofono/wwan/sim.h'
--- src/indicator/nmofono/wwan/sim.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/wwan/sim.h	2016-04-26 11:24:03 +0000
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2016 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]>
+ */
+
+#pragma once
+
+#include <QObject>
+#include <QSettings>
+
+#include <memory>
+
+#define slots
+#include <qofono-qt5/qofonomodem.h>
+#include <qofono-qt5/qofonosimmanager.h>
+#undef slots
+
+#include <nmofono/wwan/qofono-sim-wrapper.h>
+
+class QOfonoModem;
+
+namespace nmofono
+{
+class ManagerImpl;
+
+namespace wwan
+{
+
+class Sim : public QObject
+{
+    Q_OBJECT
+
+    class Private;
+    std::shared_ptr<Private> d;
+
+public:
+
+    typedef std::shared_ptr<Sim> Ptr;
+    typedef std::weak_ptr<Sim> WeakPtr;
+
+    enum class PinType
+    {
+        none,
+        pin,
+        puk
+    };
+
+    enum class Status
+    {
+        missing,
+        error,
+        locked,
+        permanentlyLocked,
+        ready,
+        not_available
+    };
+
+    Sim() = delete;
+
+    static Sim::Ptr createFromSettings(QSettings*, const QString &imsi);
+    static void saveToSettings(QSettings *, Sim::Ptr);
+
+    static Sim::Ptr fromQOfonoSimWrapper(const QOfonoSimWrapper *wrapper);
+
+private:
+    Sim(const QString &imsi,
+        const QString &primaryPhoneNumber,
+        const QString &mcc,
+        const QString &mnc,
+        const QStringList &preferredLanguages,
+        bool dataRoamingEnabled);
+
+public:
+    ~Sim();
+    void setOfonoSimManager(std::shared_ptr<QOfonoSimManager> simmgr);
+
+
+    Q_PROPERTY(Sim::PinType requiredPin READ requiredPin NOTIFY requiredPinUpdated)
+    PinType requiredPin() const;
+
+    typedef std::map<Sim::PinType, int> RetriesType;
+    Q_PROPERTY(RetriesType retries READ retries NOTIFY retriesUpdated)
+    const RetriesType &retries() const;
+
+    Q_PROPERTY(QString simIdentifier READ simIdentifier NOTIFY simIdentifierUpdated)
+    const QString &simIdentifier() const;
+
+    Q_PROPERTY(Sim::Status status READ status NOTIFY statusUpdated)
+    Status status() const;
+
+    Q_PROPERTY(QString imsi READ imsi CONSTANT)
+    QString imsi() const;
+
+    Q_PROPERTY(QString primaryPhoneNumber READ primaryPhoneNumber CONSTANT)
+    QString primaryPhoneNumber() const;
+
+    Q_PROPERTY(bool locked READ locked NOTIFY lockedChanged)
+    bool locked() const;
+
+    Q_PROPERTY(bool present READ present NOTIFY presentChanged)
+    bool present() const;
+
+    Q_PROPERTY(QString mcc READ mcc CONSTANT)
+    QString mcc() const;
+
+    Q_PROPERTY(QString mnc READ mnc CONSTANT)
+    QString mnc() const;
+
+    Q_PROPERTY(QList<QString> preferredLanguages READ preferredLanguages CONSTANT)
+    QList<QString> preferredLanguages() const;
+
+    Q_PROPERTY(bool dataRoamingEnabled READ dataRoamingEnabled WRITE setDataRoamingEnabled NOTIFY dataRoamingEnabledChanged)
+    bool dataRoamingEnabled() const;
+    void setDataRoamingEnabled(bool value);
+
+    Q_PROPERTY(bool mobileDataEnabled READ mobileDataEnabled WRITE setMobileDataEnabled NOTIFY mobileDataEnabledChanged)
+    bool mobileDataEnabled() const;
+    void setMobileDataEnabled(bool value);
+
+    bool isReadyToUnlock() const;
+
+    void notifyWhenReadyToUnlock();
+
+    void enterPin(PinType type,
+                  const QString &pin);
+
+    void resetPin(PinType type,
+                  const QString &puk,
+                  const QString &pin);
+
+    QString ofonoPath() const;
+
+public Q_SLOTS:
+    void unlock();
+
+Q_SIGNALS:
+
+    void requiredPinUpdated(PinType);
+
+    void retriesUpdated();
+
+    void simIdentifierUpdated(const QString &);
+
+    void updated(const Sim& sim);
+
+    void enterPinSuceeded();
+
+    void enterPinFailed(const QString& error);
+
+    void resetPinSuceeded();
+
+    void resetPinFailed(const QString& error);
+
+    bool readyToUnlock(const QString& name);
+
+    void statusUpdated();
+
+    void lockedChanged(bool value);
+
+    void presentChanged(bool value);
+
+    void dataRoamingEnabledChanged(bool value);
+
+    void mobileDataEnabledChanged(bool value);
+};
+
+}
+}

=== modified file 'src/indicator/sections/wwan-section.cpp'
--- src/indicator/sections/wwan-section.cpp	2016-02-12 14:25:16 +0000
+++ src/indicator/sections/wwan-section.cpp	2016-04-26 11:24:03 +0000
@@ -54,13 +54,14 @@
 
     Manager::Ptr m_manager;
 
+    SwitchItem::Ptr m_mobileDataSwitch;
     SwitchItem::Ptr m_hotspotSwitch;
     TextItem::Ptr m_openCellularSettings;
 
     QMap<wwan::Modem::Ptr, WwanLinkItem::Ptr> m_items;
 
     Private() = delete;
-    Private(Manager::Ptr modemManager, SwitchItem::Ptr hotspotSwitch);
+    Private(Manager::Ptr modemManager, SwitchItem::Ptr mobileDataSwitch ,SwitchItem::Ptr hotspotSwitch);
 
 public Q_SLOTS:
     void modemsChanged();
@@ -77,8 +78,8 @@
     }
 };
 
-WwanSection::Private::Private(Manager::Ptr modemManager, SwitchItem::Ptr hotspotSwitch)
-    : QObject(nullptr), m_manager{modemManager}, m_hotspotSwitch{hotspotSwitch}
+WwanSection::Private::Private(Manager::Ptr modemManager, SwitchItem::Ptr mobileDataSwitch,SwitchItem::Ptr hotspotSwitch)
+    : QObject(nullptr), m_manager{modemManager}, m_mobileDataSwitch{mobileDataSwitch}, m_hotspotSwitch{hotspotSwitch}
 {
     m_actionGroupMerger = make_shared<ActionGroupMerger>();
     m_menuMerger = make_shared<MenuMerger>();
@@ -91,6 +92,9 @@
     m_menuMerger->append(m_linkMenuMerger);
     m_menuMerger->append(m_bottomMenu);
 
+    m_upperMenu->append(m_mobileDataSwitch->menuItem());
+    m_actionGroupMerger->add(m_mobileDataSwitch->actionGroup());
+
     // have the modem list in their own section.
     m_topItem = MenuItem::newSection(m_menuMerger);
     m_topMenu = make_shared<Menu>();
@@ -186,8 +190,8 @@
     }
 }
 
-WwanSection::WwanSection(nmofono::Manager::Ptr manager, SwitchItem::Ptr hotspotSwitch)
-    : d{new Private(manager, hotspotSwitch)}
+WwanSection::WwanSection(nmofono::Manager::Ptr manager, SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch)
+    : d{new Private(manager, mobileDataSwitch, hotspotSwitch)}
 {
 }
 

=== modified file 'src/indicator/sections/wwan-section.h'
--- src/indicator/sections/wwan-section.h	2015-08-14 15:52:39 +0000
+++ src/indicator/sections/wwan-section.h	2016-04-26 11:24:03 +0000
@@ -30,7 +30,7 @@
 
 public:
     typedef std::shared_ptr<WwanSection> Ptr;
-    explicit WwanSection(nmofono::Manager::Ptr modemManager, SwitchItem::Ptr hotspotSwitch);
+    explicit WwanSection(nmofono::Manager::Ptr modemManager, SwitchItem::Ptr mobileDataSwitch, SwitchItem::Ptr hotspotSwitch);
     virtual ~WwanSection();
 
     virtual ActionGroup::Ptr actionGroup();

=== modified file 'src/qdbus-stubs/dbus-types.h'
--- src/qdbus-stubs/dbus-types.h	2015-11-20 13:14:50 +0000
+++ src/qdbus-stubs/dbus-types.h	2016-04-26 11:24:03 +0000
@@ -47,6 +47,19 @@
         return path.arg(counter++);
     }
 
+    inline QString modemPath(const QString &serial)
+    {
+        static QString path{"/com/ubuntu/connectivity1/modem/%1"};
+        return path.arg(serial);
+    }
+
+    inline QString simPath(const QString &imsi)
+    {
+        static QString path{"/com/ubuntu/connectivity1/sim/%1"};
+        return path.arg(imsi);
+    }
+
+
     static constexpr char const* WPASUPPLICANT_DBUS_NAME = "fi.w1.wpa_supplicant1";
 
     static constexpr char const* WPASUPPLICANT_DBUS_INTERFACE = "fi.w1.wpa_supplicant1";

=== added file 'tests/data/phonesim/sim_general.xml'
--- tests/data/phonesim/sim_general.xml	1970-01-01 00:00:00 +0000
+++ tests/data/phonesim/sim_general.xml	2016-04-26 11:24:03 +0000
@@ -0,0 +1,3677 @@
+<?xml version="1.0"?>
+<simulator>
+
+<!-- Phone simulator definition file for the "Qt Extended Pseudo Phone" -->
+
+<!-- Note: dialing 199 will cause a dialback to simulate an incoming call -->
+<!-- Note: dialing 177 will cause a dialback to simulate an incoming call, and hangup after 5 seconds -->
+<!-- Note: dialing 166 will accept the incoming call and hangup up after 5 seconds-->
+<!-- Note: dialing 155 will elicit a 'BUSY' response from the recipient-->
+<!-- Note: dialing 05123xx cause an MT disconnect of the connected call after xx seconds-->
+<!-- Note: dialing 06123xx cause an automatic accept after xx seconds-->
+
+<!-- Initialize state variables -->
+
+    <!-- Advice of charge -->
+    <!-- Call Meter -->
+    <set name="AOC" value="000000"/>
+
+    <!-- Call Meter reporting -->
+    <set name="AOCMODE" value="1"/>
+
+    <!-- Accumulated Call Meter -->
+    <set name="ACM" value="000480"/>
+
+    <!-- Accumulated Call Meter Maximum -->
+    <set name="ACMMAX" value="000500"/>
+
+    <!-- Price per Unit and Currency -->
+    <set name="PPU" value='GBP","2.66'/>
+
+    <!-- Battery Capacity
+    first value
+	0-powered by battery
+	1-battery connected, powered by charger
+	2-no battery.
+
+    second value is percentage battery remaining.
+	0-exhausted
+	1-99-partial charge
+	100-fully charged.
+     -->
+    <set name="BC" value="0,100"/>
+
+    <!-- Signal Quality -->
+    <set name="SQ" value="31,99"/>
+
+    <!-- Manufacturer -->
+    <set name="GMI" value="Ubuntu"/>
+
+    <!-- Model -->
+    <set name="GMM" value="Synthetic Device"/>
+
+    <!-- Revision -->
+    <set name="GMR" value="REV1"/>
+
+    <!-- Serial number -->
+    <set name="GSN" value="5647382910"/>
+
+    <!-- SIM card id -->
+    <set name="IMSI" value="123123123"/>
+
+    <!-- Identifier for ATI command -->
+    <set name="ID" value="Ubuntu Phone Simulator"/>
+
+    <!-- Character set -->
+    <set name="SCS" value="IRA"/>
+
+    <!-- Type of address (local = 129, international = 145) -->
+    <set name="STA" value="129"/>
+
+    <!-- Service reporting control flag -->
+    <set name="CR" value="0"/>
+
+    <!-- Cellular result code control flag -->
+    <set name="CRC" value="0"/>
+
+    <!-- Extended error message string -->
+    <set name="ERR" value="EXTENDED ERROR STRING"/>
+
+    <!-- Network registration presentation flag -->
+    <set name="REG" value="1,0"/>
+
+    <!-- GPRS network registration presentation flag -->
+    <set name="GREG" value="0"/>
+
+    <!-- Mobile phone operator selection mode (0=auto, 1=manual, 2=deregister, 3=set only <format>, 4=manual / automatic) -->
+    <set name="OPMODE" value="0"/>
+
+    <!-- Mobile phone operator selection format (0=long alphanumeric, 1=short alphanumeric, 2=numeric -->
+    <set name="OPFORMAT" value="0"/>
+
+    <!-- GCF Operator List, format <status(1:available,2:current,3:forbidden)>,"<alphanum.operator name>","<short operator name>","<MCC/MNC num>"-->
+    <set name="OP1" value="T-Ubuntu"/>
+    <set name="OP1PLMN" value="23401"/>
+    <set name="OP1STATE" value="2"/>
+
+    <set name="OP2" value="Maybe Forbidden Net"/>
+    <set name="OP2PLMN" value="23402"/>
+    <set name="OP2STATE" value="3"/>
+
+    <set name="OP3" value="Competitor Net"/>
+    <set name="OP3PLMN" value="23403"/>
+    <set name="OP3STATE" value="3"/>
+
+    <set name="OP4" value="Blocked Net"/>
+    <set name="OP4PLMN" value="23404"/>
+    <set name="OP4STATE" value="3"/>
+
+    <set name="OP5" value="Inaccessible Net"/>
+    <set name="OP5PLMN" value="23405"/>
+    <set name="OP5STATE" value="3"/>
+
+    <set name="OP6" value="Phone Net"/>
+    <set name="OP6PLMN" value="23406"/>
+    <set name="OP6STATE" value="1"/>
+
+    <set name="OP7" value="Teleco Net"/>
+    <set name="OP7PLMN" value="24681"/>
+    <set name="OP7STATE" value="1"/>
+
+    <set name="OP8" value="Mobile Net"/>
+    <set name="OP8PLMN" value="24682"/>
+    <set name="OP8STATE" value="1"/>
+
+    <set name="OP9" value="IMSI Unknown"/>
+    <set name="OP9PLMN" value="24683"/>
+    <set name="OP9STATE" value="1"/>
+
+    <set name="OP10" value="NotAllowed"/>
+    <set name="OP10PLMN" value="24684"/>
+    <set name="OP10STATE" value="1"/>
+
+    <set name="OP11" value="NoService"/>
+    <set name="OP11PLMN" value="24685"/>
+    <set name="OP11STATE" value="1"/>
+
+    <!-- Preferred Operators -->
+    <set name="PO1" value="1,2,23401"/>
+    <set name="PO2" value="2,2,23402"/>
+
+    <!-- Name of current mobile phone operator -->
+    <set name="OP" value="${OP1}"/>
+    <set name="OPPLMN" value="${OP1PLMN}"/>
+
+    <!-- Calling line identification presentation flag -->
+    <set name="LIP" value="0"/>
+
+    <!-- Calling line identification restriction flag -->
+    <set name="LIR" value="0"/>
+    <set name="LIR_STATUS" value="3"/>
+
+    <!-- Originating line identification presentation flag -->
+    <set name="OLP" value="0"/>
+
+    <!-- Call waiting presentation mode -->
+    <set name="CWA_V" value="1"/>
+    <set name="CWA_D" value="0"/>
+    <set name="CWA_F" value="0"/>
+
+    <!-- Call forwarding -->
+    <set name="CF0C1" value="0"/>
+    <set name="CF0C2" value="0"/>
+    <set name="CF0C4" value="0"/>
+    <set name="CF0C8" value="0"/>
+    <set name="CF1C1" value="0"/>
+    <set name="CF1C2" value="0"/>
+    <set name="CF1C4" value="0"/>
+    <set name="CF1C8" value="0"/>
+    <set name="CF2C1" value="0"/>
+    <set name="CF2C2" value="0"/>
+    <set name="CF2C4" value="0"/>
+    <set name="CF2C8" value="0"/>
+    <set name="CF3C1" value="0"/>
+    <set name="CF3C2" value="0"/>
+    <set name="CF3C4" value="0"/>
+    <set name="CF3C8" value="0"/>
+    <set name="CF0C1T" value="129"/>
+    <set name="CF1C1T" value="129"/>
+    <set name="CF2C1T" value="129"/>
+    <set name="CF3C1T" value="129"/>
+    <set name="CF2C1O" value="20"/>
+
+    <!-- Service Center Address -->
+    <set name="SCA" value="[phone]"/>
+    <set name="SCAT" value="145"/>
+
+    <!-- Fixed Dialling presentation mode -->
+    <set name="FD" value="0"/>
+
+    <!-- Unstructured service presentation mode -->
+    <set name="USD" value="0"/>
+
+    <!-- Supplementary service notification flags -->
+    <set name="SSN" value="0,0"/>
+
+    <!-- Phone activity status (ready = 0, ringing = 3, call active = 4) -->
+    <set name="PAS" value="0"/>
+
+    <!-- Phone functionality power consumption level (minimal = 0, full = 1) -->
+    <set name="FUN" value="4"/>
+
+    <!-- Mobile equipment control modes -->
+    <set name="MEC" value="0,0,0"/>
+
+    <!-- Mobile equipment event reporting modes -->
+    <set name="MER" value="0,0,0,0,0"/>
+
+    <!-- Ericsson-style call monitoring status values -->
+    <set name="ECAM" value="0"/>
+
+    <!-- SMS text vs PDU message format (1 = text, 0 = PDU) -->
+    <set name="CMGF" value="0"/>
+
+    <!-- Error reporting mode -->
+    <set name="MEE" value="0"/>
+
+    <!-- SMS message list -->
+    <set name="MSGLIST" value=""/>
+    <set name="MSGLISTCOPY" value=""/>
+    <set name="MSGMEM" value="SM"/>
+
+    <!-- Number of messages in the SMS message list -->
+    <set name="MSGCOUNT" value="0"/>
+
+    <!-- Identifier for the current call -->
+    <set name="CALLID" value="1"/>
+
+    <!-- Name of the PIN that is required (eg. "PIN") -->
+    <!-- READY: PIN/PUK not required; SIM PIN: PIN required; SIM PUK: PUK REQUIRED -->
+    <set name="PINNAME" value="READY"/>
+
+    <!-- Value of the PIN that is required -->
+    <set name="PINVALUE" value="1234"/>
+
+    <!-- How many times can PIN unlocking be attempted -->
+    <set name="PINRETRYCOUNT" value="3"/>
+
+    <!-- pin protection status -->
+    <set name="SC" value="0"/>
+
+    <!-- Value of the PIN2 that is required -->
+    <set name="PIN2VALUE" value="5678"/>
+
+    <!-- Value of the PUK that is required -->
+    <set name="PUKVALUE" value="1234567890"/>
+
+    <!-- Value of the PUK2 that is required -->
+    <set name="PUK2VALUE" value="01010101"/>
+
+    <!-- Value of the PSPIN that is required -->
+    <set name="PSPINVALUE" value="5550"/>
+
+    <!-- phone to sim pin protection status -->
+    <set name="PS" value="0"/>
+
+    <!-- Value of the SIM PIN2 that is required -->
+    <set name="SIMPIN2VALUE" value="666777"/>
+
+    <!-- Call Barring -->
+    <set name="BARVAO" value="0"/>
+    <set name="BARVOI" value="0"/>
+    <set name="BARVOX" value="0"/>
+    <set name="BARVAI" value="0"/>
+    <set name="BARVIR" value="0"/>
+    <set name="BARVNT" value="0"/>
+    <set name="BARVNM" value="0"/>
+    <set name="BARVNS" value="0"/>
+    <set name="BARVNA" value="0"/>
+    <set name="BARVAB" value="0"/>
+    <set name="BARVAG" value="0"/>
+    <set name="BARVAC" value="0"/>
+
+    <!-- accessories, handsfree and car.  0 means not connected, 1 for connected -->
+    <set name="HANDSFREE" value="0"/>
+
+    <set name="CARHANDSFREE" value="0"/>
+
+    <!-- list of available bands -->
+    <set name="BAND0" value="GSM &amp; EGSM"/>
+    <set name="BAND1" value="GSM 1800"/>
+    <set name="BAND2" value="Dualband 900/1800"/>
+    <set name="BAND3" value="PCS 1900"/>
+    <set name="BAND4" value="GSM 850"/>
+    <set name="BAND5" value="Dualband 1900/850"/>
+    <set name="BAND6" value=""/>
+    <set name="BAND7" value=""/>
+    <set name="BAND8" value=""/>
+    <set name="BAND9" value=""/>
+    <set name="BANDA" value=""/>
+    <set name="BANDB" value=""/>
+    <set name="BANDC" value=""/>
+    <set name="BANDD" value=""/>
+    <set name="BANDE" value=""/>
+    <set name="BANDF" value=""/>
+
+    <!-- current band.  0 means automatic and 1,"name" means manually select "name" -->
+    <set name="BAND" value="0"/>
+
+    <!-- Loudspeaker Volume Level -->
+    <set name="LVL" value="125"/>
+
+    <!-- Muting control -->
+    <set name="MUT" value="0"/>
+
+    <!-- CGSMS Bearer control -->
+    <set name="CGSMS" value="3"/>
+
+    <!-- TTY (hearing impared) state -->
+    <set name="PTTY" value="1"/>
+
+    <!-- Positioning reporting state -->
+    <set name="CPOSR" value="0"/>
+
+    <!-- SIM insertion state -->
+    <set name="SIMSTATE" value="1"/>
+
+<!-- Time -->
+<!-- Enable for testing
+<unsolicited delay="3000" once="true">*TTZ: 2, "11/25/2007, 12:12:12+40", 0</unsolicited>
+<unsolicited delay="3000" once="true">*TTZ: 2, "Cingluar", 0</unsolicited>
+-->
+
+<!-- GSM 07.07: General commands -->
+
+<chat>
+    <!-- Get manufacturer identifier -->
+    <command>AT+CGMI</command>
+    <response>${GMI}\n\nOK</response>
+</chat>
+
+<chat>
+    <!-- Get manufacturer identifier support check -->
+    <command>AT+CGMI=?</command>
+    <response>OK</response>
+</chat>
+
+<chat>
+    <!-- Get manufacturer identifier, V.25ter version -->
+    <command>AT+GMI</command>
+    <response>${GMI}\n\nOK</response>