Merge lp:~unity-api-team/indicator-network/connectivity-service-mobile-data-management into lp:indicator-network

[Antti Kaijanmäki]

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

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

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:583
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/424/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/75/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/76/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-02-15 09:31:38 +0000
+++ CMakeLists.txt	2016-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +0000
@@ -0,0 +1,7 @@
+#!/bin/sh
+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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +0000
@@ -0,0 +1,9 @@
+#!/bin/sh
+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
+/bin/sh ./get-sim-for-mobile-data.sh

=== modified file 'src/indicator/CMakeLists.txt'
--- src/indicator/CMakeLists.txt	2016-02-15 09:31:38 +0000
+++ src/indicator/CMakeLists.txt	2016-05-16 07:44:17 +0000
@@ -20,6 +20,7 @@
 set(NETWORK_SERVICE_SOURCES
     ${NETWORK_SERVICE_HEADERS}
 
+    nmofono/connectivity-service-settings.cpp
     nmofono/hotspot-manager.cpp
     nmofono/kill-switch.cpp
     nmofono/manager.cpp
@@ -32,6 +33,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 +57,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 +79,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-05-16 07:44:17 +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,102 @@
         });
     }
 
+    void mobileDataEnabledUpdated(bool value)
+    {
+        Q_UNUSED(value)
+        notifyPrivateProperties({
+            "MobileDataEnabled"
+        });
+    }
+
+    void simForMobileDataUpdated()
+    {
+        notifyPrivateProperties({
+            "SimForMobileData"
+        });
+    }
+
+    void 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)
+        {
+            m_sims.remove(imsi);
+        }
+
+        for (auto imsi : toAdd)
+        {
+            DBusSim::SPtr dbussim = make_shared<DBusSim>(sims[imsi], m_connection);
+            m_sims[imsi] = dbussim;
+        }
+
+        notifyPrivateProperties({
+            "Sims"
+        });
+    }
+
+    void updateModems()
+    {
+        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)
+        {
+            m_modems.remove(serial);
+        }
+
+        for (auto serial : toAdd)
+        {
+            wwan::Modem::Ptr m = modems[serial];
+
+            DBusModem::SPtr dbusmodem = make_shared<DBusModem>(m, m_connection);
+            m_modems[serial] = dbusmodem;
+            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 +394,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 +616,73 @@
     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();
+    }
+    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-05-16 07:44:17 +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-05-16 07:44:17 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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 <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-05-16 07:44:17 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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 <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-05-16 07:44:17 +0000
@@ -0,0 +1,148 @@
+/*
+ * 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 <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 m_sim->locked();
+}
+
+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()
+{
+    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-05-16 07:44:17 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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 <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;
+};
+
+}

=== added file 'src/indicator/nmofono/connectivity-service-settings.cpp'
--- src/indicator/nmofono/connectivity-service-settings.cpp	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/connectivity-service-settings.cpp	2016-05-16 07:44:17 +0000
@@ -0,0 +1,148 @@
+/*
+ * 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/connectivity-service-settings.h>
+
+using namespace nmofono;
+
+class ConnectivityServiceSettings::Private : public QObject
+{
+    Q_OBJECT
+public:
+
+    ConnectivityServiceSettings &p;
+    QSettings *m_settings;
+
+    Private(ConnectivityServiceSettings &parent)
+        : p(parent)
+    {
+        m_settings = new QSettings(QSettings::IniFormat,
+                                   QSettings::UserScope,
+                                   "Ubuntu",
+                                   "connectivityservice",
+                                   this);
+    }
+
+    virtual ~Private()
+    {
+
+    }
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+};
+
+ConnectivityServiceSettings::ConnectivityServiceSettings(QObject *parent)
+    : QObject(parent),
+      d{new Private(*this)}
+{
+
+}
+
+ConnectivityServiceSettings::~ConnectivityServiceSettings()
+{
+
+}
+
+QVariant ConnectivityServiceSettings::mobileDataEnabled()
+{
+    return d->m_settings->value("MobileDataEnabled");
+}
+void ConnectivityServiceSettings::setMobileDataEnabled(bool value)
+{
+    d->m_settings->setValue("MobileDataEnabled", value);
+    d->m_settings->sync();
+}
+
+QVariant ConnectivityServiceSettings::simForMobileData()
+{
+    return d->m_settings->value("SimForMobileData");
+}
+void ConnectivityServiceSettings::setSimForMobileData(const QString &imsi)
+{
+    d->m_settings->setValue("SimForMobileData", imsi);
+    d->m_settings->sync();
+}
+
+QStringList ConnectivityServiceSettings::knownSims()
+{
+    QVariant ret;
+    ret = d->m_settings->value("KnownSims");
+    if (ret.isNull())
+    {
+        /* This is the first time we are running on a system.
+         */
+        setKnownSims(QStringList());
+        return QStringList();
+    }
+
+    return ret.toStringList();
+}
+
+void ConnectivityServiceSettings::setKnownSims(const QStringList &list)
+{
+    d->m_settings->setValue("KnownSims", QVariant(list));
+    d->m_settings->sync();
+}
+
+wwan::Sim::Ptr ConnectivityServiceSettings::createSimFromSettings(const QString &imsi)
+{
+    d->m_settings->beginGroup(QString("Sims/%1/").arg(imsi));
+    QVariant primaryPhoneNumber_var = d->m_settings->value("PrimaryPhoneNumber");
+    QVariant mcc_var = d->m_settings->value("Mcc");
+    QVariant mnc_var = d->m_settings->value("Mnc");
+    QVariant preferredLanguages_var = d->m_settings->value("PreferredLanguages");
+    QVariant dataRoamingEnabled_var = d->m_settings->value("DataRoamingEnabled");
+    d->m_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;
+        d->m_settings->remove(QString("Sims/%1/").arg(imsi));
+        return wwan::Sim::Ptr();
+    }
+
+    return wwan::Sim::Ptr(new wwan::Sim(imsi,
+                                        primaryPhoneNumber_var.toString(),
+                                        mcc_var.toString(),
+                                        mnc_var.toString(),
+                                        preferredLanguages_var.toStringList(),
+                                        dataRoamingEnabled_var.toBool()));
+}
+
+void ConnectivityServiceSettings::saveSimToSettings(wwan::Sim::Ptr sim)
+{
+    d->m_settings->beginGroup(QString("Sims/%1/").arg(sim->imsi()));
+    d->m_settings->setValue("PrimaryPhoneNumber", QVariant(sim->primaryPhoneNumber()));
+    d->m_settings->setValue("Mcc", sim->mcc());
+    d->m_settings->setValue("Mnc", sim->mnc());
+    d->m_settings->setValue("PreferredLanguages", QVariant(sim->preferredLanguages()));
+    d->m_settings->setValue("DataRoamingEnabled", sim->dataRoamingEnabled());
+    d->m_settings->endGroup();
+    d->m_settings->sync();
+}
+
+#include "connectivity-service-settings.moc"

