FCL/sf/app/phone: comparison phoneengine/phonemodel/src/cpemessagehandler.cpp

equal deleted inserted replaced

-:c84cf270c54f
+:92ab7f8d0eab
 #include <bldvariant.hrh>
 #include <ccpdefs.h>
 #include <coreapplicationuisdomainpskeys.h>
 #include <cpeclientinformation.h>
 #include <cpegsmaudiodata.h>
-#include <CPhoneGsmHandlerContainer.h>
+#include <cphonegsmhandlercontainer.h>
-#include <CPhoneGsmOptionContainerBase.h>
+#include <cphonegsmoptioncontainerbase.h>
-#include <CPhoneGsmParserBase.h>
+#include <cphonegsmparserbase.h>
-#include <CPhoneGsmParserResult.h>
+#include <cphonegsmparserresult.h>
 #include <featmgr.h>
 #include <mccecall.h>
 #include <mpeaudiodata.h>
 #include <mpecallhandling.h>
 #include <mpecontacthandling.h>
 #include <mpedatastore.h>
 #include <mpeloghandling.h>
 #include <pathinfo.h>
 #include <pepanic.pan>
-#include <PhCltTypes.h>
+#include <phclttypes.h>
-#include <PhoneGsmParser.h>
+#include <phonegsmparser.h>
 #include <ProfileEngineDomainConstants.h>
 #include <talogger.h>
 #include <w32std.h>
 // EXTERNAL DATA STRUCTURES
 if ( iCallInfo->iEmergency || aCallId == KPEEmergencyCallId )
 {
 iDataStore.SetRemotePhoneNumberType( EPEEmergencyNumber, aCallId );
 }
 else if( iDataStore.CallDirection( aCallId ) != RMobileCall::EMobileOriginated )
-		{
+{
-		switch( tempIdentity )
+switch( tempIdentity )
-			{
+{
-			case RMobileCall::ERemoteIdentitySuppressed:
+case RMobileCall::ERemoteIdentitySuppressed:
-				{
+{
-				// It is neccessary to perform an additional check for available
+// It is neccessary to perform an additional check for available
-				// remote party phone number to comply with Italian operator
+// remote party phone number to comply with Italian operator
-				// requirement: "If CLIR is active but network still provides
+// requirement: "If CLIR is active but network still provides
-				// the device with a phone number, it should not be blocked
+// the device with a phone number, it should not be blocked
-				// but passed to a client when requested."
+// but passed to a client when requested."
-				if( iDataStore.RemotePhoneNumber( aCallId ).Length() == 0 )
+if( iDataStore.RemotePhoneNumber( aCallId ).Length() == 0 )
-					{
+{
-					HideIdentification( EPEPrivateNumber, aCallId );
+HideIdentification( EPEPrivateNumber, aCallId );
-					}
+}
-				else
+else
-				    {
+{
-				    // Align remote identity with remote phone number availability.
+// Align remote identity with remote phone number availability.
-				    iDataStore.SetRemoteIdentity( RMobileCall::ERemoteIdentityAvailable, aCallId );
+iDataStore.SetRemoteIdentity( RMobileCall::ERemoteIdentityAvailable, aCallId );
-				    }
+}
-				break;
+break;
-				}
+}
-			case RMobileCall::ERemoteIdentityAvailableNoCliRejectedByUser:
+case RMobileCall::ERemoteIdentityAvailableNoCliRejectedByUser:
-				{
+{
-				HideIdentification( EPEPrivateNumber, aCallId );
+HideIdentification( EPEPrivateNumber, aCallId );
-				break;
+break;
-				}
+}
-			case RMobileCall::ERemoteIdentityUnknown:
+case RMobileCall::ERemoteIdentityUnknown:
-			case RMobileCall::ERemoteIdentityAvailableNoCliInteractionWithOtherService:
+case RMobileCall::ERemoteIdentityAvailableNoCliInteractionWithOtherService:
-			case RMobileCall::ERemoteIdentityUnavailableNoCliInteractionWithOtherService:
+case RMobileCall::ERemoteIdentityUnavailableNoCliInteractionWithOtherService:
-			case RMobileCall::ERemoteIdentityAvailableNoCliCoinOrPayphone:
+case RMobileCall::ERemoteIdentityAvailableNoCliCoinOrPayphone:
-			case RMobileCall::ERemoteIdentityUnavailableNoCliCoinOrPayphone:
+case RMobileCall::ERemoteIdentityUnavailableNoCliCoinOrPayphone:
-			case RMobileCall::ERemoteIdentityAvailableNoCliUnavailable:
+case RMobileCall::ERemoteIdentityAvailableNoCliUnavailable:
-				{
+{
-				HideIdentification( EPEUnknownNumber, aCallId );
+HideIdentification( EPEUnknownNumber, aCallId );
-				break;
+break;
-				}
+}
-			case RMobileCall::ERemoteIdentityAvailable:
+case RMobileCall::ERemoteIdentityAvailable:
-			default:
+default:
-				{
+{
-				TEFLOGSTRING( KTAINT,
+TEFLOGSTRING( KTAINT,
-					"PE CPEMessageHandler::CheckAndHideIdentity, CLI available" );
+"PE CPEMessageHandler::CheckAndHideIdentity, CLI available" );
-				break;
+break;
-				}
+}
-			}
+}
-		}
+}
-	}
+}
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::FindCallInfo
 // Return callInfo from Etel/TSY.
 // -----------------------------------------------------------------------------
 &number, aCallId );
 RemovePreAndPostFix( number );
 iDataStore.SetRemotePhoneNumber( number, aCallId );
 }
