Merge branch 'jb41429' into 'master'

[nemo-systemsettings] Add readonly autoConnect property to the Vpn model. Contributes to JB#41419

See merge request mer-core/nemo-qml-plugin-systemsettings!102

Author: rainemak

src/vpnmodel.cpp

@@ -319,6 +319,7 @@ VpnModel::VpnModel(QObject *parent)
     , credentials_(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/system/privileged/vpn-data"))
     , provisioningOutputPath_(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/system/privileged/vpn-provisioning"))
     , bestState_(VpnModel::Idle)
+    , autoConnect_(false)
 {
     qDBusRegisterMetaType<PathProperties>();
     qDBusRegisterMetaType<PathPropertiesArray>();
@@ -390,6 +391,11 @@ int VpnModel::bestState() const
     return static_cast<int>(bestState_);
 }
 
+bool VpnModel::autoConnect() const
+{
+    return autoConnect_;
+}
+
 void VpnModel::createConnection(const QVariantMap &createProperties)
 {
     const QString path(createProperties.value(QString("path")).toString());
@@ -883,6 +889,16 @@ void VpnModel::updateConnection(VpnConnection *conn, const QVariantMap &updatePr
             }
         }
     }
+
+    bool autoConnect = false;
+    for (int i = 0; i < count(); ++i) {
+        autoConnect = autoConnect || get<VpnConnection>(i)->autoConnect();
+    }
+
+    if (autoConnect_ != autoConnect) {
+        autoConnect_ = autoConnect;
+        autoConnectChanged();
+    }
 }
 
 QVariantMap VpnModel::processOpenVpnProvisioningFile(QFile &provisioningFile)

src/vpnmodel.h

@@ -51,6 +51,7 @@ class SYSTEMSETTINGS_EXPORT VpnModel : public ObjectListModel
     Q_OBJECT
 
     Q_PROPERTY(int bestState READ bestState NOTIFY bestStateChanged)
+    Q_PROPERTY(bool autoConnect READ autoConnect NOTIFY autoConnectChanged)
 
 public:
     enum ConnectionState {
@@ -66,6 +67,7 @@ class SYSTEMSETTINGS_EXPORT VpnModel : public ObjectListModel
     virtual ~VpnModel();
 
     int bestState() const;
+    bool autoConnect() const;
 
     Q_INVOKABLE void createConnection(const QVariantMap &properties);
     Q_INVOKABLE void modifyConnection(const QString &path, const QVariantMap &properties);
@@ -88,6 +90,7 @@ class SYSTEMSETTINGS_EXPORT VpnModel : public ObjectListModel
 
 signals:
     void bestStateChanged();
+    void autoConnectChanged();
     void connectionStateChanged(const QString &path, int state);
 
 private:
@@ -130,6 +133,8 @@ class SYSTEMSETTINGS_EXPORT VpnModel : public ObjectListModel
     CredentialsRepository credentials_;
     QString provisioningOutputPath_;
     ConnectionState bestState_;
+    // True if there's one VPN that has autoConnect true
+    bool autoConnect_;
 };
 
 class SYSTEMSETTINGS_EXPORT VpnConnection : public QObject