=== added file 'src/indicator/nmofono/connectivity-service-settings.h'
--- src/indicator/nmofono/connectivity-service-settings.h	1970-01-01 00:00:00 +0000
+++ src/indicator/nmofono/connectivity-service-settings.h	2016-05-16 07:44:17 +0000
@@ -0,0 +1,67 @@
+/*
+ * 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 <QString>
+
+#include <nmofono/wwan/sim.h>
+
+#include <memory>
+
+
+namespace nmofono
+{
+
+class ConnectivityServiceSettings : public QObject
+{
+    Q_OBJECT
+
+    class Private;
+    std::shared_ptr<Private> d;
+
+public:
+
+    typedef std::shared_ptr<ConnectivityServiceSettings> Ptr;
+    typedef std::weak_ptr<ConnectivityServiceSettings> WeakPtr;
+
+    ConnectivityServiceSettings(QObject *parent = 0);
+    virtual ~ConnectivityServiceSettings();
+
+    QVariant mobileDataEnabled();
+    void setMobileDataEnabled(bool value);
+
+    QVariant simForMobileData();
+    void setSimForMobileData(const QString &imsi);
+
+    QStringList knownSims();
+    void setKnownSims(const QStringList &list);
+
+    wwan::Sim::Ptr createSimFromSettings(const QString &imsi);
+    void saveSimToSettings(wwan::Sim::Ptr sim);
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+};
+
+}

=== 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-05-16 07:44:17 +0000
@@ -19,7 +19,9 @@
  */
 
 #include <nmofono/manager-impl.h>
