FCL/sf/app/phone: comparison phoneapp/phoneuiutils/src/ctelerecoverysystem.cpp

equal deleted inserted replaced

-:c84cf270c54f
+:92ab7f8d0eab
 #include    "ctelerecoverysystem.h"
 #include    <e32svr.h>
 #include    <startupdomainpskeys.h>
 #include    "phonelogger.h"
-#include  	"phoneui.pan"
+#include    "phoneui.pan"
 #include    "cphonetimer.h"
 #include    "ctelewaitingidle.h"
 // CONSTANTS
 if ( iWaitingIdle )
 {
 delete iWaitingIdle;
 iWaitingIdle = NULL;
 }
 delete iRecoveryItems;
 delete iTimer;
 delete iAllStepsTimer;
 }
 //
 TPhoneRecoveryId CTeleRecoverySystem::AddL( TCallBack aCallBack,
 TPhoneRecoveryPriority aPriority, TRecoveryState aState )
 {
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::AddL()" );
-	__ASSERT_DEBUG( !iIsCallBack, Panic( EPhoneUtilsNoCallBack ) );
+__ASSERT_DEBUG( !iIsCallBack, Panic( EPhoneUtilsNoCallBack ) );
 CheckStateForPrecondition( aState );
 iIdCounter++;
 TInt count = iRecoveryItems->Count();
 // -----------------------------------------------------------------------------
 //
 TPhoneRecoveryId CTeleRecoverySystem::Add( TCallBack aCallBack,
 TPhoneRecoveryPriority aPriority, TRecoveryState aState )
 {
-	__LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::AddL()" );
+__LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::AddL()" );
 TPhoneRecoveryId id = KNullId;
 TRAP_IGNORE( id = AddL( aCallBack, aPriority, aState ) );
 return id;
 }
 // CTeleRecoverySystem::Remove
 // -----------------------------------------------------------------------------
 //
 void CTeleRecoverySystem::Remove( TPhoneRecoveryId aId )
 {
-	__LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::Remove()" );
+__LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::Remove()" );
-	__ASSERT_DEBUG( !iIsCallBack, Panic( EPhoneUtilsNoCallBack ) );
+__ASSERT_DEBUG( !iIsCallBack, Panic( EPhoneUtilsNoCallBack ) );
 TInt count = iRecoveryItems->Count();
 __PHONELOG1(
 EBasic,
 for ( TInt i = 0; i < count; i++ )
 {
 if( iRecoveryItems->At( i ).iId == aId )
 {
 iRecoveryItems->Delete( i );
-		    __PHONELOG1(
+__PHONELOG1(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::Delete itemIdx= %d:", i );
+"CTeleRecoverySystem::Delete itemIdx= %d:", i );
 return;
 }
 }
 }
 TRecoveryItem& item = iRecoveryItems->At( i );
 if( item.iId == aId )
 {
 item.iState = aState;
 StartTimerIfRequired( aState );
-		    __PHONELOG1(
+__PHONELOG1(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::SetState itemIdx= %d:", item.iId );
+"CTeleRecoverySystem::SetState itemIdx= %d:", item.iId );
 return;
 }
 }
 }
 // CTeleRecoverySystem::RecoverAllNow
 //
 // -----------------------------------------------------------------------------
 //
 void CTeleRecoverySystem::RecoverAllNow()
-	{
+{
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::RecoverAllNow()" );
 StartTimerIfIdle();
 StartAllStepsTimer();
-	}
+}
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::EnablePrecondition
 //
 // -----------------------------------------------------------------------------
 TRecoveryItem& item = iRecoveryItems->At( index );
 CheckStateForPrecondition( item.iState );
 }
-	if ( IsIdle() )
+if ( IsIdle() )
-	    {
+{
-	    iTimer->Cancel();
+iTimer->Cancel();
-	    StartTimer();
+StartTimer();
-	    }
+}
 }
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::Resume
 //
 {
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::RunL()" );
 if ( iStatus != KErrNone )
 {
 // If SIM is already available, just listen for SIM status.
-	    if ( iSimAvailable == ESimUsable )
+if ( iSimAvailable == ESimUsable )
-	        {
+{
-	        iRequest = EPhoneSIMStatus;
+iRequest = EPhoneSIMStatus;
-	        }
+}
-	    else
+else
-	        {
+{
-	        iRequest = EPhoneSIMPresent;
+iRequest = EPhoneSIMPresent;
-	        }
+}
 __PHONELOG1(
-	        EBasic,
+EBasic,
-	        EPhoneUIUtils,
+EPhoneUIUtils,
-	        "CTeleRecoverySystem::RunL NewRq = %d ", (TInt) iRequest );
+"CTeleRecoverySystem::RunL NewRq = %d ", (TInt) iRequest );
 IssueRequest();
 return;
 }
 if ( iSimAvailable == ESimUsable )
 {
 iRequest = EPhoneSIMStatus;
-			__PHONELOG1(
+__PHONELOG1(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::RunL NewRq = %d ", (TInt) iRequest );
+"CTeleRecoverySystem::RunL NewRq = %d ", (TInt) iRequest );
 }
 else
 {
 // SIM is not yet available, start listening again.
 IssueRequest();
 #endif // _DEBUG
 TInt err = KErrNone;
 TRAPD( leaveErr, err = aItem.iCallBack.CallBack() );
-	__PHONELOG1(
+__PHONELOG1(
 EBasic,
 EPhoneUIUtils,
 "CTeleRecoverySystem::DoItemCallBack Err = %d ", leaveErr );
 #ifdef _DEBUG
 void CTeleRecoverySystem::StartTimerIfRequired( TRecoveryState aNewState )
 {
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::StartTimerIfRequired()");
 if ( IsIdle() )
-	{
+{
-	    if ( aNewState == EPhoneStateWaiting )
+if ( aNewState == EPhoneStateWaiting )
-	        {
+{
-	        StartTimerIfIdle();
+StartTimerIfIdle();
-	        }
+}
-	    else if ( aNewState == EPhoneStateStarting )
+else if ( aNewState == EPhoneStateStarting )
-	        {
+{
-	        StartAllStepsTimer();
+StartAllStepsTimer();
-	}
+}
-		}
+}
 }
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::IsIdle()
 // -----------------------------------------------------------------------------
 //
 TBool CTeleRecoverySystem::IsIdle()
 {
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::IsIdle()");
-	TBool retVal(EFalse);
+TBool retVal(EFalse);
-	TInt error(0);
+TInt error(0);
-	TInt state(0);
+TInt state(0);
 error = iIdleActive.Get(
 KPSUidStartup,
 KPSIdlePhase1Ok,
 state );
 if ( iWaitingIdle )
 {
 delete iWaitingIdle;
 iWaitingIdle = NULL;
 }
-	retVal = ETrue;
+retVal = ETrue;
 }
 return retVal;
 }
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::StartTimerIfIdle
 // -----------------------------------------------------------------------------
 if ( !iTimer->IsActive() )
 {
 iTickCounter = KPhoneRecoveryCounterStart;
 iTimer->After( KPhoneRecoveryTickInterval,
 TCallBack( HandleTimer, this ) );
 }
 }
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::StartAllStepsTimer
 // -----------------------------------------------------------------------------
 //
 void CTeleRecoverySystem::StartAllStepsTimer()
 {
 __LOGMETHODSTARTEND( EPhoneUIUtils, "CTeleRecoverySystem::StartAllStepsTimer()");
 if ( !iAllStepsTimer->IsActive() )
-	{
+{
-	iAllStepsTimer->After( 1, TCallBack( HandleAllStepsTimer, this ) );
+iAllStepsTimer->After( 1, TCallBack( HandleAllStepsTimer, this ) );
-	}
+}
 }
 // -----------------------------------------------------------------------------
 // CTeleRecoverySystem::StartNext
 // -----------------------------------------------------------------------------
 {
 if ( iRequest == EPhoneSIMPresent )
 {
 iSimPresentProperty.Subscribe( iStatus );
-			__PHONELOG(
+__PHONELOG(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::DoItemCallBack IssueReq.2");
+"CTeleRecoverySystem::DoItemCallBack IssueReq.2");
 }
 else
 {
-			__PHONELOG(
+__PHONELOG(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::DoItemCallBack IssueReq.3");
+"CTeleRecoverySystem::DoItemCallBack IssueReq.3");
-		    __ASSERT_DEBUG( iRequest == EPhoneSIMStatus, Panic( EPhoneUtilsNoCallBack ) );
+__ASSERT_DEBUG( iRequest == EPhoneSIMStatus, Panic( EPhoneUtilsNoCallBack ) );
 iSimStatusProperty.Subscribe( iStatus );
 }
 SetActive();
 TInt value = KErrNotFound;
 TBool simOk = EFalse;
 if ( iSimAvailable != ESimUsable )
 {
-	__PHONELOG(
+__PHONELOG(
-		        EBasic,
+EBasic,
-		        EPhoneUIUtils,
+EPhoneUIUtils,
-		        "CTeleRecoverySystem::IsSIMOk Ret 0");
+"CTeleRecoverySystem::IsSIMOk Ret 0");
 // SIM is not yet available.
 return EFalse;
 }
 // Get current status.
 }
 simOk = ( value == ESimUsable );
 __PHONELOG1(
-		    EBasic,
+EBasic,
-		    EPhoneUIUtils,
+EPhoneUIUtils,
-		    "CTeleRecoverySystem::IsSIMOk Ret: %d ",  (TInt) simOk);
+"CTeleRecoverySystem::IsSIMOk Ret: %d ",  (TInt) simOk);
 return simOk;
 }
 // -----------------------------------------------------------------------------
 // Check current SIM present state.
 if ( iSimStatusProperty.Handle() )
 {
 iSimStatusProperty.Get( iSimAvailable );
-	    __PHONELOG1(
+__PHONELOG1(
-			    EBasic,
+EBasic,
-			    EPhoneUIUtils,
+EPhoneUIUtils,
-			    "CTeleRecoverySystem::CheckSIMAvailable %d ",  iSimAvailable );
+"CTeleRecoverySystem::CheckSIMAvailable %d ",  iSimAvailable );
 if ( iSimAvailable != ESimUsable )
 {
 // Since SIM is not yet present, wait for availability.
 else
 {
 // SIM is now available, start listening for SIM status.
 iRequest = EPhoneSIMStatus;
-		    __PHONELOG1(
+__PHONELOG1(
-				    EBasic,
+EBasic,
-				    EPhoneUIUtils,
+EPhoneUIUtils,
-				    "CTeleRecoverySystem::CheckSIMAvailable new rq %d ",  (TInt) iRequest );
+"CTeleRecoverySystem::CheckSIMAvailable new rq %d ",  (TInt) iRequest );
 if ( iSimStatusProperty.Handle() )
 {
 TInt value = ESimStatusUninitialized;

changeset 21	92ab7f8d0eab
parent 0	5f000ab63145
child 51	f39ed5e045e0
child 62	5266b1f337bd