FCL/sf/mw/wirelessacc: comparison wlanutilities/wlansniffer/aiplugin/src/wsfaicontroller.cpp

equal deleted inserted replaced

-:c2bc3f8c7777
+:dff6ebfd236f
 * Contributors:
 *
 * Description:  Implementation of TWsfAiController.
 *
 */
 //  EXTERNAL INCLUDES
 #include <apgcli.h>
 #include <centralrepository.h>
 #include "wsfsearchwlansdialog.h"
 #include "wsfaicontrollercmds.h"
 #include "wsfactivewaiter.h"
 #include "wsflogger.h"
 #include "wsfdbobserver.h"
+#include "wsfactivewrappers.h"
 //  MACROS
 #ifdef _DEBUG
 _LIT( KControllerPanic, "CWsfAiController" );
 // ---------------------------------------------------------
 //
 void TWsfAiController::DeInitializeL()
 {
 LOG_ENTERFN( "TWsfAiController::DeInitializeL" );
-iModel->AbortConnectingL();
-iModel->AbortScanningL();
 }
 // --------------------------------------------------------------------------
 // TWsfAiController::Initialize
 // --------------------------------------------------------------------------
 //
 void TWsfAiController::InitializeL( CWsfModel* aModel, CWsfAiModel* aAiModel,
-		                             CWsfDbObserver* aObserver )
+					CWsfDbObserver* aObserver,
+					CWsfActiveWrappers* aActiveWrappers )
 {
 LOG_ENTERFN( "TWsfAiController::InitializeL" );
 iModel = aModel;
 iAiModel = aAiModel;
 iDbObserver = aObserver;
+iActiveWrappers = aActiveWrappers;
 iDbObserver->SetController( this );
 iDbObserver->ActivateItL();
 iModel->SetEngineObserver( this );
-iAiModel->SetConnected( iModel->IsConnectedL() );
 }
 // ---------------------------------------------------------------------------
 // TWsfMainController::BrowserLaunchCompleteL
 RefreshUiL();
 }
 // --------------------------------------------------------------------------
-// TWsfAiController::StartupRefreshL
+// TWsfAiController::StartupRefresh
 // --------------------------------------------------------------------------
 //
-void TWsfAiController::StartupRefreshL()
+void TWsfAiController::StartupRefresh()
 {
-LOG_ENTERFN( "TWsfAiController::StartupRefreshL" );
+LOG_ENTERFN( "TWsfAiController::StartupRefresh" );
-iModel->GetConnectedWlanDetailsL( iConnectedWlan );
+iActiveWrappers->RefreshWLANList( ETrue );
+}
+// --------------------------------------------------------------------------
+// TWsfAiController::StartupRefreshDataReadyL
+// --------------------------------------------------------------------------
+//
+void TWsfAiController::StartupRefreshDataReadyL()
+{
+LOG_ENTERFN( "TWsfAiController::StartupRefreshDataReadyL" );
+iInfoArray = iActiveWrappers->GetWLANList();
+iConnectedWlan = iActiveWrappers->GetConnectedWLANNetwork();
+iAiModel->SetConnected( iConnectedWlan.Connected() );
 iAiModel->SetConnectedWlanInfo( iConnectedWlan );
-iInfoArray = iModel->GetWlanListL();
+LOG_WRITEF( "Connected = %d", iConnectedWlan.Connected() );
 MDesCArray* data = iAiModel->FormatSingleLineWlanListL( iInfoArray );
 // index value to suppress 1 second refreshing state
 const TInt KSuppressRefreshIndex = 1024;
 if ( !iAiModel->ScanningOn() )
 {
 return;
 }
+iActiveWrappers->RefreshWLANList( EFalse );
+}
+// --------------------------------------------------------------------------
+// TWsfAiController::WlanListDataReadyL
+// --------------------------------------------------------------------------
+//
+void TWsfAiController::WlanListDataReadyL()
+{
+LOG_ENTERFN("TWsfAiController::WlanListDataReadyL" );
+_ASS_D( iAiModel );
+iInfoArray = iActiveWrappers->GetWLANList();
+iConnectedWlan = iActiveWrappers->GetConnectedWLANNetwork();
+iAiModel->SetConnected( iConnectedWlan.Connected() );
+iAiModel->SetConnectedWlanInfo( iConnectedWlan );
+LOG_WRITEF( "Connected = %d", iConnectedWlan.Connected() );
+if ( !iAiModel->ScanningOn() && !iAiModel->Connected() )
+{
+return;
+}
 _ASS_D( iModel );
 _ASS_D( iUi );
 TBool match( EFalse );
 TWsfWlanInfo previousSelected;
 match = ETrue;
 previousSelected = *temp;
 }
 }
 }