+#include <nmofono/connectivity-service-settings.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 +32,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 +42,7 @@
 #include <QMap>
 #include <QList>
 #include <QRegularExpression>
+#include <QSettings>
 #include <NetworkManager.h>
 #include <QDebug>
 #include <algorithm>
@@ -76,9 +80,110 @@
 
     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;
+
+    ConnectivityServiceSettings::Ptr m_settings;
+
     Private(Manager& parent) :
         p(parent)
     {
+        m_settings = std::make_shared<ConnectivityServiceSettings>();
+
+        m_simManager = make_shared<wwan::SimManager>(m_settings);
+        m_sims = m_simManager->knownSims();
+        connect(m_simManager.get(), &wwan::SimManager::simAdded, this, &Private::simAdded);
+
+        QVariant ret = m_settings->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->setMobileDataEnabled(false);
+        }
+        else
+        {
+            m_mobileDataEnabled = ret.toBool();
+        }
+
+        ret = m_settings->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->setSimForMobileData(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)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+        m_modems.append(m_ofonoLinks[modem_raw->name()]);
+        matchModemsAndSims();
+        Q_EMIT p.modemsChanged();
     }
 
     void setUnstoppableOperationHappening(bool happening)
@@ -192,6 +297,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 +309,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 +317,67 @@
 
         updateModemAvailable();
     }
+
+    void setMobileDataEnabled(bool value) {
+        if (m_mobileDataEnabled == value)
+        {
+            return;
+        }
+
+        m_settings->setMobileDataEnabled(value);
+        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->setSimForMobileData("");
+        }
+        else
+        {
+            m_settings->setSimForMobileData(sim->imsi());
+        }
+
+
+        m_simForMobileData = sim;
+        if (m_simForMobileData)
+        {
+            m_simForMobileData->setMobileDataEnabled(p.mobileDataEnabled());
+        }
+
+        Q_EMIT p.simForMobileDataChanged();
+    }
 };
 
 void
