--- a/cbs/cbsui/UiInc/CCbsUiAddFromIndexDialog.h Tue Sep 14 22:26:11 2010 +0300
+++ b/cbs/cbsui/UiInc/CCbsUiAddFromIndexDialog.h Wed Oct 13 15:10:43 2010 +0300
@@ -23,7 +23,7 @@
#define __CCBSADDFROMINDEXDIALOG_H
// INCLUDES
-#include <AknDialog.h>
+#include <akndialog.h>
#include <CbsCommon.h>
#include "CbsUiConstants.h"
--- a/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/cellular/PsetNotesUi/Src/PsuiQueryDialog.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -53,18 +53,11 @@
TKeyResponse CPsuiQueryDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
TEventCode aType )
{
- const TBool noKeyReleased =
- ( aKeyEvent.iScanCode == EStdKeyNo || aKeyEvent.iCode == EKeyNo ) &&
- aType == EEventKeyUp;
- const TBool escPressed = aKeyEvent.iCode == EKeyEscape;
-
- // AknDialogShutter sends esc keys so dismiss dialog
- if ( noKeyReleased || escPressed )
+ if ( ( aKeyEvent.iScanCode == EStdKeyNo || aKeyEvent.iCode == EKeyNo ) &&
+ aType == EEventKeyUp )
{
// End -key was pressed, so exit this query dialog
- TryExitL( EKeyNo );
- RDebug::Printf("PSETNOTESUI: exiting dialog");
- return EKeyWasConsumed;
+ TryExitL( EKeyNo );
}
return EKeyWasNotConsumed;
--- a/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Tue Sep 14 22:26:11 2010 +0300
+++ b/cellular/SSSettings/inc/CSSSettingsRefreshHandler.h Wed Oct 13 15:10:43 2010 +0300
@@ -27,8 +27,8 @@
#include <MSSSettingsRefreshObserver.h>
#include <RSSSettings.h>
#include <RCustomerServiceProfileCache.h>
-#include <rsatrefresh.h>
-#include <rsatsession.h>
+#include <RSatRefresh.h>
+#include <RSatSession.h>
#include <cenrepnotifyhandler.h>
#include "CSSSettingsActiveObject.h"
--- a/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/cellular/SSSettings/src/CSSSettingsRefreshHandler.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <centralrepository.h>
-#include <rsatrefresh.h>
+#include <RSatRefresh.h>
#include <BTSapDomainPSKeys.h> // BT SAP Central Repository key.
#include <featmgr.h>
--- a/cellular/telephonysettings/src/PsetNetwork.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/cellular/telephonysettings/src/PsetNetwork.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -340,12 +340,6 @@
{
iTempNetInfo.iAccess = ENetNetworkGSM;
}
-
- /** Implementation of forbidden operator icon begins */
- // Set network status for displaying forbidden operator icon
- iTempNetInfo.iStatus = static_cast<MPsetNetworkSelect::TNetworkStatus>( nwNames.iStatus );
- /** Implementation of forbidden operator icon ends */
-
array->AppendL( iTempNetInfo );
i++;
}
--- a/phoneclientserver/CallUI/Inc/CaUiPlugin/CaUiPlugin.h Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/CallUI/Inc/CaUiPlugin/CaUiPlugin.h Wed Oct 13 15:10:43 2010 +0300
@@ -125,15 +125,12 @@
* @param aType The type of item being added
* @param aServiceId The service ID of VoIP call item, needed when
* getting the service name
- * @param aHideCallSubmenu ETrue if the call submenu items should be
- * in main level of the menu, otherwise EFalse
*/
void AddAiwMenuItemL(
CAiwMenuPane& aMenuPane,
TInt aIndex,
EMenuItemType aType,
- TServiceId aServiceId = 0,
- TBool aHideCallSubmenu = EFalse );
+ TServiceId aServiceId = 0 );
private: // Data
--- a/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/CallUI/Src/CaUiPlugin/CaUiPlugin.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -31,9 +31,6 @@
#include <CallUI.rsg>
#include <featmgr.h> // FeatureManager.
-#include <eikon.hrh> //EEikMenuItemSpecific
-
-
// CONSTANTS
// Empty filename for initialization.
@@ -217,8 +214,6 @@
TBool csVideoMenuItemAvailable( ETrue );
TBool voipMenuItemAvailable( ETrue );
- TBool hideCallSubmenu( EFalse );
-
// If there is PhoneNumber parameter given, then only voice call
// resource is wanted.
TInt count = aInParamList.Count();
@@ -251,35 +246,7 @@
csVideoMenuItemAvailable = EFalse;
}
}
-
- index = 0;
- aInParamList.FindFirst(
- index,
- EGenericParamHideCallSubmenu,
- EVariantTypeAny );
-
- if ( index >= 0 )
- {
- // The call items (voice, video and VoIP) are located in the main level
- // of the menu
- hideCallSubmenu = ETrue;
-
- TInt32 variantValue = aInParamList[ index ].Value().AsTInt32();
-
- if ( variantValue == EGenericParamVoiceCall )
- {
- csVoiceMenuItemAvailable = EFalse;
- }
- else if ( variantValue == EGenericParamVideoCall )
- {
- csVideoMenuItemAvailable = EFalse;
- }
- else if ( variantValue == EGenericParamVoIPCall )
- {
- voipMenuItemAvailable = EFalse;
- }
- }
- }
+ }
if ( csVideoMenuItemAvailable &&
!FeatureManager::FeatureSupported( KFeatureIdCsVideoTelephony ) )
@@ -293,13 +260,13 @@
if ( csVoiceMenuItemAvailable )
{
- AddAiwMenuItemL( aMenuPane, menuIndex, ECSVoice, 0, hideCallSubmenu );
+ AddAiwMenuItemL( aMenuPane, menuIndex, ECSVoice );
menuIndex++;
}
if ( csVideoMenuItemAvailable )
{
- AddAiwMenuItemL( aMenuPane, menuIndex, ECSVideo, 0, hideCallSubmenu );
+ AddAiwMenuItemL( aMenuPane, menuIndex, ECSVideo );
menuIndex++;
}
@@ -313,13 +280,13 @@
if ( 1 == numberOfVoipServices )
{
// Single VoIP service, use service name in menu item
- AddAiwMenuItemL( aMenuPane, menuIndex, EInternetWithName, voipServiceIds[0], hideCallSubmenu );
+ AddAiwMenuItemL( aMenuPane, menuIndex, EInternetWithName, voipServiceIds[0] );
menuIndex++;
}
else if ( numberOfVoipServices > 1 )
{
// Regular internet call menu
- AddAiwMenuItemL( aMenuPane, menuIndex, EInternet, 0, hideCallSubmenu );
+ AddAiwMenuItemL( aMenuPane, menuIndex, EInternet );
menuIndex++;
}
@@ -416,23 +383,13 @@
//
// -----------------------------------------------------------------------------
//
-void CCaUiPlugin::AddAiwMenuItemL(
- CAiwMenuPane& aMenuPane,
- TInt aIndex,
- EMenuItemType aType,
- TServiceId aServiceId,
- TBool aHideCallSubmenu )
+void CCaUiPlugin::AddAiwMenuItemL( CAiwMenuPane& aMenuPane, TInt aIndex, EMenuItemType aType, TServiceId aServiceId )
{
CEikMenuPaneItem::SData data;
data.iCascadeId = 0;
data.iFlags = 0;
data.iExtraText = KNullDesC();
-
- if ( aHideCallSubmenu )
- {
- data.iFlags = EEikMenuItemSpecific;
- }
-
+
HBufC* menuItemText = NULL;
switch ( aType )
--- a/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/EnPolicy/Src/SosEnPolicy/CSosEnPolicySatRefresh.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -23,8 +23,8 @@
#include "CSOSEmergencyNumberPolicyHandler.h"
#include "CSosEnPolicySatRefresh.h"
-#include <rsatrefresh.h>
-#include <rsatsession.h>
+#include <RSatRefresh.h>
+#include <RSatSession.h>
#include <startupdomainpskeys.h> // Property values
--- a/phoneclientserver/phoneserver/Group/PhoneServer.mmp Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/phoneserver/Group/PhoneServer.mmp Wed Oct 13 15:10:43 2010 +0300
@@ -135,6 +135,5 @@
LIBRARY centralrepository.lib
LIBRARY imageconversion.lib
LIBRARY bitmaptransforms.lib
-LIBRARY ecom.lib
// End of File
--- a/phoneclientserver/phoneserver/Group/bld.inf Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/phoneserver/Group/bld.inf Wed Oct 13 15:10:43 2010 +0300
@@ -21,9 +21,7 @@
DEFAULT
PRJ_EXPORTS
-../inc/Ussd/ussdinterfaceconstants.hrh MW_LAYER_PLATFORM_EXPORT_PATH(ussdinterfaceconstants.hrh)
-../inc/Ussd/CUssdExtensionInterface.h MW_LAYER_PLATFORM_EXPORT_PATH(CUssdExtensionInterface.h)
-../inc/Ussd/CUssdExtensionInterface.inl MW_LAYER_PLATFORM_EXPORT_PATH(CUssdExtensionInterface.inl)
+
backup_registration.xml z:/private/10000850/backup_registration.xml
--- a/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/phoneserver/Inc/Ussd/CPhSrvUssdManager.h Wed Oct 13 15:10:43 2010 +0300
@@ -38,8 +38,6 @@
class CAknGlobalMsgQuery;
class CPhSrvUssdSessionCancelWaiter;
class CPhSrvUssdNotifyNWRelease;
-// RM-RIM 417-66528
-class CUssdExtensionInterface;
// CLASS DECLARATION
@@ -216,18 +214,6 @@
const TDes8& aMsgData,
const RMobileUssdMessaging::TMobileUssdAttributesV1&
aMsgAttributes);
-
- // RM-RIM 417-66528
- /** Third stage handler for received messages meant for extension
- */
- void PorcessReceivedMessageInExtesnionL(const TDes8& aMsgData,
- const RMobileUssdMessaging::TMobileUssdAttributesV1&
- aMsgAttributes);
- /** Third stage handler for received messages
- */
- void ProcessReceivedMessageL(const TDes8& aMsgData,
- const RMobileUssdMessaging::TMobileUssdAttributesV1&
- aMsgAttributes);
// Restart the reply timer
void RestartReplyTimerL();
@@ -237,11 +223,6 @@
// Set timer and activate it if there are notifications available
void SetActiveIfPendingNotificationsExist();
- // RM-RIM 417-66528
- // Create and Initialize the global message query
- void CreateGlobalMessageQueryL(
- const RMobileUssdMessaging::TMobileUssdAttributesV1&
- aMsgAttributes);
// Launch the global message query (used from RunL)
void LaunchGlobalMessageQueryL();
@@ -437,10 +418,6 @@
// An asynchronous callback for sending MO ACK messages
CAsyncCallBack* iMoAckCallback;
-
- // RM-RIM 417-66528
- // Pointer to the UssdExtension
- CUssdExtensionInterface* iUssdExtnInterface;
};
#endif // CPHSRVUSSDMANAGER_H
--- a/phoneclientserver/phoneserver/Inc/Ussd/CUssdExtensionInterface.h Tue Sep 14 22:26:11 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2002-2005 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: Extends the ussd functionality.
- *
- */
-#ifndef __CUSSDEXTENSIONINTERFACE_H__
-#define __CUSSDEXTENSIONINTERFACE_H__
-
-// INCLUDES
-
-#include <ecom/ecom.h>
-#include <etelmm.h>
-#include <ussdinterfaceconstants.hrh>
-// FORWARD DECLARATIONS
-
-// CONSTANTS
-const TUid KUssdExtensionInterfaceUid =
- {
- KUssdExtensionInterfaceUidValue
- };
-
-// CLASS DECLARATION
-
-/**
- * Base class for Ussd Extension Plugin.
- *
- * This API allows customizing the USSD sending feature of the S60 Telephony
- * applications at runtime.
- *
- * The API defines two roles:
- * 1) Validates the USSD string while sending. if it is unauthorized
- * in the context shall terminate the request.
- * 2) Validates the USSD string while receiving, the extension will get the first chance to consume the reply if needed
- *
- *
- * Note:
- * The customizer needs only one plug-in implementation for a variant, and so supports only rom-only plug-in.
- */
-class CUssdExtensionInterface : public CBase
- {
-public:
- // Constructors and destructor
- /**
- * NewL
- * Wraps ECom object instantitation. Will return the
- * default interface implementation, which matches to
- * given aOperationName.
- */
- static CUssdExtensionInterface* NewL();
-
- /**
- * NewL
- * Wraps ECom object instantitation. Will search for
- * interface implementation, which matches to given
- * aOperationName.
- * @param aOperationName name of requested implementation.
- * Implementations advertise their "name" as specified
- * in their resource file field
- * IMPLEMENTATION_INFO::default_data.
- */
- static CUssdExtensionInterface* NewL(const TDesC8& aMatch);
-
-public:
- // API to be implemented by ECOM plug-in
-
- /**
- * Validate/Authenticate the Ussd string Before Sending from
- * the USSD Send handler
- * When Ussd Extention plugin return true, then ussd manager will continue sending of the ussd
- * Otherwise the transaction will be terminated with KErrAccessDenined
- *
- * @param aMessageData
- * @param aMessageAttributes .
- */
- virtual TBool
- ValidateUssdMsgSending(
- const TDesC8& aMessageData,
- const RMobileUssdMessaging::TMobileUssdAttributesV1& aMsgAttribute) = 0;
- /**
- * Validate/Authenticate the Ussd response received by the
- * USSD receive handler
- *
- * @param aMessageData
- * @return true implies that the ussd response is valid for the extension.
- * otherwise pass it to the observer. .
- */
- virtual TBool ValidateUssdResponse(const TDesC8& aMessage) = 0;
- /**
- * if ValidateUssdResponse returns true, then the extension plugin is waiting for the response
- * so invoke the interface to deligate to the plugin.
- * Example:
- * ...
- * TBool isValidForExtension = iUssdExtnInterface->ValidateUssdResponse(aMsgData);
- * TInt errfromextension = KErrNone;
- * if (isValidForExtension)
- * {
- * TRAPD(err, iUssdExtnInterface->ProcessReceivedUssdL(iDecodedMessage, errfromextension));
- * ...
- *
- * @param aMessageData
- * @return error code
- * @leave On typical leave level problems.
- */
- virtual void
- ProcessReceivedUssdL(const TDesC& aMessageData, TInt aError) = 0;
-
- /**
- * Notify the any network error to the extension, so that it can handle the internal states if required
- * @param aError
- */
- virtual void NotifyNWError(TInt aError)=0;
-
-public:
- /**
- * ~CUssdExtensionInterface
- *
- * Cleans up resources, specifically notify ECOM server that this
- * instance is being deleted.
- */
- virtual ~CUssdExtensionInterface();
-
-private:
- TUid iDtor_ID_Key; // Identification on cleanup
- };
-#include "CUssdExtensionInterface.inl"
-#endif // __CUSSDEXTENSIONINTERFACE_H__
--- a/phoneclientserver/phoneserver/Inc/Ussd/CUssdExtensionInterface.inl Tue Sep 14 22:26:11 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Interface's (abstract base class's) static factory method implementation.
-*
-*/
-
-#include <e32def.h>
-#include <ecom/ecom.h>
-
-// ---------------------------------------------------------------------------
-// CUssdExtensionInterface::NewL
-// Interface's (abstract base class's) static factory method implementation.
-// Asks ECOM plugin framework to instantiate appropriate concret plugin
-// implementation.
-// ---------------------------------------------------------------------------
-//
-inline CUssdExtensionInterface* CUssdExtensionInterface::NewL()
- {
- TEComResolverParams resolutionParameters;
- resolutionParameters.SetGenericMatch(ETrue);
- TAny* interface = REComSession::CreateImplementationL (
- KUssdExtensionInterfaceUid, _FOFF (CUssdExtensionInterface, iDtor_ID_Key), resolutionParameters, KRomOnlyResolverUid);
-
- return reinterpret_cast <CUssdExtensionInterface*> (interface);
- }
-
-// ---------------------------------------------------------------------------
-// CUssdExtensionInterface::NewL
-// Interface's (abstract base class's) static factory method implementation.
-// Asks ECOM plugin framework to instantiate appropriate concret plugin
-// implementation.
-// ---------------------------------------------------------------------------
-//
-inline CUssdExtensionInterface* CUssdExtensionInterface::NewL(const TDesC8& aOperationName)
- {
- TEComResolverParams resolverParams;
- resolverParams.SetDataType (aOperationName);
- resolverParams.SetWildcardMatch (ETrue);
-
- TAny* interface = REComSession::CreateImplementationL (KUssdExtensionInterfaceUid,
- _FOFF (CUssdExtensionInterface, iDtor_ID_Key), resolverParams, KRomOnlyResolverUid);
-
- return reinterpret_cast <CUssdExtensionInterface*> (interface);
- }
-
-// ---------------------------------------------------------------------------
-// CUssdExtensionInterface::~CUssdExtensionInterface
-// Interface's (abstract base class's) destructor
-// ---------------------------------------------------------------------------
-//
-inline CUssdExtensionInterface::~CUssdExtensionInterface()
- {
- REComSession::DestroyedImplementation (iDtor_ID_Key);
- }
-
-
--- a/phoneclientserver/phoneserver/Inc/Ussd/ussdinterfaceconstants.hrh Tue Sep 14 22:26:11 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: common definitions of the ussd extension.
-*
-*/
-#ifndef T_USSDINTERFACECONSTANTS_HRH
-#define T_USSDINTERFACECONSTANTS_HRH
-
-
-const TInt KUssdExtensionInterfaceUidValue = 0x200315D0;
-
-
-#endif // T_USSDINTERFACECONSTANTS_HRH
--- a/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/phoneclientserver/phoneserver/Src/Ussd/CPhSrvUssdManager.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -56,8 +56,6 @@
#include <telservicesinternalcrkeys.h>
#include <coreapplicationuisdomainpskeys.h>
-//RM-RIM 417-66528
-#include <CUssdExtensionInterface.h>
// CONSTANTS
const TInt KPhSrvDefaultValue = 0x00000000;
@@ -438,10 +436,6 @@
delete iMoAckCallback;
- // RM-RIM 417-66528
- delete iUssdExtnInterface;
- iUssdExtnInterface = NULL;
-
_DPRINT( 4, "PhSrv.~CPhSrvUssdManager.end" ); // debug print
}
@@ -498,10 +492,6 @@
_DDPRINT( 4, "PhSrv.ConstructL.iSatCanceled ", iSatCanceled );
_DDPRINT( 4, "PhSrv.ConstructL.iShowDone ", iShowDone );
iNotifyArray = new( ELeave ) CDesCArrayFlat( KPhrUssdNotifyArraySize );
-
- // RM-RIM 417-66528
- TRAP_IGNORE(iUssdExtnInterface = CUssdExtensionInterface::NewL());
- _DPRINT( 4, "PhSrv.ConstructL.iUssdExtnInterface Created");
_DPRINT( 4, "PhSrv.ConstructL.End" ); // debug print
}
@@ -560,16 +550,6 @@
_DPRINT( 4, "PhSrv.SendUssdL.Start ######" ); // debug print
_DPRINT_FLAGS();
- //417-66528
- if (iUssdExtnInterface)
- {
- if(!iUssdExtnInterface->ValidateUssdMsgSending(aMsgData,aMsgAttribute))
- {
- // invalid attempt to send USSD message. Show the note
- User::Leave( KErrAccessDenied );
- }
- }
-
if ( iObserver && iNetworkReleased )
{
// Network has been released but the previous send request is still alive.
@@ -830,14 +810,6 @@
{
iReceivedMessage = iDecodedMessage;
}
- // 4. Invoke UssdExtensionPlugin
- // 417-66528
- TBool isResponseValidated = EFalse;
- if (iUssdExtnInterface)
- {
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.InvokeExtension" );
- isResponseValidated = iUssdExtnInterface->ValidateUssdResponse(aMsgData);
- }
// 5. Show note.
// debug print
_DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.Note" );
@@ -852,156 +824,110 @@
return;
}
}
- //6. Check if the response is valid for the extension
- //RM-RIM 417-66528
- if (iUssdExtnInterface && isResponseValidated)
- PorcessReceivedMessageInExtesnionL(aMsgData, aMsgAttributes);
- else
- ProcessReceivedMessageL(aMsgData, aMsgAttributes);
-
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.Editor" );
- if (aMsgAttributes.iType == RMobileUssdMessaging::EUssdMTRequest
- && UssdAppTaskExistsL())
- {
- iEmptyEditor = ETrue;
- } _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.End" );
- }
-// -----------------------------------------------------------------------------
-// CPhSrvUssdManager::ProcessReceivedMessageL
-//
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CPhSrvUssdManager::ProcessReceivedMessageL(const TDes8& /*aMsgData*/,
- const RMobileUssdMessaging::TMobileUssdAttributesV1& aMsgAttributes)
- {
+
// empty string is handled as ok message
- if (!iDecodedMessage.Length())
+ if ( !iDecodedMessage.Length() )
{
TurnLightsOn(); //Ensure lights on
+ // debug print
+ _DPRINT( 4,
+ "PhSrv.UssdHandleReceivedEventL.EmptyString" );
+
+ ShowDoneNoteL();
// debug print
_DPRINT( 4,
- "PhSrv.UssdHandleReceivedEventL.EmptyString" );
- ShowDoneNoteL();
- // debug print
- _DPRINT( 4,
- "PhSrv.UssdHandleReceivedEventL.EmptyString.OK" );
+ "PhSrv.UssdHandleReceivedEventL.EmptyString.OK" );
}
else
{
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.String" );
- iNotifyMessage = (aMsgAttributes.iType
- == RMobileUssdMessaging::EUssdMTNotify);
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.String" );
+ iNotifyMessage = ( aMsgAttributes.iType == RMobileUssdMessaging::EUssdMTNotify );
+ _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
_DDPRINT( 4, "PhSrv.UssdNOHREventL.iNotifyMessage: ", iNotifyMessage );
- iMsgTypeReply = (aMsgAttributes.iType
- == RMobileUssdMessaging::EUssdMTReply);
+ iMsgTypeReply = ( aMsgAttributes.iType == RMobileUssdMessaging::EUssdMTReply );
_DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iMsgTypeReply: ", iMsgTypeReply );
-
- if (iNotifyMessage)
+
+ if ( iNotifyMessage )
{
// need to send an MO ack
- iAcksToBeSent++;
+ iAcksToBeSent ++;
+ }
+
+ if ( iNotifyMessage || iMsgTypeReply )
+ {
+ //This is for reply message in notifyarray
+ iNotifyMessage = ETrue;
+ _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
+
+ //Notify added to array
+ iNotifyArray->AppendL( iReceivedMessage );
+
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.AppendL" ); // debug print
+ UpdateNotifyMessage();
+
+ if ( !iSendRelease && NotifyCount() <= 1 )
+ {
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.!SendRelease.Cancel" ); // debug print
+ Cancel();
+ }
+ }
+ else
+ {
+ // New message deletes old message, i.e. Cancel existing query.
+ Cancel();
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.NewAnswerable" ); // debug print
+ }
+
+ if ( !iGlobalMsgQuery )
+ {
+ iGlobalMsgQuery = CAknGlobalMsgQuery::NewL();
}
- if (iNotifyMessage || iMsgTypeReply)
- {
- //This is for reply message in notifyarray
- iNotifyMessage = ETrue;
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
+ // Delay after message query so that application execution order will
+ // be correct.
+ iGlobalMsgQuery->SetExitDelay( KPhSrvUssdNoteExitPeriod );
- //Notify added to array
- iNotifyArray->AppendL(iReceivedMessage);
+ TInt softkeys = R_AVKON_SOFTKEYS_USSD_ANSWER_EXIT__ANSWER;
+ if( !( aMsgAttributes.iFlags & RMobileUssdMessaging::KUssdMessageType )
+ || aMsgAttributes.iType != RMobileUssdMessaging::EUssdMTRequest )
+ {
+ softkeys = R_AVKON_SOFTKEYS_EXIT;
+ }
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.AppendL" ); // debug print
- UpdateNotifyMessage();
+ // Set timer that lauches Global MessageQuery after time interval.
+ iSoftkeys = softkeys;
+
+ // debug print
+ _DPRINT( 4,
+ "PhSrv.UssdHandleReceivedEventL.String.Middle" );
- if (!iSendRelease && NotifyCount() <= 1)
- {
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.!SendRelease.Cancel" ); // debug print
- Cancel();
- }
+ // Play the USSD tone if needed. Logically should be in RunL, but here
+ // to give better balancing with voice and visible message.
+ if ( IsTelephonyFeatureSupported( KTelSrvLVFlagUssdTone ) )
+ {
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.PlayTone" );
+ PlayUssdTone();
}
- else
+
+ // Launch the new message query
+ if ( !IsActive() )
{
- // New message deletes old message, i.e. Cancel existing query.
- Cancel();
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.NewAnswerable" ); // debug print
+ iLaunchGMQ = ETrue;
+ iTimer.After( iStatus , KPhSrvUssdMessageQueryInterval );
+ SetActive();
}
- CreateGlobalMessageQueryL(aMsgAttributes);
AsyncProcessMoAcks();
- }
- _DPRINT( 4, "PhSrv.ProcesdReceivedMessageL.End" );
+ }
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.Editor" );
+ if( aMsgAttributes.iType == RMobileUssdMessaging::EUssdMTRequest && UssdAppTaskExistsL() )
+ {
+ iEmptyEditor = ETrue;
+ }
+ _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.End" );
}
// -----------------------------------------------------------------------------
-// CPhSrvUssdManager::PorcessReceivedMessageInExtesnionL
-//
-//
-//
-// -----------------------------------------------------------------------------
-//
-void CPhSrvUssdManager::PorcessReceivedMessageInExtesnionL(
- const TDes8& /*aMsgData*/,
- const RMobileUssdMessaging::TMobileUssdAttributesV1& aMsgAttributes)
- {
- TInt errfromextension = KErrNone;
- // empty string is handled as ok message
- if (!iDecodedMessage.Length())
- {
- // debug print
- _DPRINT( 4,
- "PhSrv.UssdHandleReceivedEventL.EmptyString" );
- //RM-RIM 417-66528
- TRAP_IGNORE(iUssdExtnInterface->ProcessReceivedUssdL(iDecodedMessage, errfromextension));
- // debug print
- _DPRINT( 4,
- "PhSrv.UssdHandleReceivedEventL.EmptyString.OK" );
- }
- else
- {
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.String" );
- iNotifyMessage = (aMsgAttributes.iType
- == RMobileUssdMessaging::EUssdMTNotify);
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
- _DDPRINT( 4, "PhSrv.UssdNOHREventL.iNotifyMessage: ", iNotifyMessage );
- iMsgTypeReply = (aMsgAttributes.iType
- == RMobileUssdMessaging::EUssdMTReply);
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iMsgTypeReply: ", iMsgTypeReply );
-
- if (iNotifyMessage)
- {
- // need to send an MO ack
- iAcksToBeSent++;
- }
-
- if (iNotifyMessage || iMsgTypeReply)
- {
- //This is for reply message in notifyarray
- iNotifyMessage = ETrue;
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.iNotifyMessage: ", iNotifyMessage );
- if (!iSendRelease && NotifyCount() <= 1)
- {
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.!SendRelease.Cancel" ); // debug print
- Cancel();
- }
- }
- else
- {
- // New message deletes old message, i.e. Cancel existing query.
- Cancel();
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.NewAnswerable" ); // debug print
- }
- TInt errfromextension = KErrNone;
- ProcessMoAcksL();
- iLaunchGMQ = EFalse;
- TRAP_IGNORE(iUssdExtnInterface->ProcessReceivedUssdL(iDecodedMessage, errfromextension));
- _DDPRINT( 4, "PhSrv.UssdHandleReceivedEventL.Extn.ProcessReceivedUssdL.ErrCode", errfromextension);
- }
- }
-// -----------------------------------------------------------------------------
// CPhSrvUssdManager::RestartReplyTimerL
//
//
@@ -1070,12 +996,7 @@
// if we are sending ack, it can be canceled.
iUssdSendHandler->Cancel();
}
- //417-66528
- //Notify Extension on NWRelease
- if(iUssdExtnInterface)
- {
- iUssdExtnInterface->NotifyNWError(aError);
- }
+
iSatCanceled = EFalse;
_DPRINT( 4, "PhSrv.UssdNetworkObserverHandleNotifyNWReleaseL.iSatCanceled.EFalse" );
iShowDone = EFalse;
@@ -1420,52 +1341,7 @@
_DPRINT( 4, "PhSrv.RunL.End" ); // debug print
}
}
-// RM-RIM 417-66528
-// -----------------------------------------------------------------------------
-// CPhSrvUssdManager::CreateGlobalMessageQueryL
-// -----------------------------------------------------------------------------
-//
-void CPhSrvUssdManager::CreateGlobalMessageQueryL(
- const RMobileUssdMessaging::TMobileUssdAttributesV1& aMsgAttributes)
- {
- if (!iGlobalMsgQuery)
- {
- iGlobalMsgQuery = CAknGlobalMsgQuery::NewL();
- }
- // Delay after message query so that application execution order will
- // be correct.
- iGlobalMsgQuery->SetExitDelay(KPhSrvUssdNoteExitPeriod);
-
- TInt softkeys = R_AVKON_SOFTKEYS_USSD_ANSWER_EXIT__ANSWER;
- if (!(aMsgAttributes.iFlags & RMobileUssdMessaging::KUssdMessageType)
- || aMsgAttributes.iType != RMobileUssdMessaging::EUssdMTRequest)
- {
- softkeys = R_AVKON_SOFTKEYS_EXIT;
- }
-
- // Set timer that lauches Global MessageQuery after time interval.
- iSoftkeys = softkeys;
-
- // debug print
- _DPRINT( 4,
- "PhSrv.UssdHandleReceivedEventL.String.Middle" );
-
- // Play the USSD tone if needed. Logically should be in RunL, but here
- // to give better balancing with voice and visible message.
- if (IsTelephonyFeatureSupported(KTelSrvLVFlagUssdTone))
- {
- _DPRINT( 4, "PhSrv.UssdHandleReceivedEventL.PlayTone" );
- PlayUssdTone();
- }
- // Launch the new message query
- if (!IsActive())
- {
- iLaunchGMQ = ETrue;
- iTimer.After(iStatus, KPhSrvUssdMessageQueryInterval);
- SetActive();
- }
- }
// -----------------------------------------------------------------------------
// CPhSrvUssdManager::LaunchGlobalMessageQueryL
// -----------------------------------------------------------------------------
--- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallArray.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerCallArray.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -16,7 +16,7 @@
*/
#include <callinformation.h>
-#include "PhoneHandlerCallArray.h"
+#include "phonehandlercallarray.h"
// ---------------------------------------------------------------------------
// CPhoneHandlerCallArray::NewL.
--- a/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerRedial.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/phonecmdhandler/phonecmdhnlr/src/PhoneHandlerRedial.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -161,20 +161,10 @@
NextState();
const TDesC& number = iLogViewRecentPtr->Event().Number();
- COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerLastNumberRedial::RequestCompleted() phone number is %S", &number );
-
- const TDesC& remoteParty = iLogViewRecentPtr->Event().RemoteParty();
- COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerLastNumberRedial::RequestCompleted() remote party is %S", &remoteParty );
+ COM_TRACE_1( "[PHONECMDHANDLER] CPhoneHandlerLastNumberRedial::RequestCompleted() phone number is %S", &number );
+ // make a call with last dialed phone number
+ iCommandHandler->Atd( GetStatus(), number );
- // make a call with last dialed phone number
- if ( KNullDesC() != number )
- {
- iCommandHandler->Atd( GetStatus(), number );
- }
- else
- {
- iCommandHandler->Atd( GetStatus(), remoteParty );
- }
Activate();
break;
}
--- a/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Tue Sep 14 22:26:11 2010 +0300
+++ b/phonesrv_plat/call_information_api/tsrc/run_auto_tests.bat Wed Oct 13 15:10:43 2010 +0300
@@ -148,7 +148,7 @@
call sbs --config winscw_udeb.test --keepgoing clean
call sbs --config winscw_udeb.test --keepgoing reallyclean
if [%INSTRUMENT%] EQU [TRUE] (
-call ctcwrap -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
+call ctcwrap -2comp -n %PATH_TO_COVERAGE_DATA%\%1 -i d -C "EXCLUDE=*" -C "NO_EXCLUDE=%TESTED_SRC%" "%SBS_CALL%"
) else (
call %SBS_CALL%
)
@@ -188,7 +188,7 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::
:CALCULATECOVERAGE
echo Calculating coverage
-ctcpost -p - %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
+ctcpost %PATH_TO_COVERAGE_DATA%\*.sym | ctcmerge -i - -o profile.txt
call ctc2html -t 70 -i profile.txt -o \coverage_result -nsb
goto end
--- a/phonesrv_plat/converged_call_engine_api/inc/ccce.h Tue Sep 14 22:26:11 2010 +0300
+++ b/phonesrv_plat/converged_call_engine_api/inc/ccce.h Wed Oct 13 15:10:43 2010 +0300
@@ -58,7 +58,7 @@
#ifndef RMMCUSTOMAPI_H
/** defenition for OG, most likely will be deprecated later on */
///_LIT(KTerminateAllCalls,"ALL_CALLS");
-#include <rmmcustomapi.h> // Add reference there, cs classes need that too
+#include <RMmCustomAPI.h> // Add reference there, cs classes need that too
#endif
/**
--- a/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Tue Sep 14 22:26:11 2010 +0300
+++ b/phonesrv_plat/voice_mailbox_number_api/inc/vmnumber.h Wed Oct 13 15:10:43 2010 +0300
@@ -37,7 +37,7 @@
#include <rsatsession.h>
#include <rsatrefresh.h>
#include <centralrepository.h>
-#include <cenrepnotifyhandler.h>
+#include <CenRepNotifyHandler.h>
#include <aknappui.h>
#include <AknQueryDialog.h>
#include <CPhCltEmergencyCall.h> // CPhCltEmergencyCall
--- a/satui/satplugin/aisatplugininc/caisatengine.h Tue Sep 14 22:26:11 2010 +0300
+++ b/satui/satplugin/aisatplugininc/caisatengine.h Wed Oct 13 15:10:43 2010 +0300
@@ -23,7 +23,7 @@
#include <e32property.h>
#include <SATInternalPSKeys.h>
-#include <rsatsession.h> // For idle mode text and icon
+#include <RSatSession.h> // For idle mode text and icon
#include <rsatservice.h> // For idle mode text and icon
#include <tsaticoninfo.h>
--- a/satui/satplugin/aisatpluginsrc/caisatnotifier.cpp Tue Sep 14 22:26:11 2010 +0300
+++ b/satui/satplugin/aisatpluginsrc/caisatnotifier.cpp Wed Oct 13 15:10:43 2010 +0300
@@ -20,7 +20,7 @@
// INCLUDE FILES
#include <e32base.h>
#include <etelsat.h>
-#include <rsatsession.h>
+#include <RSatSession.h>
#include <rsatservice.h>
#include "caisatnotifier.h"