diff -r 8ab6687fb94c -r 3adadc800673 telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp --- a/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Thu May 27 14:05:07 2010 +0300 +++ b/telephonyserverplugins/simatktsy/src/CSatNotifyLaunchBrowser.cpp Fri Jun 11 14:49:29 2010 +0300 @@ -1,4 +1,4 @@ -// Copyright (c) 2005-2009 Nokia Corporation and/or its subsidiary(-ies). +// Copyright (c) 2005-2010 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" @@ -20,6 +20,12 @@ //INCLUDES + +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "CSatNotifyLaunchBrowserTraces.h" +#endif + #include // Etel SAT IPC definitions #include "CSatTsy.h" // Tsy class header #include "CSatNotifyLaunchBrowser.h"// Tsy class header @@ -27,7 +33,6 @@ #include "CBerTlv.h" // Ber Tlv data handling #include "TTlv.h" // TTlv class #include "CSatDataPackage.h" // Parameter packing -#include "TfLogger.h" // For TFLOGSTRING #include "TSatUtility.h" // Utilities #include "CSatTsyReqHandleStore.h" // Request handle class #include "cmmmessagemanagerbase.h" // Message manager class for forwarding req. @@ -42,13 +47,13 @@ CSatNotificationsTsy* aNotificationsTsy ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::NewL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_1, "CSAT: CSatNotifyLaunchBrowser::NewL"); CSatNotifyLaunchBrowser* const satNotifyLaunchBrowser = new ( ELeave ) CSatNotifyLaunchBrowser( aNotificationsTsy ); CleanupStack::PushL( satNotifyLaunchBrowser ); satNotifyLaunchBrowser->ConstructL(); CleanupStack::Pop( satNotifyLaunchBrowser ); - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::NewL, end of method"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NEWL_2, "CSAT: CSatNotifyLaunchBrowser::NewL, end of method"); return satNotifyLaunchBrowser; } @@ -62,7 +67,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_DTOR_1, "CSAT: CSatNotifyLaunchBrowser::~CSatNotifyLaunchBrowser"); } // ----------------------------------------------------------------------------- @@ -88,7 +93,7 @@ // None ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ConstructL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CONSTRUCTL_1, "CSAT: CSatNotifyLaunchBrowser::ConstructL"); iSsStatus = CSatNotificationsTsy::ENotBusy; } @@ -104,7 +109,7 @@ const TDataPackage& aPackage ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::Notify"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_NOTIFY_1, "CSAT: CSatNotifyLaunchBrowser::Notify"); // Save data pointer to client side for completion iLaunchBrowserV2Pckg = reinterpret_cast( aPackage.Des1n() ); @@ -128,7 +133,7 @@ const TTsyReqHandle aTsyReqHandle ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CancelNotification"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CANCELNOTIFICATION_1, "CSAT: CSatNotifyLaunchBrowser::CancelNotification"); // Reset the request handle TTsyReqHandle reqHandle = iNotificationsTsy->iSatReqHandleStore-> @@ -155,7 +160,7 @@ TInt aErrorCode ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_1, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL"); TInt ret( KErrNone ); TInt returnValue( KErrNone ); // Unpack parameters @@ -183,8 +188,7 @@ // Check if busy if ( CSatNotificationsTsy::ENotBusy != iSsStatus ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \ - iSsStatus is busy"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_2, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, iSsStatus is busy"); if( CSatNotificationsTsy::EUssdBusy == iSsStatus) { @@ -201,8 +205,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL \ - No SS Transaction ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_3, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL No SS Transaction ongoing"); // Complete right away if error has occured, otherwise continue.. if ( KErrNone == aErrorCode ) { @@ -236,8 +239,7 @@ case KLaunchBrowserCmdQualifierNotUsed: case KLaunchBrowserCmdQualifierReserved: { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Command Type not understood"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_4, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Command Type not understood"); CreateTerminalRespL( pCmdNumber, RSat::KCmdTypeNotUnderstood, KNoCause ); ret = KErrCorrupt; @@ -298,8 +300,7 @@ if ( KErrNotFound != returnValue ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Alpha ID present"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_5, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID present"); TUint8 alphaIdLength( alphaIdentifier.GetLength() ); if ( alphaIdLength ) { @@ -318,8 +319,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - CompleteNotifyL, Alpha ID is NULL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_6, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Alpha ID is NULL"); launchBrowserV2.iAlphaId.iStatus = RSat::EAlphaIdNull; } @@ -341,8 +341,7 @@ }// End of if ( reqHandle != CSatTsy::ESatReqHandleUnknown ) else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, \ - Request not ongoing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_COMPLETENOTIFYL_7, "CSAT: CSatNotifyLaunchBrowser::CompleteNotifyL, Request not ongoing"); // Request not on, returning response immediately CreateTerminalRespL( pCmdNumber, RSat::KMeUnableToProcessCmd, KNoCause ); @@ -363,7 +362,7 @@ TDes8* aRsp ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_1, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL"); TInt ret( KErrNone ); TUint8 additionalInfo( KNoCause ); RSat::TLaunchBrowserRspV2Pckg* aRspPckg = @@ -388,8 +387,7 @@ ( RSat::KNetworkUnableToProcessCmd != rspV2.iGeneralResult ) && ( RSat::KCmdNumberNotKnown != rspV2.iGeneralResult ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid General Result"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_2, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid General Result"); // Invalid general result ret = KErrCorrupt; } @@ -402,8 +400,7 @@ ( RSat::KMeUnableToReadProvisioningData != rspV2.iInfoType ) && ( RSat::KNoSpecificBrowserError != rspV2.iInfoType ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid Info Type"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_3, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Info Type"); ret = KErrCorrupt; } @@ -417,8 +414,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, \ - Invalid Additional Info"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_TERMINALRESPONSEL_4, "CSAT: CSatNotifyLaunchBrowser::TerminalResponseL, Invalid Additional Info"); // Invalid additional info field ret = KErrCorrupt; } @@ -442,8 +438,7 @@ { // Unpack parameters aDataPackage->UnPackData( iSsStatus ); - TFLOGSTRING2("CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", - iSsStatus ); + OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_SETSSSTATUS_1, "CSAT: CSatNotifyLaunchBrowser::SetSatTsySsStatus, status: %d", iSsStatus ); } // ----------------------------------------------------------------------------- @@ -458,7 +453,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId"); TInt ret( KErrNone ); CTlv browserId; // optional TInt returnValue = aBerTlv.TlvByTagValue( &browserId, @@ -481,8 +476,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, \ - Browser ID not set"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBROWSERIDL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBrowserId, Browser ID not set"); aLaunchBrowserV2.iBrowserId = RSat::EBrowserIdNotSet; } return ret; @@ -500,7 +494,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_1, "CSAT: CSatNotifyLaunchBrowser::ParseUrl"); TInt ret( KErrNone ); CTlv url; // mandatory TInt returnValue = aBerTlv.TlvByTagValue( &url, KTlvUrlTag ); @@ -509,8 +503,7 @@ { if ( RSat::KUrlMaxSize < url.GetLength() ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \ - False URL length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_2, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, False URL length"); CreateTerminalRespL( aPCmdNumber, RSat::KMeUnableToProcessCmd, KNoCause ); ret = KErrCorrupt; @@ -522,8 +515,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseUrl, \ - Required values missing"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEURLL_3, "CSAT: CSatNotifyLaunchBrowser::ParseUrl, Required values missing"); CreateTerminalRespL( aPCmdNumber, RSat::KErrorRequiredValuesMissing, KNoCause ); ret = KErrCorrupt; @@ -543,7 +535,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList"); TInt ret( KErrNone ); CTlv provisioningFileList; // optional @@ -599,8 +591,7 @@ if ( ( RSat::KFileRefMaxSize < stringLength ) || ( 4 > stringLength ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - ParseProvisioningFileList, False string length"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, False string length"); CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KMeUnableToReadProvisioningData ); ret = KErrCorrupt; @@ -618,8 +609,7 @@ // Adding the new fileref if ( KErrNoMemory == aLaunchBrowserV2.AddFileRef( newFileRef ) ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::\ - ParseProvisioningFileList, Menu items corrupted"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEPROVISIONINGFILELISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseProvisioningFileList, Menu items corrupted"); // Too many or long menuitems CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KMeUnableToReadProvisioningData ); @@ -645,7 +635,7 @@ RSat::TLaunchBrowserV2& aLaunchBrowserV2 ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_1, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList"); TInt ret( KErrNone ); // Bearers (optional) CTlv bearerList; @@ -670,8 +660,7 @@ if ( 0x00 == aLaunchBrowserV2.iBearerList.Length() ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\ - Bearer unvailable"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_2, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer unvailable"); CreateTerminalRespL( aPCmdNumber, RSat::KLaunchBrowserError, RSat::KBearerUnvailable ); ret = KErrCorrupt; @@ -679,8 +668,7 @@ } else { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::ParseBearerList,\ - Bearer List length exceeded"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_PARSEBEARERLISTL_3, "CSAT: CSatNotifyLaunchBrowser::ParseBearerList, Bearer List length exceeded"); CreateTerminalRespL( aPCmdNumber, RSat::KCmdDataNotUnderstood, RSat::KCmdDataNotUnderstood ); ret = KErrCorrupt; @@ -702,7 +690,7 @@ TUint8 aAdditionalInfo ) { - TFLOGSTRING("CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL"); + OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSATNOTIFYLAUNCHBROWSER_CREATETERMINALRESPL_1, "CSAT: CSatNotifyLaunchBrowser::CreateTerminalRespL"); TTlv tlvSpecificData; tlvSpecificData.AddTag( KTlvResultTag ); // Create General Result TLV here