+// The Colp number is stored to remoteparty in connected state.
+TPEPhoneNumber colpNumber = iCallInfo->iRemoteParty.iRemoteNumber.iTelNumber;
+RemovePreAndPostFix( colpNumber );
+iDataStore.SetRemoteColpNumber( colpNumber, aCallId );
+TEFLOGSTRING3(
+KTAMESINT,
+"PE CPEMessageHandler::SetPhoneNumberForCallLogging, colp number: '%S', call id: %d",
+&colpNumber, aCallId );
 }
 else if ( iDataStore.CallDirection( aCallId ) == RMobileCall::EMobileTerminated )
 {
 iDataStore.SetRemotePhoneNumber( iCallInfo->iRemoteParty.iRemoteNumber.iTelNumber, aCallId );
 TEFLOGSTRING2(
 }
 else
 {
 dtmfString = iDataStore.DtmfPostFix( aCallId );
 if ( dtmfString.Length() > 0 )
 {
 iDataStore.SetDtmfStringCommand( dtmfString );
 errorCode = HandleSendDtmf();
 }
 // Reset Phonenumber from engine info, this is necessary so that call number
 // logging works OK (see CPEMessageHandler::SetPhoneNumberForCallLogging).
 iDataStore.SetPhoneNumber( KNullDesC() );
+// COLP number is updated in connected state
+UpdateRemotePartyInfo();
 return ECCPErrorNone;
 }
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::HandleDialCall
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::HandleRemotePartyInfoChanged
 // -----------------------------------------------------------------------------
 //
-void CPEMessageHandler::HandleRemotePartyInfoChanged( const TInt aCallId )
+void CPEMessageHandler::HandleRemotePartyInfoChanged()
 {
 UpdateRemotePartyInfo();
-if ( iDataStore.RemoteColpNumber( aCallId ).Length() )
-{
-iModel.SendMessage( MEngineMonitor::EPEMessageColpNumberAvailable );
-}
 }
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::HandleUnattendedTransferRequestResponse
 {
 TEFLOGSTRING( KTAINT, "PE CPEMessageHandler::HandleUnattendedTransfer ");
 TInt errorCode = iCallHandling.DoUnattendedTransfer(
 iDataStore.TransferTargetCommand() );
-iDataStore.SetErrorCode( errorCode );
 return errorCode;
 }
 // -----------------------------------------------------------------------------
 // CPEMessageHandler::ForwardCallToAddress
 if ( mediatorUpdater )
 {
 mediatorUpdater->UpdateRemotePartyInfo();
 }
 }
+// <-- QT PHONE START -->
+// -----------------------------------------------------------------------------
+// CPEMessageHandler::HandleDialCall
+// Handles dial message from dial service
+//
+// -----------------------------------------------------------------------------
+//
+TInt CPEMessageHandler::HandleDialServiceCall(
+const TBool /*aClientCall*/ )
+{
+TEFLOGSTRING( KTAINT, "PE CPEMessageHandler::HandleDialCall" );
+TInt errorCode( ECCPErrorNone );
+//TODO
+iModel.HandleInternalMessage( MPEPhoneModel::EPEMessageDialServiceCall );
+return errorCode;
+}
+// <-- QT PHONE END -->
 //  End of File

changeset 21	92ab7f8d0eab
parent 4	c84cf270c54f
child 22	6bb1b21d2484