whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtBearer corewlan add list of remembered networks 

These should be at least Defined by the system even with wifi power off

Change-Id: I0964ba82fe3fab98585ea7771687cef4d1b70cf9
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
bb10
Lorn Potter 2014-10-26 10:03:48 +10:00
parent a8ed001f36
commit b1d3f1fec0
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/bearer/corewlan/qcorewlanengine.mm
View File

@ -288,8 +288,6 @@ void QScanThread::getUserConfigurations()
for (NSString *ifName in wifiInterfaces) {
CWInterface *wifiInterface = [CWInterface interfaceWithName: ifName];
if (!wifiInterface.powerOn)
continue;
NSString *nsInterfaceName = wifiInterface.ssid;
// add user configured system networks
@ -311,6 +309,21 @@ void QScanThread::getUserConfigurations()
CFRelease(airportPlist);
}
// remembered networks
CWConfiguration *userConfig = [wifiInterface configuration];
NSOrderedSet *networkProfiles = [userConfig networkProfiles];
NSEnumerator *enumerator = [networkProfiles objectEnumerator];
CWNetworkProfile *wProfile;
while ((wProfile = [enumerator nextObject])) {
QString networkName = QCFString::toQString([wProfile ssid]);
if (!userProfiles.contains(networkName)) {
QMap<QString,QString> map;
map.insert(networkName, QCFString::toQString(nsInterfaceName));
userProfiles.insert(networkName, map);
}
}
// 802.1X user profiles
QString userProfilePath = QDir::homePath() + "/Library/Preferences/com.apple.eap.profiles.plist";
NSDictionary* eapDict = [[[NSDictionary alloc] initWithContentsOfFile: QCFString::toNSString(userProfilePath)] autorelease];
@ -330,14 +343,14 @@ void QScanThread::getUserConfigurations()
[itemKey getObjects:objects andKeys:keys];
QString networkName;
QString ssid;
for(int i = 0; i < dictSize; i++) {
for (int i = 0; i < dictSize; i++) {
if([nameStr isEqualToString:keys[i]]) {
networkName = QCFString::toQString(objects[i]);
}
if([networkSsidStr isEqualToString:keys[i]]) {
if ([networkSsidStr isEqualToString:keys[i]]) {
ssid = QCFString::toQString(objects[i]);
}
if(!userProfiles.contains(networkName)
if (!userProfiles.contains(networkName)
&& !ssid.isEmpty()) {
QMap<QString,QString> map;
map.insert(ssid, QCFString::toQString(nsInterfaceName));