equal
deleted
inserted
replaced
416 { |
416 { |
417 LOG_WRITE( "Not found with Iap id" ); |
417 LOG_WRITE( "Not found with Iap id" ); |
418 iScanArray->MatchL( connectedInfo->iSsid, |
418 iScanArray->MatchL( connectedInfo->iSsid, |
419 connectedInfo->iSecurityMode, |
419 connectedInfo->iSecurityMode, |
420 connectedInfo->iNetMode, |
420 connectedInfo->iNetMode, |
|
421 connectedInfo->UsesPreSharedKey(), |
421 iScanArray->Count(), |
422 iScanArray->Count(), |
422 matchArray ); |
423 matchArray ); |
423 } |
424 } |
424 |
425 |
425 } |
426 } |
426 else |
427 else |
427 { |
428 { |
428 LOG_WRITE( "Easy WLAN connection" ); |
429 LOG_WRITE( "Easy WLAN connection" ); |
429 iScanArray->MatchL( connectedInfo->iSsid, |
430 iScanArray->MatchL( connectedInfo->iSsid, |
430 connectedInfo->iSecurityMode, |
431 connectedInfo->iSecurityMode, |
431 connectedInfo->iNetMode, iScanArray->Count(), |
432 connectedInfo->iNetMode, |
|
433 connectedInfo->UsesPreSharedKey(), |
|
434 iScanArray->Count(), |
432 matchArray ); |
435 matchArray ); |
433 } |
436 } |
434 |
437 |
435 if ( matchArray.Count() ) |
438 if ( matchArray.Count() ) |
436 { |
439 { |
1043 // check if we already have an entry/entries corresponding to a scan result |
1046 // check if we already have an entry/entries corresponding to a scan result |
1044 // (multiple entries for one scan result possible if GetAvailableIaps() |
1047 // (multiple entries for one scan result possible if GetAvailableIaps() |
1045 // found several iaps configured for same wlan) |
1048 // found several iaps configured for same wlan) |
1046 RPointerArray<TWsfWlanInfo> matchArray; |
1049 RPointerArray<TWsfWlanInfo> matchArray; |
1047 CleanupClosePushL(matchArray); |
1050 CleanupClosePushL(matchArray); |
1048 iScanArray->MatchL( wlanInfo->iSsid, wlanInfo->iSecurityMode, |
1051 iScanArray->MatchL( wlanInfo->iSsid, |
1049 wlanInfo->iNetMode, nElem, matchArray ); |
1052 wlanInfo->iSecurityMode, |
|
1053 wlanInfo->iNetMode, |
|
1054 wlanInfo->UsesPreSharedKey(), |
|
1055 nElem, |
|
1056 matchArray ); |
1050 |
1057 |
1051 TInt matchcount = matchArray.Count(); |
1058 TInt matchcount = matchArray.Count(); |
1052 |
1059 |
1053 // if not found |
1060 // if not found |
1054 if( matchcount == 0 ) |
1061 if( matchcount == 0 ) |