Merge lp:~unity-api-team/indicator-network/connectivity-api-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:582
http://jenkins.qa.ubuntu.com/job/indicator-network-ci/415/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-amd64-ci/67/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/indicator-network-wily-armhf-ci/67/console

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

583. By Antti Kaijanmäki on 2016-04-28

merge.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

584. By Antti Kaijanmäki on 2016-05-02

fix crash.

585. By Antti Kaijanmäki on 2016-05-02

merge upstream

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

586. By Antti Kaijanmäki on 2016-05-13

clean up

587. By Antti Kaijanmäki on 2016-05-13

merge upstream

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

588. By Antti Kaijanmäki on 2016-05-16

merge upstream

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

589. By Antti Kaijanmäki on 2016-05-19

shared pointers everywhere + re-enable symbols map

590. By Antti Kaijanmäki on 2016-05-19

make simForMobileData shared pointer as well.

591. By Antti Kaijanmäki on 2016-05-19

hide the constructors of listmodels and move relevant dbus property handling inside the models as well.

592. By Antti Kaijanmäki on 2016-05-24

restore Connectivity QML to 1.0 import.

[Antti Kaijanmäki (kaijanmaki)]

no parent pointers to shared_ptr QObject!

review: Needs Fixing

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

593. By Antti Kaijanmäki on 2016-05-24

don't set parents to qobjects managed by shared pointers.

594. By Antti Kaijanmäki on 2016-05-24

revert back to Connectivity 1.0 imports. add missing model parameter headers

[Pete Woods (pete-woods)]

Use the object owner setter. In your class constructor add (const std::function<void(QObject*)>& objectOwner) as an argument.

stash in a member variable if necessary

m_objectOwner(foo.get())

[lp:~unity-api-team/indicator-network/connectivity-api-mobile-data-management]

595. By Pete Woods on 2016-05-26

Lazy initialization and C++ object ownership

596. By Pete Woods on 2016-05-26

Add changelog message

=== modified file 'data/connectivity-qt.map'
--- data/connectivity-qt.map	2015-11-20 13:14:50 +0000
+++ data/connectivity-qt.map	2016-05-26 13:16:24 +0000
@@ -6,26 +6,46 @@
         typeinfo*for?connectivityqt::VpnConnection;
         typeinfo*for?connectivityqt::VpnConnectionsListModel;
         typeinfo*for?ubuntu::connectivity::NetworkingStatus;
+        typeinfo*for?connectivityqt::Modem;
+        typeinfo*for?connectivityqt::ModemsListModel;
+        typeinfo*for?connectivityqt::Sim;
+        typeinfo*for?connectivityqt::SimsListModel;
         VTT?for?connectivityqt::Connectivity;
         VTT?for?connectivityqt::OpenvpnConnection;
         VTT?for?connectivityqt::VpnConnection;
         VTT?for?connectivityqt::VpnConnectionsListModel;
         VTT?for?ubuntu::connectivity::NetworkingStatus;
+        VTT?for?connectivityqt::Modem;
+        VTT?for?connectivityqt::ModemsListModel;
+        VTT?for?connectivityqt::Sim;
+        VTT?for?connectivityqt::SimsListModel;
         virtual?thunk?to?connectivityqt::Connectivity;
         virtual?thunk?to?connectivityqt::OpenvpnConnection;
         virtual?thunk?to?connectivityqt::VpnConnection;
         virtual?thunk?to?connectivityqt::VpnConnectionsListModel;
         virtual?thunk?to?ubuntu::connectivity::NetworkingStatus;
+        virtual?thunk?to?connectivityqt::Modem;
+        virtual?thunk?to?connectivityqt::ModemsListModel;
+        virtual?thunk?to?connectivityqt::Sim;
+        virtual?thunk?to?connectivityqt::SimsListModel;
         vtable?for?connectivityqt::Connectivity;
         vtable?for?connectivityqt::OpenvpnConnection;
         vtable?for?connectivityqt::VpnConnection;
         vtable?for?connectivityqt::VpnConnectionsListModel;
         vtable?for?ubuntu::connectivity::NetworkingStatus;
