AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[mac] Fixed my position crash on systems without wifi

Browse source
This commit is contained in:
Alex Zolotarev 2011-06-02 18:08:45 +02:00 • committed by Alex Zolotarev
parent d21cf4db13
commit d96470fdb6
1 changed files with 23 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
platform/wifi_info_mac.mm
View file

@ -55,30 +55,34 @@ static string AppendZeroIfNeeded(string const & macAddrPart)
m_accessPoints.clear();
CWInterface * iFace = [CWInterface interface];
NSArray * nets = [iFace scanForNetworksWithParameters:nil error:nil];
for (NSUInteger i = 0; i < [nets count]; ++i)
// avoid crash on systems without wlan interfaces
NSArray * ifaces = [CWInterface supportedInterfaces];
if ([ifaces count])
{
CWNetwork * net = (CWNetwork *)[nets objectAtIndex:i];
WiFiInfo::AccessPoint apn;
apn.m_ssid = [net.ssid UTF8String];
apn.m_signalStrength = strings::to_string([net.rssi intValue]);
// fix formatting for wifi address
string const rawBssid = [net.bssid UTF8String];
if (!rawBssid.empty())
CWInterface * iFace = [CWInterface interface];
NSArray * nets = [iFace scanForNetworksWithParameters:nil error:nil];
for (NSUInteger i = 0; i < [nets count]; ++i)
{
strings::SimpleTokenizer tokIt(rawBssid, ":");
apn.m_bssid = AppendZeroIfNeeded(*tokIt);
do
CWNetwork * net = (CWNetwork *)[nets objectAtIndex:i];
WiFiInfo::AccessPoint apn;
apn.m_ssid = [net.ssid UTF8String];
apn.m_signalStrength = strings::to_string([net.rssi intValue]);
// fix formatting for wifi address
string const rawBssid = [net.bssid UTF8String];
if (!rawBssid.empty())
{
++tokIt;
apn.m_bssid += "-";
apn.m_bssid += AppendZeroIfNeeded(*tokIt);
} while (!tokIt.IsLast());
strings::SimpleTokenizer tokIt(rawBssid, ":");
apn.m_bssid = AppendZeroIfNeeded(*tokIt);
do
{
++tokIt;
apn.m_bssid += "-";
apn.m_bssid += AppendZeroIfNeeded(*tokIt);
} while (!tokIt.IsLast());
}
m_accessPoints.push_back(apn);
}
m_accessPoints.push_back(apn);
}
[pool drain];
[self performSelectorOnMainThread:@selector(NotifyGUI) withObject:nil waitUntilDone:NO];