Index: sources/view/settings/VNetworkModel.cpp =================================================================== diff -u -rbff1a7d681ce1928f39c79428958a5eb1625080c -r16cdcc81e958df400e76b391fece2e140b8a3243 --- sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision bff1a7d681ce1928f39c79428958a5eb1625080c) +++ sources/view/settings/VNetworkModel.cpp (.../VNetworkModel.cpp) (revision 16cdcc81e958df400e76b391fece2e140b8a3243) @@ -26,6 +26,7 @@ VNetworkModel::VNetworkModel(QAbstractListModel *parent) : QAbstractListModel(parent) { startTimer(_interval); initConnections(); + _devWlan = WifiInterface::iface(); } /*! @@ -168,6 +169,8 @@ return network.signalLevel(); case NetworkSupportedRole: { bool isSecurityTypeSupported = (!network.securityTypes().contains(MWifiNetwork::SECURITY_TYPE::WEP) && + !network.securityTypes().contains(MWifiNetwork::SECURITY_TYPE::WPA_TKIP) && + !network.securityTypes().contains(MWifiNetwork::SECURITY_TYPE::WPA_TKIP_AES) && !network.securityTypes().contains(MWifiNetwork::SECURITY_TYPE::UNSUPPORTED)); bool isPasswordProtected = network.requirePassword(); return isSecurityTypeSupported && isPasswordProtected; Index: sources/view/settings/VNetworkModel.h =================================================================== diff -u -r081df84b4b81ab39296f42c3c7e91deb021b8979 -r16cdcc81e958df400e76b391fece2e140b8a3243 --- sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision 081df84b4b81ab39296f42c3c7e91deb021b8979) +++ sources/view/settings/VNetworkModel.h (.../VNetworkModel.h) (revision 16cdcc81e958df400e76b391fece2e140b8a3243) @@ -42,8 +42,8 @@ int _interval = 1000; - const char *_devEth = "eth0"; - const char *_devWlan = "wlan0"; + const char *_devEth = "eth0" ; // default for the device + QString _devWlan = "wlan0"; // default for the device PROPERTY(bool , isIdle , true ) PROPERTY(bool , scanInProgress , false) @@ -72,8 +72,8 @@ }; void addNetwork (const WifiNetworkData &network); - int rowCount (const QModelIndex &parent = QModelIndex()) const; - QVariant data (const QModelIndex &index, int role = Qt::DisplayRole) const; + int rowCount (const QModelIndex &parent = QModelIndex() ) const override; + QVariant data (const QModelIndex &index, int role = Qt::DisplayRole ) const override; void removeAllRows(); signals: void didScan(); @@ -103,7 +103,8 @@ protected: void timerEvent(QTimerEvent *event) override; - QHash roleNames() const; + QHash roleNames() const override; + private: void initConnections(); void clearSelectedNetwork(); Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -r16cdcc81e958df400e76b391fece2e140b8a3243 --- sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 16cdcc81e958df400e76b391fece2e140b8a3243) @@ -73,7 +73,7 @@ } QString script; if ( ! checkScript(script, Wifi_Start_WPA_Supplicant) ) return; _processStartWPASupplicant.start(script, - QStringList() << _iface + QStringList() << iface() << _wpaSupplicantConfPath); } @@ -236,7 +236,7 @@ QString script; if ( ! checkScript(script, Wifi_Scan_For_Networks) ) return; _scanRunning = true; emit didScanStatusChanged(_scanRunning); - _processScan.start(script, QStringList() << _iface); + _processScan.start(script, QStringList() << iface()); LOG_DEBUG("WiFi Scan Started"); } @@ -426,7 +426,7 @@ } QString script; if ( ! checkScript(script, Wifi_Start_WPA_Supplicant) ) return; _processStartWPASupplicant.start(script, - QStringList() << _iface + QStringList() << iface() << _wpaSupplicantConfPath); } @@ -463,7 +463,7 @@ QString progressDot = QString(".").repeated(_dhcpAttempts - _dhcpAttemptsLeft); emit didStatusChanged(tr("%1.Obtaining IP Address.%1").arg(progressDot)); QString script; if ( ! checkScript(script, Wifi_Get_Auto_Assigned_IP) ) return; - _processRequestAutoAssignedIP.start(script, QStringList() << _iface); + _processRequestAutoAssignedIP.start(script, QStringList() << iface()); } /*! @@ -507,7 +507,7 @@ } QString script; if ( ! checkScript(script, Wifi_Read_IP_Settings) ) return; _processReadIPSettings.start(script, - QStringList() << _iface); + QStringList() << iface()); } @@ -526,7 +526,7 @@ } QString script; if ( ! checkScript(script, Wifi_Read_Network_Info) ) return; _processReadNetworkInfo.start(script, - QStringList() << _iface); + QStringList() << iface()); } @@ -644,7 +644,7 @@ } QString script; if ( ! checkScript(script, Wifi_Disconnect_Network) ) return; _processDisconnectNetwork.start(script, - QStringList() << _iface); + QStringList() << iface()); } /*! @@ -775,7 +775,7 @@ QString script; if ( ! checkScript(script, Wifi_Set_Static_IP) ) return; _useDHCP = false; _processSetStaticIPAddress.start(script, - QStringList() << _iface << vIPAddress); + QStringList() << iface() << vIPAddress); } /*! @@ -854,7 +854,7 @@ QString script; if ( ! checkScript(script, Wifi_Set_SubnetMask) ) return; _useDHCP = false; _processSetStaticSubnetMask.start(script, - QStringList() << _iface << vSubnetMask); + QStringList() << iface() << vSubnetMask); } /*! Index: sources/wifi/WifiInterface.h =================================================================== diff -u -r80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803 -r16cdcc81e958df400e76b391fece2e140b8a3243 --- sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 80b5e8f1ebb90c03c37d90d90cd2da3bd95d6803) +++ sources/wifi/WifiInterface.h (.../WifiInterface.h) (revision 16cdcc81e958df400e76b391fece2e140b8a3243) @@ -71,12 +71,21 @@ QProcess _processReadNetworkInfo; WifiNetworkData _network; - const QString _iface = "wlan0"; - const QString _wpaSupplicantConfPath = QString("/etc/wpa_supplicant/wpa_supplicant-%1.conf").arg(_iface); + const QString _wpaSupplicantConfPath = QString("/etc/wpa_supplicant/wpa_supplicant-%1.conf").arg(iface()); // Singleton SINGLETON(WifiInterface) +public: + + static QString iface() { + #ifdef BUILD_FOR_DESKTOP + return "wlp4s0"; + #else + return "wlan0"; + #endif + } + private: bool checkScript(QString &vScript, const QString &vShellScript); QString getTextBetweenDelimiters(const QString &vText, const QString &vLeftDelim, const QString &vRightDelim);