-iInfoArray = iModel->GetWlanListL();
-TBool connected = iModel->GetConnectedWlanDetailsL( iConnectedWlan );
-iAiModel->SetConnected( connected );
-iAiModel->SetConnectedWlanInfo( iConnectedWlan );
 MDesCArray* data = iUi->MultilineControl() ?
 iAiModel->FormatWlanListL( iInfoArray, ETrue ):
 iAiModel->FormatSingleLineWlanListL( iInfoArray );
 // --------------------------------------------------------------------------
 //
 void TWsfAiController::ScanEnabledL()
 {
 LOG_ENTERFN( "TWsfAiController::ScanEnabledL" );
-iModel->RefreshScanL();
+iActiveWrappers->RefreshScan();
 }
 // --------------------------------------------------------------------------
 // TWsfAiController::WlanConnectionActivatedL
 void TWsfAiController::WlanConnectionActivatedL(
 const TDesC& /*aAccessPointName*/ )
 {
 LOG_ENTERFN( "TWsfAiController::WlanConnectionActivatedL" );
 iModel->SetConnecting( EFalse );
-iModel->GetConnectedWlanDetailsL( iConnectedWlan );
-iAiModel->SetConnectedWlanInfo( iConnectedWlan );
 iAiModel->SetConnected( ETrue );
 iAiModel->SetConnecting( EFalse );
-RefreshUiL();
+iActiveWrappers->RefreshWLANList( EFalse );
 }
 // --------------------------------------------------------------------------
 // TWsfAiController::WlanConnectionClosedL
 iModel->SetConnecting( EFalse );
 iAiModel->SetConnected( EFalse );
 iAiModel->SetConnecting( EFalse );
 if ( iAiModel->ScanningOn() )
 {
-// update the model and refresh ui
+iActiveWrappers->RefreshWLANList( EFalse );
-if ( iInfoArray )
-{
-// check if the array has any items
-if ( iInfoArray->Count() )
-{
-iInfoArray->SortArrayL();
-TWsfWlanInfo* firstItem = iInfoArray->At( KFirstItemArrayIndex );
-if ( firstItem && firstItem->Connected() )
-{
-firstItem->iConnectionState = ENotConnected;
-}
-}
-}
-// Abort current scan if exists so that we get
-// newest scan results propagated to ui
-iModel->AbortScanningL();
-iModel->RefreshScanL();
-RefreshUiL();
 }
 else
 {
 iUi->DisplayEngineOffL();
 }
 }
 iAiModel->SetConnecting( EFalse );
 if ( aResult == KErrNone )
 {
 iAiModel->SetConnected( ETrue );
-iModel->FinalizeConnectL();
 if ( !iShouldConnectOnly )
 {
 StartWebBrowserL( iUsedInfo );
 }
 if ( iTestAccessPoint )
 }
 else
 {
 iAiModel->SetConnected( EFalse );
 }
-RefreshUiL();
 // pop cleanup item
 CleanupStack::Pop();
 }
 }
 // Connect
 if ( iUsedInfo.iIapId )
 {
-TInt result = KErrNone;
+if ( iTestAccessPoint )
-result = iModel->ConnectWithoutConnWaiterL( iUsedInfo.iIapId,
+{
-!iTestAccessPoint );
+iActiveWrappers->Connect( iUsedInfo.iIapId, EIapExpireOnDisconnect );
-if ( result != KErrNone )
+}
-{
+else
-LOG_WRITEF( "Connect failed with error = %d", result );
+{
-User::Leave( result );
+iActiveWrappers->Connect( iUsedInfo.iIapId, EIapPersistent );
 }
 }
 // pop cleanup item
 CleanupStack::Pop();
 }
 dialog->SetIconArrayL( icons ); // ownership of the icon array is passed
 CleanupStack::Pop( icons );
 // the dialog is ready to receive data...
 iUi = dialog;
-iUi->UpdateHotSpotsL( iAiModel->FormatWlanListL( iModel->GetWlanListL(), EFalse ),
+iUi->UpdateHotSpotsL( iAiModel->FormatWlanListL(
-KFirstItemArrayIndex );
+									iActiveWrappers->GetWLANList(), EFalse ),
+			KFirstItemArrayIndex );
 return dialog->RunLD();
 }
 {
 return;
 }
 iModel->EnableScanL();
 iAiModel->SetScanningOn();
+LOG_WRITE( "DbObserver enable scan" );
 iDbObserver->EnableScanL();
 MDesCArray *data = iAiModel->FormatRefreshingL();
 iUi->UpdateHotSpotsL( data, KFirstItemArrayIndex );
 }
 }
 iModel->DisableScanL();
 iAiModel->SetScanningOff();
 iDbObserver->DisableScanL();
 iUi->DisplayEngineOffL();
-}
-// --------------------------------------------------------------------------
-// TWsfAiController::DisconnectL
-// --------------------------------------------------------------------------
-//
-void TWsfAiController::DisconnectL()
-{
-LOG_ENTERFN( "TWsfAiController::DisconnectL" );
-_ASS_D( iModel );
-iModel->DisconnectL();
 }
 // --------------------------------------------------------------------------
 // TWsfAiController::DoHandleEngineErrorL
 StartBrowsingL( iConnectedWlan );
 }
 else if ( selectedMode == EAiConnectedDisconnect )
 {
 // disconnect wlan
-iModel->DisconnectL();
+iActiveWrappers->Disconnect();
 }
 }
 }
 if ( listQuery->RunLD() )
 {
 if ( selectedMode == EAiConnectingDisconnect )
 {
-if ( iModel->IsConnectedL() )
+if ( !iModel->IsConnecting() )
 {
 // disconnect wlan
-iModel->DisconnectL();
+iActiveWrappers->Disconnect();
 }
 else
 {
 // disconnect wlan
 iModel->AbortConnectingL();
-}
+ConnectingFinishedL( KErrCancel );
-ConnectingFinishedL( KErrCancel );
+}
 }
 }
 }
 ContinueBrowsingL();
 }
 else if ( selectedMode == EAiBrowsingDisconnect )
 {
 // disconnect wlan
-iModel->DisconnectL();
+iActiveWrappers->Disconnect();
 }
 }
 }
 // --------------------------------------------------------------------------

branch	RCL_3
changeset 15	dff6ebfd236f
parent 3	ff3b37722600
child 16	8b0eae1b1d71