+        vtable?for?connectivityqt::Modem;
+        vtable?for?connectivityqt::ModemsListModel;
+        vtable?for?connectivityqt::Sim;
+        vtable?for?connectivityqt::SimsListModel;
         connectivityqt::Connectivity::[!P]*;
         connectivityqt::OpenvpnConnection::[!P]*;
         connectivityqt::VpnConnection::[!P]*;
         connectivityqt::VpnConnectionsListModel::[!P]*;
         ubuntu::connectivity::NetworkingStatus::[!P]*;
+        connectivityqt::Modem::[!P]*;
+        connectivityqt::ModemsListModel::[!P]*;
+        connectivityqt::Sim::[!P]*;
+        connectivityqt::SimsListModel::[!P]*;
     };
 local:
     *;

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-11 16:57:40 +0000
+++ debian/changelog	2016-05-26 13:16:24 +0000
@@ -1,3 +1,9 @@
+indicator-network (0.8.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Add SIM management API.
+
+ -- Pete <[e-mail]>  Thu, 26 May 2016 14:15:03 +0100
+
 indicator-network (0.7.1+16.04.20160511-0ubuntu1) xenial; urgency=medium
 
   [ Pete Woods ]

=== 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-05-26 13:16:24 +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-05-26 13:16:24 +0000
@@ -21,6 +21,12 @@
 #include <connectivityqt/connectivity.h>
 #include <connectivityqt/openvpn-connection.h>
 
+#include <connectivityqt/sim.h>
+
+#include <connectivityqt/modems-list-model.h>
+#include <connectivityqt/sims-list-model.h>
+
+
 #include <QtQml>
 
 namespace
@@ -48,6 +54,10 @@
     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::Sim>(uri, 1, 0, "Sim", "");
+    qmlRegisterUncreatableType<connectivityqt::ModemsListModel>(uri, 1, 0, "ModemsListModel", "");
+    qmlRegisterUncreatableType<connectivityqt::ModemsListModel>(uri, 1, 0, "SimsListModel", "");
 }
 
 void

=== 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-05-26 13:16:24 +0000
@@ -22,6 +22,10 @@
     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/openvpn-connection.cpp
     connectivityqt/pptp-connection.cpp
     connectivityqt/vpn-connection.cpp
@@ -33,6 +37,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 +60,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
 )

=== 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-05-26 13:16:24 +0000
@@ -18,8 +18,12 @@
  */
 
 #include <connectivityqt/connectivity.h>
+#include <connectivityqt/internal/sims-list-model-parameters.h>
+#include <connectivityqt/internal/modems-list-model-parameters.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 +61,11 @@
 
     VpnConnectionsListModel::SPtr m_vpnConnectionsModel;
 
+    SimsListModel::SPtr m_simsModel;
+    ModemsListModel::SPtr m_modemsModel;
+
+    Sim::SPtr m_simForMobileData;
+
     static QVector<Limitations> toLimitations(const QVariant& value)
     {
         auto l = value.toStringList();
@@ -164,6 +173,23 @@
         {
             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.get());
+        }
+    }
+
+    void simsUpdated()
+    {
+        auto path = m_writePropertyCache->get("SimForMobileData").value<QDBusObjectPath>();
+        auto sim = m_simsModel->getSimByPath(path);
+        p.setSimForMobileData(sim.get());
     }
 
 };
@@ -178,6 +204,8 @@
 
     qRegisterMetaType<connectivityqt::VpnConnection*>("VpnConnection*");
     qRegisterMetaType<connectivityqt::VpnConnection::Type>("VpnConnection::Type");
+
+    qRegisterMetaType<connectivityqt::Sim*>("Sim*");
 }
 
 Connectivity::Connectivity(const QDBusConnection& sessionConnection, QObject* parent) :
@@ -225,14 +253,14 @@
             &internal::DBusPropertyCache::initialized, d.get(),
             &Connectivity::Priv::interfaceInitialized);
 
+
     connect(d->m_writeInterface.get(),
             &ComUbuntuConnectivity1PrivateInterface::ReportError, this,
             &Connectivity::reportError);
 }
 
 Connectivity::~Connectivity()
