Commit 1240c6f6 authored by Lamarque Souza's avatar Lamarque Souza
Browse files

Test if DBus interface object is valid before using it.

CCBUG: 283241
parent 3540411a
......@@ -59,8 +59,15 @@ public:
void init(RemoteWirelessObject* wobj)
{
if (!wobj)
if (!wobj) {
kDebug() << "wobj is null";
return;
}
if (!wobj || !wobj->isValid()) {
kDebug() << "wobj is invalid";
return;
}
if (wobj->operationMode() == Solid::Control::WirelessNetworkInterfaceNm09::Adhoc) {
adhoc = true;
......
......@@ -81,4 +81,9 @@ Solid::Control::WirelessNetworkInterfaceNm09::OperationMode RemoteWirelessInterf
return (Solid::Control::WirelessNetworkInterfaceNm09::OperationMode)rsnflags;
}
bool RemoteWirelessInterfaceConnection::isValid() const
{
Q_D(const RemoteWirelessInterfaceConnection);
return d->wirelessInterfaceConnectionIface->isValid();
}
// vim: sw=4 sts=4 et tw=100
......@@ -53,6 +53,7 @@ public:
Solid::Control::AccessPointNm09::WpaFlags wpaFlags() const;
Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const;
Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const;
bool isValid() const;
Q_SIGNALS:
void strengthChanged(int);
protected:
......
......@@ -84,4 +84,10 @@ Solid::Control::WirelessNetworkInterfaceNm09::OperationMode RemoteWirelessNetwor
return (Solid::Control::WirelessNetworkInterfaceNm09::OperationMode)rsnflags;
}
bool RemoteWirelessNetwork::isValid() const
{
Q_D(const RemoteWirelessNetwork);
return d->wirelessNetworkItemInterface->isValid();
}
// vim: sw=4 sts=4 et tw=100
......@@ -54,6 +54,7 @@ public:
Solid::Control::AccessPointNm09::WpaFlags wpaFlags() const;
Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const;
Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const;
bool isValid() const;
Q_SIGNALS:
void strengthChanged(int);
protected:
......
......@@ -36,6 +36,7 @@ public:
virtual Solid::Control::AccessPointNm09::WpaFlags rsnFlags() const = 0;
virtual Solid::Control::WirelessNetworkInterfaceNm09::OperationMode operationMode() const = 0;
virtual void strengthChanged(int) = 0;
virtual bool isValid() const = 0;
};
#endif // REMOTEWIRELESSOBJECT_H
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment