FCL/sf/mw/appsupport: comparison coreapplicationuis/SysAp/Src/OfflineModeController/SysApOfflineModeControllerImpl.cpp

equal deleted inserted replaced

-:924385140d98
+:c2c61fdca848
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  CSysApOfflineModeController implementation
 *
-* Initial Contributors:
+*/
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-* CSysApOfflineModeController controls the offline mode.
-* It turns OFF RF, BT and WLAN when offline mode is enabled and turns them ON when
-* Offline mode is disabled
-*
-*/
 // INCLUDES
 #include "SysApOfflineModeControllerImpl.h"
 #include "SysApAppUi.h"
 #include "SysAp.hrh"
 #include "DosSvrServices.h"
 #include "SysApCenRepController.h"
-#include "sysapcenrepofflinemodeobserver.h"
 #include <startupdomainpskeys.h>
 #include <PSVariables.h>
-#include <wlandevicesettingsinternalcrkeys.h> // For Turning ON/OFF WLAN
 MSysApOfflineModeController* CreateSysApOfflineModeControllerL( CSysApAppUi& aSysApAppUi )
 {
 return CSysApOfflineModeController::NewL( aSysApAppUi );
 // CSysApOfflineModeController::ConstructL()
 // ----------------------------------------------------------------------------
 void CSysApOfflineModeController::ConstructL()
 {
 TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL") ) );
+// Check the active profile
-// create an observer for Offline Mode
+TInt activeProfile( iSysApAppUi.ActiveProfileId() );
-TRACES( RDebug::Print( _L("CSysApOfflineModeController::ConstructL: trying CSysApCenRepOfflineModeObserver::NewL") ) );
+activeProfile = iSysApAppUi.ActiveProfileId();
-iSysApCenRepOfflineModeObserver = CSysApCenRepOfflineModeObserver::NewL(*this );
+if ( activeProfile == KOfflineModeProfileId )
-iOfflineModeActive = iSysApCenRepOfflineModeObserver->IsOffline();
+{
+iOfflineModeActive = ETrue;
+}
 }
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::CSysApOfflineModeController()
 // ----------------------------------------------------------------------------
 CSysApOfflineModeController::CSysApOfflineModeController( CSysApAppUi& aSysApAppUi ) :
-iSysApAppUi( aSysApAppUi )
+iSysApAppUi( aSysApAppUi ),
+iOfflineModeActive( EFalse ),
+iDoNotActivateRF( EFalse )
 {
 }
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::~CSysApOfflineModeController()
 // ----------------------------------------------------------------------------
 CSysApOfflineModeController::~CSysApOfflineModeController()
 {
-delete iSysApCenRepOfflineModeObserver;
 }
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::OfflineModeActive()
 // ----------------------------------------------------------------------------
 TBool CSysApOfflineModeController::OfflineModeActive()
 {
-TRACES( RDebug::Print( _L("CSysApOfflineModeController::OfflineModeActive returns %d"), iOfflineModeActive ) );
 return iOfflineModeActive;
 }
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
 // ----------------------------------------------------------------------------
 void CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL()
 {
 TRACES( RDebug::Print( _L("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL") ) );
 TInt err ( 0 );
 // Set state to starter. Note that if state is same as the current state, then nothing happens.
 err = iSysApAppUi.SetStarterState(RStarterSession::EOffline);
 if ( err )
 {
+iSysApAppUi.RestoreProfileL( EFalse );
 iSysApAppUi.ShowUiNoteL( ECannotActivateOfflineModeNote );
 }
 else
 {
 iOfflineModeActive = ETrue;
 {
 err = iSysApAppUi.SetBtPowerState( EFalse ); // Switch BT off
 SetBtActiveBeforeOfflineMode( ETrue );       // Update "BT active" setting
 TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
 }
-/* Turn OFF WLAN */
-TInt err( KErrNone );
+iSysApAppUi.OfflineModeChangedL();
-CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
-err = repository->Set(KWlanOnOff, 0);
-delete repository;
-if(err)
-		{
-TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL Could not disable WLAN") );
-		    User::Leave(err);
-}
-else
-		{
-TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOnlineToOfflineModeL WLAN Disabled" ) );
-}
-		iSysApAppUi.OfflineModeChangedL();
 }
 }
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL()
 err = iSysApAppUi.SetStarterState(RStarterSession::ENormal);
 }
 if ( err )
 {
+iSysApAppUi.RestoreProfileL( ETrue );
 iSysApAppUi.ShowUiNoteL( ECannotDeactivateOfflineModeNote );
 }
 else
 {
 iOfflineModeActive = EFalse;
 err = iSysApAppUi.SetBtPowerState( ETrue );  // Switch BT on
 SetBtActiveBeforeOfflineMode( EFalse );      // Update "BT active" setting
 TRACES( RDebug::Print( _L("CSysApOfflineModeController SetBtPowerStateL returned %d"), err ) );
 }
-		        /* Turn ON WLAN */
-TInt err( KErrNone );
-CRepository* repository = CRepository::NewL( KCRUidWlanDeviceSettingsRegistryId );
-err = repository->Set(KWlanOnOff, 1);
-delete repository;
-if(err)
-		   {
-TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL Could not enable WLAN") );
-		       User::Leave(err);
-}
-else
-		   {
-TRACES( RDebug::Printf("CSysApOfflineModeController::SwitchFromOfflineToOnlineModeL WLAN Enabled") );
-}
 iSysApAppUi.OfflineModeChangedL();
-		iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
-		}
+iSysApAppUi.SetNetworkConnectionAllowed( ECoreAppUIsNetworkConnectionAllowed );
-	}
+}
+}
 // ----------------------------------------------------------------------------
 // CSysApOfflineModeController::CheckOfflineModeInitialStatusesL()
 // ----------------------------------------------------------------------------
 TInt simStatus = iSysApAppUi.StateOfProperty( KPSUidStartup, KPSSimStatus );
 if ( ( !iSysApAppUi.SimSupported() ) ||
 ( iSysApAppUi.BtSapEnabled() && simStatus != ESimNotPresent ) ||
 simStatus == ESimUsable )
 {
-TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check PASSED") );
+iSysApAppUi.ShowQueryL( ESysApLeaveOfflineModeQuery );
-SwitchFromOfflineToOnlineModeL();
 }
 else
 {
-TRACES( RDebug::Printf("CSysApOfflineModeController::GoOnlineIfOkL SIM check FALIED" ) );
 iSysApAppUi.ShowUiNoteL( EInsertSimNote );
 }
 }
 // ----------------------------------------------------------------------------
 TBool err = EFalse;
 TInt btToBeActivated = iSysApAppUi.CenRepController().GetInt( KCRUidCoreApplicationUIsSysAp,
 KSysApBtStatusBeforeOfflineMode,
 &err );
 if ( err )
 {
 TRACES( RDebug::Print( _L("CSysApOfflineModeController::BtActiveBeforeOfflineMode: ERROR: %d" ), err ) );
 return EFalse;
 }
 else
 {
 return ( TBool ) btToBeActivated;
-//return ETrue;
 }
 }
 // ----------------------------------------------------------------------------
 TBool CSysApOfflineModeController::MustBtBeActivated()
 {
 return BtActiveBeforeOfflineMode();
 }
 // End of File

branch	RCL_3
changeset 63	c2c61fdca848
parent 62	924385140d98