Merge branch 'jb48087' into 'master'

Clear all vpn connections upon connman stop (restart) See merge request mer-core/libconnman-qt!38
sailfishos · Nov 27, 2019 · fd20a79 · fd20a79
2 parents f3ba989 + bf54dfc
commit fd20a79
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 10 deletions.
diff --git a/libconnman-qt/vpnmanager.cpp b/libconnman-qt/vpnmanager.cpp
@@ -110,20 +110,24 @@ void VpnManagerPrivate::init()
 
         emit q->connectionRemoved(path);
         emit q->connectionsChanged();
+
+        if (m_items.isEmpty()) {
+            emit q->connectionsCleared();
+        }
     });
 
     // If connman-vpn restarts, we need to discard and re-read the state
     QDBusServiceWatcher *watcher = new QDBusServiceWatcher(connmanVpnService, QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration, q);
     VpnManager::connect(watcher, &QDBusServiceWatcher::serviceUnregistered, q, [this](const QString &) {
         Q_Q(VpnManager);
 
-        emit q->connectionsClearingAll();
-
-        for (int i = 0, n = m_items.size(); i < n; ++i) {
-            m_items.at(i)->deleteLater();
-        }
+        emit beginConnectionsReset();
+        qDeleteAll(m_items);
         m_items.clear();
+        emit endConnectionsReset();
         setPopulated(false);
+
+        emit q->connectionsCleared();
     });
     VpnManager::connect(watcher, &QDBusServiceWatcher::serviceRegistered, q, [this](const QString &) {
         fetchVpnList();

diff --git a/libconnman-qt/vpnmanager.h b/libconnman-qt/vpnmanager.h
@@ -90,8 +90,8 @@ class VpnManager : public QObject
     void connectionsChanged();
     void connectionAdded(const QString &path);
     void connectionRemoved(const QString &path);
-    void connectionsClearingAll();
     void connectionsRefreshed();
+    void connectionsCleared();
     void populatedChanged();
 
 private:

diff --git a/libconnman-qt/vpnmanager_p.h b/libconnman-qt/vpnmanager_p.h
@@ -37,8 +37,9 @@
 
 #include "vpnmanager.h"
 
-class VpnManagerPrivate
+class VpnManagerPrivate : public QObject
 {
+    Q_OBJECT
     Q_DECLARE_PUBLIC(VpnManager)
 
 public:
@@ -47,6 +48,13 @@ class VpnManagerPrivate
     void fetchVpnList();
     void setPopulated(bool populated);
 
+    static VpnManagerPrivate *get(VpnManager *manager) { return manager->d_func(); }
+    static const VpnManagerPrivate *get(const VpnManager *manager) { return manager->d_func(); }
+
+Q_SIGNALS:
+    void beginConnectionsReset();
+    void endConnectionsReset();
+
 public:
     NetConnmanVpnManagerInterface m_connmanVpn;
     QVector<VpnConnection*> m_items;

diff --git a/libconnman-qt/vpnmodel.cpp b/libconnman-qt/vpnmodel.cpp
@@ -37,6 +37,8 @@
 #include "vpnmodel.h"
 #include "vpnmodel_p.h"
 
+#include "vpnmanager_p.h"
+
 const QHash<int, QByteArray> VpnModelPrivate::m_roles({{VpnModel::VpnRole, "vpnService"}});
 
 // ==========================================================================
@@ -60,6 +62,15 @@ void VpnModelPrivate::init()
     VpnModel::connect(m_manager, &VpnManager::connectionsChanged, q, &VpnModel::connectionsChanged);
     VpnModel::connect(m_manager, &VpnManager::populatedChanged, q, &VpnModel::populatedChanged);
 
+    VpnModel::connect(VpnManagerPrivate::get(m_manager), &VpnManagerPrivate::beginConnectionsReset, q, [q, this]() {
+        q->beginResetModel();
+        m_connections.clear();
+    });
+
+    VpnModel::connect(VpnManagerPrivate::get(m_manager), &VpnManagerPrivate::endConnectionsReset, q, [q]() {
+        q->endResetModel();
+    });
+
     q->connectionsChanged();
 }
 

diff --git a/libconnman-qt/vpnmodel.h b/libconnman-qt/vpnmodel.h
@@ -58,7 +58,7 @@ class VpnModel : public QAbstractListModel
         VpnRole = Qt::UserRole + 1
     };
 
-    explicit VpnModel(QObject* parent = nullptr);
+    explicit VpnModel(QObject *parent = nullptr);
     explicit VpnModel(VpnModelPrivate &dd, QObject *parent);
     ~VpnModel() Q_DECL_OVERRIDE;
 
@@ -67,7 +67,7 @@ class VpnModel : public QAbstractListModel
     QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE;
     int count() const;
     bool isConnected() const;
-    VpnManager * vpnManager() const;
+    VpnManager *vpnManager() const;
     bool populated() const;
     Q_INVOKABLE QVariantMap connectionSettings(const QString &path) const;
 

diff --git a/libconnman-qt/vpnmodel_p.h b/libconnman-qt/vpnmodel_p.h
@@ -44,7 +44,7 @@ class VpnModelPrivate
     void init();
 
 public:
-    VpnManager * m_manager;
+    VpnManager *m_manager;
     QVector<VpnConnection*> m_connections;
     static const QHash<int, QByteArray> m_roles;