diff options
author | Raquel Medina <raquel.medina@konsulko.com> | 2019-07-22 15:04:17 +0200 |
---|---|---|
committer | raquel medina <raquel.medina@konsulko.com> | 2019-07-22 20:58:34 +0000 |
commit | 4617d8b63620de9729a07c5d17e8b3113fbb58a3 (patch) | |
tree | 353b4fc0dc2ab182f509a6a7b128e53073fab343 /network/wifinetworkmodel.cpp | |
parent | 61d01475342f6811458d1ae70c23aeaed5348143 (diff) |
network: use roles to signal model changeshalibut_8.0.0halibut/8.0.08.0.0
This commit provides:
- use of specific roles to signal model changes
for wired and wifi network models.
- fix to correctly broadcast wifi strength on
initial connection to previously unknown wifi
service.
Bug-AGL: SPEC-2339
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I35922d6c96b8b89fd4d376cddd8f4113cf18dbca
Diffstat (limited to 'network/wifinetworkmodel.cpp')
-rw-r--r-- | network/wifinetworkmodel.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/network/wifinetworkmodel.cpp b/network/wifinetworkmodel.cpp index 71e5298..7c32779 100644 --- a/network/wifinetworkmodel.cpp +++ b/network/wifinetworkmodel.cpp @@ -1,5 +1,6 @@ #include "wifinetworkmodel.h" #include "connectionprofile.h" +#include <QVector> #include <QDebug> WifiNetworkModel::WifiNetworkModel(QObject *parent) @@ -47,24 +48,33 @@ QHash<int, QByteArray> WifiNetworkModel::roleNames() const { void WifiNetworkModel::updateProperties(QString service, QJsonObject properties) { ConnectionProfile *network; + QVector<int> vroles; + bool sbcast = false; - // FIXME: add role parameter to emits if ((network = getNetwork(service))) { if (properties.contains("ipv4")) { QString address = properties.value("ipv4").toObject().value("address").toString(); network->setAddress(address); - emit dataChanged(indexOf(network), indexOf(network)); + vroles.push_back(AddressRole); } if (properties.contains("state")) { network->setState(properties.value("state").toString()); - emit dataChanged(indexOf(network), indexOf(network)); + vroles.push_back(StateRole); + if ((network->state() == "ready") || + (network->state() == "online")) + sbcast = true; } if (properties.contains("strength")) { network->setStrength(properties.value("strength").toInt()); - emit dataChanged(indexOf(network), indexOf(network)); + vroles.push_back(StrengthRole); if ((network->state() == "ready") || (network->state() == "online")) - emit strengthChanged(network->strength()); + sbcast = true; + } + if (!vroles.isEmpty()) { + emit dataChanged(indexOf(network), indexOf(network), vroles); + if (sbcast) + emit strengthChanged(network->strength()); } } } |