Index: sources/wifi/WifiInterface.cpp =================================================================== diff -u -r247f91d8ee35391abf611248ba8ae3d64de5341b -r5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7 --- sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 247f91d8ee35391abf611248ba8ae3d64de5341b) +++ sources/wifi/WifiInterface.cpp (.../WifiInterface.cpp) (revision 5b46bc8e4724e4ddb648f901d76bb7ec24f8b6c7) @@ -139,8 +139,8 @@ connect(&_processSetDNS , SIGNAL( finished(int, QProcess::ExitStatus)), this , SLOT( onProcessFinishedSetDNS(int, QProcess::ExitStatus))); - connect(this, SIGNAL(didRequestAutoAssignedIP()), - this, SLOT( onRequestAutoAssignedIP())); + connect(this , SIGNAL( didRequestAutoAssignedIP()), + this , SLOT( onRequestAutoAssignedIP())); } @@ -318,17 +318,17 @@ if (cell.contains(searchTermSSID) && cell.contains(searchTermMacAddress) && cell.contains(searchTermSignalLevel)) { QString ssid = getTextBetweenDelimiters(cell, searchTermSSID, "\n").replace("\"", "").trimmed(); - if (ssid == "") - continue; + if (ssid == "") continue; QString macAddress = getTextBetweenDelimiters(cell, searchTermMacAddress, "\n").trimmed(); int signalLevel = getTextBetweenDelimiters(cell, searchTermSignalLevel, "dBm").trimmed().toInt(); QList securityTypes; bool requiresKey = QRegularExpression("Encryption key:on").match(cell).hasMatch(); - QStringList infoElement = cell.split("IE: "); - if (infoElement.length() > 1) + QStringList infoElements = cell.split("IE: "); + infoElements.takeFirst(); // remove the header + for (const QString &element : infoElements) { - QString element = infoElement[1]; + if ( element.startsWith("Unknown:") ) continue; bool isWPA2 = QRegularExpression(".*WPA2 ").match(element).hasMatch(); bool isWPA = QRegularExpression(".*WPA ").match(element).hasMatch(); bool supportsAES = QRegularExpression("Pairwise Ciphers.*CCMP").match(element).hasMatch(); @@ -351,7 +351,11 @@ if (securityType != MWifiNetwork::SECURITY_TYPE::UNSUPPORTED) securityTypes.append(securityType); } - + // if no type can be found. + // we assume it was WEP which we don't support anyway. + if ( securityTypes.isEmpty() ) { + securityTypes.append(MWifiNetwork::SECURITY_TYPE::WEP); + } WifiNetworkData network(macAddress, ssid, securityTypes, MWifiNetwork::STATUS::NOT_CONNECTED, signalLevel, requiresKey); networks.append(network); emit didAddNetwork(network); @@ -475,10 +479,10 @@ .arg(_processRequestAutoAssignedIP.objectName())); return; } - emit didStatusChanged(tr("Obtaining IP Address...retry %1 of 5").arg(5 - _dhcpAttemptsLeft)); + 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); } /*! @@ -499,11 +503,11 @@ } else { emit didError(QString("Could not connect to %1").arg(_network.ssid())); - _dhcpAttemptsLeft = 5; + _dhcpAttemptsLeft = _dhcpAttempts; } return; } - _dhcpAttemptsLeft = 5; + _dhcpAttemptsLeft = _dhcpAttempts; doRequestIPSettings(); }