MCL/sf/mw/phonesrv: comparison satengine/SatServer/Engine/src/CSatCommandContainer.cpp

equal deleted inserted replaced

-:7d48bed6ce0c
+:987c9837762f
 /*
-* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-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".
 #include    <f32file.h>
 #include    <barsc.h>
 #include    <bautils.h>
+#include    <SatServer.rsg>
 #include    <ecom.h>
 #include    <e32property.h>
 #include    <data_caging_path_literals.hrh>
 #include    <startupdomainpskeys.h>
 #include    <satdomainpskeys.h>
-#include    <hbtextresolversymbian.h>
 #include    "MSatSystemState.h"
 #include    "TSatSystemStateFactory.h"
 #include    "MSatSystemStateChangeNotifier.h"
 #include    "CSatCommandContainer.h"
 #include    "csatprofilechangeobserver.h"
 #include    "SATInternalPSKeys.h"
 #include    "csatmultimodeapi.h"
 #include    "csatsactivewrapper.h"
-_LIT( KResourceDrive, "z:\\resource\\qt\\translations" );
+// Drive letter for resource file
-_LIT( KSatServerRsc, "satapp_");
+_LIT( KResourceDrive, "Z:" );
-_LIT( KSatLogTitle, "txt_simatk_title_sim_services");
+// SatServer's resource file
-_LIT( KSatCmccTitle, "txt_simatk_titlw_cmcc_sim_services");
+_LIT( KSatServerRsc, "SatServer.rsc" );
 const TUid KSatInterfaceDefinitionUid = { 0x1000f001 };
 const TInt KSizeOfBuf = 50;
+const TInt8 KCreateSatAppNamePop( 2 );
 // Important plugins UIDs. These are started on startup
 // Implementation UID is from the <plugin>.rss
 const TUid KSetUpEventListUid = { 0x10202993 };
-// ======== LOCAL FUNCTIONS ========
-// -----------------------------------------------------------------------------
-// CleanupPointerArray
-// Cleanup RPointerArray objects by using the cleanup stack. Function will be
-// called when application leaves while a RPointerArray object still alive,
-// or when CleanupStack::PopAndDestroy is explicitly called to release a
-// RPointerArray. See CleanupStack::PushL( TCleanupItem ) for more details.
-// -----------------------------------------------------------------------------
-//
-static void CleanupPointerArray( TAny* aArray )
-{
-LOG2( NORMAL, "SATENGINE: CSatCommandContainer::CleanupPointerArray \
-calling array = 0x%08x", aArray )
-RImplInfoPtrArray* array = reinterpret_cast<RImplInfoPtrArray*>( aArray );
-if ( array )
-{
-array->ResetAndDestroy();
-}
-LOG( NORMAL, "SATENGINE: CSatCommandContainer::CleanupPointerArray \
-exiting" )
-}
 // ======== MEMBER FUNCTIONS ========
 // -----------------------------------------------------------------------------
 // CSatCommandContainer::NewL
 {
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::StartCommandHandlersL \
 in startup phase" )
 // Create command handlers.
 RImplInfoPtrArray satCommandImplementations;
-CleanupStack::PushL(
-TCleanupItem( CleanupPointerArray, &satCommandImplementations ) );
 REComSession::ListImplementationsL( KSatInterfaceDefinitionUid,
 satCommandImplementations );
 // Container for commands
 const TInt cmdCount( satCommandImplementations.Count() );
 iCmdHandlers->AppendL( cmd );
 CleanupStack::Pop( cmd );
 }
 }
 }
-CleanupStack::PopAndDestroy( &satCommandImplementations );
+satCommandImplementations.ResetAndDestroy();
 // Notify TSY about readiness i.e. all nofies are sent
 // Done only once in startup phase
 TInt ret = iUSatAPI->UsatClientReadyIndication();
 LOG2( NORMAL, "SATENGINE: UsatClientReadyIndication() gives %d", ret )
 User::LeaveIfError( iUSatAPI->Connect( *iMultiModeApi ) );
 }
 // Create command handlers.
 RImplInfoPtrArray satCommandImplementations;
-CleanupStack::PushL(
-TCleanupItem( CleanupPointerArray, &satCommandImplementations ) );
 REComSession::ListImplementationsL( KSatInterfaceDefinitionUid,
 satCommandImplementations );
 // Container for commands
 const TInt cmdCount( satCommandImplementations.Count() );
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::\
 StartCommandHandlersL No commands found" )
 // No commands, remove SAT Icon from shell
 iSatUiHandler.ShellController().RemoveSatUiL();
 }
-CleanupStack::PopAndDestroy( &satCommandImplementations );
+satCommandImplementations.ResetAndDestroy();
 }
 else
 {
 LOG( NORMAL, " Not starting any command handlers" )
 }
 {
 LOG( NORMAL, "SATENGINE:   Event: ECmccSimDetected" )
 iIsCmccSim = ETrue;
 // Update default name read in ConstructL.
-TRAPD( err, CreateSatAppNameL( KSatCmccTitle ) );
+TRAPD( err, CreateSatAppNameL( R_QTN_SAT_CMCC_TITLE ) );
 LOG2( NORMAL, "SATENGINE:   Error: %i", err )
 if ( KErrNone == err )
 {
 // Notify application name update.
 NotifyEvent( EApplNameUpdated );
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::RestoreSatAppNameL calling" )
 if ( !iIsCmccSim )
 {
 LOG( NORMAL,
 "SATENGINE: CSatCommandContainer::RestoreSatAppNameL name reset" )
-CreateSatAppNameL( KSatLogTitle );
+CreateSatAppNameL( R_QTN_SAT_LOG_TITLE );
 }
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::RestoreSatAppNameL exiting" )
 }
 // -----------------------------------------------------------------------------
 void CSatCommandContainer::ConstructL()
 {
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::ConstructL calling" )
 iIsCmccSim = EFalse;
-CreateSatAppNameL( KSatLogTitle );
+CreateSatAppNameL( R_QTN_SAT_LOG_TITLE );
 // Register for ui events in order to keep track if user or command
 // has launched the ui.
 iEventMediator.RegisterL( this, MSatUtils::ESatUiClosed );
 iEventMediator.RegisterL( this, MSatUtils::ECmccSimDetected );
 // -----------------------------------------------------------------------------
 // CSatCommandContainer::CreateSatAppNameL
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-void CSatCommandContainer::CreateSatAppNameL( const TDesC& aResourceId )
+void CSatCommandContainer::CreateSatAppNameL( const TInt aResourceId )
 {
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::CreateSatAppNameL calling" )
-delete iSatAppName;
-iSatAppName = NULL;
+// Open the RFs session.
-const TBool textResolver = HbTextResolverSymbian::Init(
+RFs fs;
-KSatServerRsc, KResourceDrive );
-LOG2(NORMAL,"SATENGINE: CSatCommandContainer::\
+User::LeaveIfError( fs.Connect() );
-CreateSatAppNameL textResolver = %d", textResolver )
-LOG2(NORMAL,"SATENGINE: CSatCommandContainer::\
+// Push close operation in tbe cleanup stack
-CreateSatAppNameL aResourceId = %S", &aResourceId )
+CleanupClosePushL( fs );
-iSatAppName = HbTextResolverSymbian::LoadL( aResourceId );
+RResourceFile resFile;
-LOG2(NORMAL,"SATENGINE: CSatCommandContainer::\
+// Backslashes are already defined in resource file, not needed here.
-CreateSatAppNameL iSatAppName = %S", iSatAppName )
+TBuf<KSizeOfBuf> buf( KResourceDrive );
+buf.Append( KDC_RESOURCE_FILES_DIR );
+buf.Append( KSatServerRsc );
+TFileName fileName( buf );
+BaflUtils::NearestLanguageFile( fs, fileName );
+// Open the resource file
+resFile.OpenL( fs, fileName );
+// Push close operation in the cleanup stack
+CleanupClosePushL( resFile );
+resFile.ConfirmSignatureL( ESatSResourceSignature );
+// Reads a resource structure with memory allocation.
+HBufC8* dataBuffer = resFile.AllocReadLC( aResourceId );
+TResourceReader resReader;
+resReader.SetBuffer( dataBuffer );
+// Reads a string with memory allocation
+iSatAppName = resReader.ReadHBufCL();
 iSatBipName.Copy( SatAppName() );
+// dataBuffer
+CleanupStack::PopAndDestroy( dataBuffer );
+// resFile, Calls resFile.Close()
+// fs, Calls fs.Close
+CleanupStack::PopAndDestroy( KCreateSatAppNamePop );
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::CreateSatAppNameL exiting" )
 }
 // -----------------------------------------------------------------------------
 // CSatCommandContainer::CreateAndGetBIPUtilsL
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::\
 StartImportantCommandHandlersL calling" )
 // Create command handlers.
 RImplInfoPtrArray satCommandImplementations;
-CleanupStack::PushL(
-TCleanupItem( CleanupPointerArray, &satCommandImplementations ) );
 REComSession::ListImplementationsL( KSatInterfaceDefinitionUid,
 satCommandImplementations );
 // Container for commands
 const TInt cmdCount( satCommandImplementations.Count() );
 LOG2( NORMAL, "SATENGINE: CSatCommandContainer::\
 StartImportantCommandHandlersL Command handler count: %d", cmdCount )
 CleanupStack::PushL( setUpEventListCmd );
 iCmdHandlers->AppendL( setUpEventListCmd );
 CleanupStack::Pop( setUpEventListCmd );
 }
 }
-CleanupStack::PopAndDestroy( &satCommandImplementations );
+satCommandImplementations.Close();
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::\
 StartImportantCommandHandlersL exiting" )
 }
 // -----------------------------------------------------------------------------
 // Startup phase is over
 iStartupPhase = EFalse;
 }
 LOG( NORMAL, "SATENGINE: CSatCommandContainer::CheckStartupState exiting" )
 }
-// End Of File

branch	RCL_3
changeset 20	987c9837762f
parent 19	7d48bed6ce0c