-{
-}
+{}
 
 bool Connectivity::flightMode() const
 {
@@ -384,6 +412,93 @@
     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.get();
+}
+
+void Connectivity::setSimForMobileData(Sim *sim_raw)
+{
+    Sim::SPtr sim;
+    if (sim_raw)
+    {
+        sim = sim_raw->shared_from_this();
+    }
+
+    if (d->m_simForMobileData == sim)
+    {
+        return;
+    }
+    d->m_simForMobileData = sim;
+    QDBusObjectPath path;
+    if (sim)
+    {
+        path = sim->path();
+    }
+    else
+    {
+        path = QDBusObjectPath("/");
+    }
+    if (d->m_writePropertyCache->get("SimForMobileData").value<QDBusObjectPath>() != path)
+    {
+        d->m_writeInterface->setSimForMobileData(path);
+    }
+    Q_EMIT simForMobileDataUpdated(sim.get());
+}
+
+QAbstractItemModel* Connectivity::modems() const
+{
+    // Lazy initialisation
+    if (!d->m_modemsModel)
+    {
+        // We call this to ensure the SIMs model has been created.
+        sims();
+        d->m_modemsModel = std::make_shared<ModemsListModel>(
+                    internal::ModemsListModelParameters{
+                        d->m_objectOwner,
+                        d->m_writeInterface,
+                        d->m_writePropertyCache,
+                        d->m_simsModel});
+        d->m_objectOwner(d->m_modemsModel.get());
+    }
+
+    return d->m_modemsModel.get();
+}
+
+QAbstractItemModel *Connectivity::sims() const
+{
+    // Lazy initialisation
+    if (!d->m_simsModel)
+    {
+        d->m_simsModel = std::make_shared<SimsListModel>(
+                    internal::SimsListModelParameters{
+                        d->m_objectOwner,
+                        d->m_writeInterface,
+                        d->m_writePropertyCache});
+        d->m_objectOwner(d->m_simsModel.get());
+
+        connect(d->m_simsModel.get(), &SimsListModel::simsUpdated, d.get(), &Priv::simsUpdated);
+
+        if (d->m_writePropertyCache->isInitialized()) {
+            auto sim = d->m_simsModel->getSimByPath(d->m_writePropertyCache->get("SimForMobileData").value<QDBusObjectPath>());
+            d->m_simForMobileData = sim;
+        }
+    }
+
+    return d->m_simsModel.get();
+}
+
+
 }
 
 #include "connectivity.moc"

=== modified file 'src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2016-05-10 09:50:41 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/connectivity.h	2016-05-26 13:16:24 +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,28 @@
     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 +179,10 @@
 
     void setHotspotAuth(const QString& auth);
 
+    void setMobileDataEnabled(bool enabled);
+
+    void setSimForMobileData(Sim *sim);
+
 Q_SIGNALS:
     void flightModeUpdated(bool);
 