@@ -506,7 +675,8 @@
 bool
 ManagerImpl::roaming() const
 {
-    for (auto modem : d->m_ofonoLinks) {
+    for (auto modem : d->m_ofonoLinks)
+    {
         if (modem->modemStatus() == wwan::Modem::ModemStatus::roaming) {
             return true;
         }
@@ -522,7 +692,9 @@
         if (!d->m_ofonoLinks.values().contains(modem)
                 || d->m_unlockDialog->modem() == modem
                 || count(d->m_pendingUnlocks.begin(), d->m_pendingUnlocks.end(), modem) != 0)
+        {
             return;
+        }
 
         if (d->m_unlockDialog->state() == SimUnlockDialog::State::ready
                 && (d->m_pendingUnlocks.size() == 0))
@@ -652,6 +824,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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +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-05-16 07:44:17 +0000
@@ -0,0 +1,252 @@
+/*
+ * 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-05-16 07:44:17 +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-05-16 07:44:17 +0000
@@ -0,0 +1,261 @@
+/*
+ * 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;
+
+    ConnectivityServiceSettings::Ptr m_settings;
+
+    Private(SimManager& parent, ConnectivityServiceSettings::Ptr settings)
+        : p(parent),
+          m_settings(settings)
+    {
+        QStringList imsis = m_settings->knownSims();
+        for(auto imsi : imsis) {
+            auto sim = m_settings->createSimFromSettings(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() << __PRETTY_FUNCTION__ << ": trying to remove unknown modem: " << path;
+                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() << __PRETTY_FUNCTION__ << ": trying to add already existing modem: " << path;
+                continue;
+            }
+            m_ofonoModems[path] = modem;
+
+            connect(modem.get(), &QOfonoModem::interfacesChanged, this, &Private::modemInterfacesChanged);
+            modem->interfacesChanged(modem->interfaces());
+        }
+    }
+
+    void modemInterfacesChanged() {
+        QOfonoModem *modem = qobject_cast<QOfonoModem*>(sender());
+        if (!modem)
+        {
+            Q_ASSERT(0);
+            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)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+
+        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)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+
+        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);
+            m_settings->saveSimToSettings(sim);
+            m_knownSims[sim->imsi()] = sim;
+            m_settings->setKnownSims(m_knownSims.keys());
+            Q_EMIT p.simAdded(sim);
+        }
+    }
+
+    void simDataRoamingEnabledChanged(bool value)
+    {
+        Q_UNUSED(value)
+
+        auto sim_raw = qobject_cast<Sim*>(sender());
+        if (!sim_raw)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+        auto sim = m_knownSims[sim_raw->imsi()];
+        if (!sim)
+        {
+            Q_ASSERT(0);
+            return;
+        }
+        m_settings->saveSimToSettings(sim);
+    }
+
+};
+
+
+
+SimManager::SimManager(ConnectivityServiceSettings::Ptr settings)
+    : d{new Private(*this, settings)}
+{
+}
+
+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-05-16 07:44:17 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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"
+#include <nmofono/connectivity-service-settings.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(ConnectivityServiceSettings::Ptr settings);
+    ~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-05-16 07:44:17 +0000
@@ -0,0 +1,309 @@
+/*
+ * 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::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;
+
+    int m_index = -1;
+
+    QString m_simIdentifier;
+
+    shared_ptr<QOfonoSimManager> m_simManager;
+    shared_ptr<QOfonoConnectionManager> m_connManager;
+
+    QSet<QString> m_interfaces;
+
+    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);
+        }
+    }
+
+public Q_SLOTS:
+
+
+    void simManagerChanged(shared_ptr<QOfonoSimManager> simmgr)
+    {
+        if (m_simManager == simmgr)
+        {
+            return;
+        }
+
+        m_simManager = simmgr;
+        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_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 setSimIdentifier(const QString& simIdentifier)
+    {
+        if (m_simIdentifier == simIdentifier)
+        {
+            return;
+        }
+
+        m_simIdentifier = simIdentifier;
+        Q_EMIT p.simIdentifierUpdated(m_simIdentifier);
+    }
+
+    void setOfono(std::shared_ptr<QOfonoSimManager> simmgr)
+    {
+        simManagerChanged(simmgr);
+        if (simmgr)
+        {
+            m_connManager = std::make_shared<QOfonoConnectionManager>(this);
+            m_connManager->setModemPath(simmgr->modemPath());
+            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()
+{}
+
+const QString&
+Sim::simIdentifier() const
+{
+    return d->m_simIdentifier;
+}
+
+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-05-16 07:44:17 +0000
@@ -0,0 +1,125 @@
+/*
+ * 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;
+class ConnectivityServiceSettings;
+
+namespace wwan
+{
+
+class Sim : public QObject
+{
+    Q_OBJECT
+
+    class Private;
+    std::shared_ptr<Private> d;
+
+    friend class nmofono::ConnectivityServiceSettings;
+
+public:
+
+    typedef std::shared_ptr<Sim> Ptr;
+    typedef std::weak_ptr<Sim> WeakPtr;
+
+    Sim() = delete;
+
+    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(QString simIdentifier READ simIdentifier NOTIFY simIdentifierUpdated)
+    const QString &simIdentifier() 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);
+
+    QString ofonoPath() const;
+
+public Q_SLOTS:
+    void unlock();
+
+Q_SIGNALS:
+
+    void simIdentifierUpdated(const QString &);
+
+    void lockedChanged(bool value);
+
+    void presentChanged(bool value);
+
+    void dataRoamingEnabledChanged(bool value);
+
+    void mobileDataEnabledChanged(bool value);
+};
+
+}
+}

=== 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-05-16 07:44:17 +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";