Reload VPN model if connman-vpn restarts

src/vpnmodel.cpp

@@ -33,6 +33,7 @@
 #include "vpnmodel.h"
 
 #include <QDBusPendingCallWatcher>
+#include <QDBusServiceWatcher>
 #include <QDebug>
 
 
@@ -214,6 +215,20 @@ VpnModel::VpnModel(QObject *parent)
         }
     });
 
+    // If connman-vpn restarts, we need to discard and re-read the state
+    QDBusServiceWatcher *watcher = new QDBusServiceWatcher("net.connman.vpn", QDBusConnection::systemBus(), QDBusServiceWatcher::WatchForRegistration | QDBusServiceWatcher::WatchForUnregistration, this);
+    connect(watcher, &QDBusServiceWatcher::serviceUnregistered, this, [this](const QString &) {
+        for (int i = 0, n = count(); i < n; ++i) {
+            get(i)->deleteLater();
+        }
+        clear();
+        setPopulated(false);
+        qDeleteAll(connections_);
+    });
+    connect(watcher, &QDBusServiceWatcher::serviceRegistered, this, [this](const QString &) {
+        fetchVpnList();
+    });
+
     fetchVpnList();
 }