@@ -194,6 +224,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/internal/modems-list-model-parameters.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/internal/modems-list-model-parameters.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/internal/modems-list-model-parameters.h	2016-05-26 13:16:24 +0000
@@ -0,0 +1,45 @@
+/*
+ * 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 <connectivityqt/internal/dbus-property-cache.h>
+
+#include <NetworkingStatusPrivateInterface.h>
+
+#include <connectivityqt/sims-list-model.h>
+
+#include <functional>
+#include <memory>
+
+namespace connectivityqt
+{
+namespace internal
+{
+
+struct ModemsListModelParameters
+{
+    std::function<void(QObject*)> objectOwner;
+    std::shared_ptr<ComUbuntuConnectivity1PrivateInterface> writeInterface;
+    std::shared_ptr<internal::DBusPropertyCache> propertyCache;
+    SimsListModel::SPtr sims;
+};
+
+}
+}

=== added file 'src/connectivity-api/connectivity-qt/connectivityqt/internal/sims-list-model-parameters.h'
--- src/connectivity-api/connectivity-qt/connectivityqt/internal/sims-list-model-parameters.h	1970-01-01 00:00:00 +0000
+++ src/connectivity-api/connectivity-qt/connectivityqt/internal/sims-list-model-parameters.h	2016-05-26 13:16:24 +0000
@@ -0,0 +1,42 @@
+/*
+ * 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 <connectivityqt/internal/dbus-property-cache.h>
+
+#include <NetworkingStatusPrivateInterface.h>
+
+#include <functional>
+#include <memory>
+
+namespace connectivityqt
+{
+namespace internal
+{
+
+struct SimsListModelParameters
+{
+    std::function<void(QObject*)> objectOwner;
+    std::shared_ptr<ComUbuntuConnectivity1PrivateInterface> writeInterface;
+    std::shared_ptr<internal::DBusPropertyCache> propertyCache;
+};
+
+}
+}

=== 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-05-26 13:16:24 +0000
@@ -0,0 +1,130 @@
+/*
+ * 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")
+        {
+            auto sim = m_sims->getSimByPath(value.value<QDBusObjectPath>());
+            setSim(sim);
+        }
+    }
+
+    void simsUpdated()
+    {
+        auto sim = m_sims->getSimByPath(m_propertyCache->get("Sim").value<QDBusObjectPath>());
+        setSim(sim);
+    }
+
+    void setSim(Sim::SPtr sim)
+    {
+        if (m_sim == sim)
+        {
+            return;
+        }
+        m_sim = sim;
+        Q_EMIT p.simChanged(m_sim.get());
+    }
+
+public:
+    Modem& p;
+
+    Sim::SPtr m_sim;
+    SimsListModel::SPtr m_sims;
+
+    unique_ptr<ComUbuntuConnectivity1ModemInterface> m_modemInterface;
+
+    internal::DBusPropertyCache::UPtr m_propertyCache;
+};
+
+Modem::Modem(const QDBusObjectPath& path,
+             const QDBusConnection& connection,
+             SimsListModel::SPtr 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>());
+
+    connect(d->m_sims.get(), &SimsListModel::simsUpdated, d.get(), &Priv::simsUpdated);
+}
+
+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.get();
+}
+
+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-05-26 13:16:24 +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::SPtr 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-05-26 13:16:24 +0000
@@ -0,0 +1,192 @@
+/*
+ * 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 "internal/modems-list-model-parameters.h"
+
+#include <QDebug>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class ModemsListModel::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(ModemsListModel& parent) :
+        p(parent)
+    {
+    }
+
+    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_propertyCache->connection(), m_sims, nullptr);
+                m_objectOwner(modem.get());
+                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)
+    {
+        Q_UNUSED(sim)
+        auto idx = findModem(sender());
+        p.dataChanged(idx, idx, {ModemsListModel::Roles::RoleSim});
+    }
+
+    void propertyChanged(const QString& name, const QVariant& value)
+    {
+        if (name == "Modems")
+        {
+            QList<QDBusObjectPath> tmp;
+            qvariant_cast<QDBusArgument>(value) >> tmp;
+            updateModemDBusPaths(tmp);
+        }
+    }
+
+public:
+    ModemsListModel& p;
+    function<void(QObject*)> m_objectOwner;
+    SimsListModel::SPtr m_sims;
+    QList<QDBusObjectPath> m_dbus_paths;
+    QList<Modem::SPtr> m_modems;
+
+    shared_ptr<ComUbuntuConnectivity1PrivateInterface> m_writeInterface;
+    internal::DBusPropertyCache::SPtr m_propertyCache;
+};
+
+ModemsListModel::ModemsListModel(const internal::ModemsListModelParameters &parameters) :
+    QAbstractListModel(0),
+    d(new Priv(*this))
+{
+    d->m_objectOwner = parameters.objectOwner;
+    d->m_sims = parameters.sims;
+    d->m_writeInterface = parameters.writeInterface;
+    d->m_propertyCache = parameters.propertyCache;
+
+    connect(d->m_propertyCache.get(),
+            &internal::DBusPropertyCache::propertyChanged, d.get(),
+            &Priv::propertyChanged);
+
+    QList<QDBusObjectPath> tmp;
+    qvariant_cast<QDBusArgument>(d->m_propertyCache->get("Modems")) >> tmp;
+    d->updateModemDBusPaths(tmp);
+}
+
+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();
+}
+
+
+}
+
+#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-05-26 13:16:24 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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 "sims-list-model.h"
+
+#include <unity/util/DefinesPtrs.h>
+
+#include <memory>
+
+namespace connectivityqt
+{
+namespace internal
+{
+struct ModemsListModelParameters;
+}
+
+class Q_DECL_EXPORT ModemsListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+    UNITY_DEFINES_PTRS(ModemsListModel);
+
+    enum Roles
+    {
+        RoleIndex = Qt::UserRole + 1,
+        RoleSerial,
+        RoleSim
+    };
+
+    ModemsListModel(const internal::ModemsListModelParameters& parameters);
+
+    ~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;
+    }
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== 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-05-26 13:16:24 +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-05-26 13:16:24 +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, public std::enable_shared_from_this<Sim>
+{
+    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-05-26 13:16:24 +0000
@@ -0,0 +1,235 @@
+/*
+ * 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 "internal/sims-list-model-parameters.h"
+
+#include <QDebug>
+
+using namespace std;
+
+namespace connectivityqt
+{
+
+class SimsListModel::Priv: public QObject
+{
+    Q_OBJECT
+
+public:
+    Priv(SimsListModel& parent) :
+        p(parent)
+    {
+    }
+
+    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_propertyCache->connection(), nullptr);
+                m_objectOwner(sim.get());
+                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();
+        }
+
+        Q_EMIT p.simsUpdated();
+    }
+
+    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});
+    }
+
+    void propertyChanged(const QString& name, const QVariant& value)
+    {
+        if (name == "Sims")
+        {
+            QList<QDBusObjectPath> tmp;
+            qvariant_cast<QDBusArgument>(value) >> tmp;
+            updateSimDBusPaths(tmp);
+        }
+    }
+
+public:
+    SimsListModel& p;
+    function<void(QObject*)> m_objectOwner;
+    QList<QDBusObjectPath> m_dbus_paths;
+    QList<Sim::SPtr> m_sims;
+
+    shared_ptr<ComUbuntuConnectivity1PrivateInterface> m_writeInterface;
+    internal::DBusPropertyCache::SPtr m_propertyCache;
+};
+
+SimsListModel::SimsListModel(const internal::SimsListModelParameters &parameters) :
+    QAbstractListModel(0),
+    d(new Priv(*this))
+{
+    d->m_objectOwner = parameters.objectOwner;
+    d->m_writeInterface = parameters.writeInterface;
+    d->m_propertyCache = parameters.propertyCache;
+
+    connect(d->m_propertyCache.get(),
+            &internal::DBusPropertyCache::propertyChanged, d.get(),
+            &Priv::propertyChanged);
+
+    QList<QDBusObjectPath> tmp;
+    qvariant_cast<QDBusArgument>(d->m_propertyCache->get("Sims")) >> tmp;
+    d->updateSimDBusPaths(tmp);
+}
+
+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();
+}
+
+Sim::SPtr SimsListModel::getSimByPath(const QDBusObjectPath &path) const
+{
+    for (auto sim : d->m_sims)
+    {
+        if (sim->path() == path) {
+            return sim;
+        }
+    }
+    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-05-26 13:16:24 +0000
@@ -0,0 +1,101 @@
+/*
+ * 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 <unity/util/DefinesPtrs.h>
+
+#include <memory>
+
+namespace connectivityqt
+{
+namespace internal
+{
+struct SimsListModelParameters;
+}
+
+class Q_DECL_EXPORT SimsListModel : public QAbstractListModel
+{
+    Q_OBJECT
+
+    Q_ENUMS(Roles)
+
+public:
+
+    UNITY_DEFINES_PTRS(SimsListModel);
+
+    enum Roles
+    {
+        RoleImsi = Qt::UserRole + 1,
+        RolePrimaryPhoneNumber,
+        RolePhoneNumbers,
+        RoleLocked,
+        RolePresent,
+        RoleMcc,
+        RoleMnc,
+        RolePreferredLanguages,
+        RoleDataRoamingEnabled,
+        RoleSimObject
+    };
+
+    SimsListModel(const internal::SimsListModelParameters& parameters);
+
+    ~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;
+    }
+
+    Sim::SPtr getSimByPath(const QDBusObjectPath &path) const;
+
+public Q_SLOTS:
+
+Q_SIGNALS:
+
+    void simsUpdated();
+
+protected:
+    class Priv;
+    std::shared_ptr<Priv> d;
+};
+
+}

=== modified file 'src/indicator/nmofono/manager-impl.cpp'
--- src/indicator/nmofono/manager-impl.cpp	2016-05-26 13:16:24 +0000
+++ src/indicator/nmofono/manager-impl.cpp	2016-05-26 13:16:24 +0000
@@ -310,6 +310,7 @@
             m_ofonoLinks[path] = modem;
             connect(modem.get(), &wwan::Modem::readyToUnlock, this, &Private::modemReadyToUnlock);
             connect(modem.get(), &wwan::Modem::ready, this, &Private::modemReady);
+            matchModemsAndSims();
         }
 
         Q_EMIT p.linksUpdated();