126 case MEngineMonitor::EPEMessageTempClirActivationUnsuccessful: |
126 case MEngineMonitor::EPEMessageTempClirActivationUnsuccessful: |
127 case MEngineMonitor::EPEMessageIncCallForwToC: // fall through |
127 case MEngineMonitor::EPEMessageIncCallForwToC: // fall through |
128 case MEngineMonitor::EPEMessageOutCallForwToC: // fall through |
128 case MEngineMonitor::EPEMessageOutCallForwToC: // fall through |
129 case MEngineMonitor::EPEMessageForwardUnconditionalModeActive: // fall through |
129 case MEngineMonitor::EPEMessageForwardUnconditionalModeActive: // fall through |
130 case MEngineMonitor::EPEMessageForwardConditionallyModeActive: |
130 case MEngineMonitor::EPEMessageForwardConditionallyModeActive: |
131 { |
131 { |
132 CPhoneGeneralGsmMessagesHandler* gsmMsgHandler = |
132 CPhoneGeneralGsmMessagesHandler* gsmMsgHandler = |
133 CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine, |
133 CPhoneGeneralGsmMessagesHandler::NewL( *iStateMachine, |
134 *iViewCommandHandle, |
134 *iViewCommandHandle, |
135 *this ); |
135 *this ); |
136 CleanupStack::PushL( gsmMsgHandler ); |
136 CleanupStack::PushL( gsmMsgHandler ); |
137 gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId ); |
137 gsmMsgHandler->HandlePhoneEngineMessageL( aMessage, aCallId ); |
138 CleanupStack::PopAndDestroy( gsmMsgHandler ); |
138 CleanupStack::PopAndDestroy( gsmMsgHandler ); |
139 |
139 |
140 // Needed also in non-touch, if call waiting request (*43#) |
140 // Needed also in non-touch, if call waiting request (*43#) |
141 // is sent during active call at least. |
141 // is sent during active call at least. |
142 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
142 UpdateCbaL( EPhoneCallHandlingInCallCBA ); |
143 } |
143 } |
144 break; |
144 break; |
145 |
145 |
146 default: |
146 default: |
147 CPhoneStateInCall::HandlePhoneEngineMessageL( |
147 CPhoneStateInCall::HandlePhoneEngineMessageL( |
148 aMessage, aCallId ); |
148 aMessage, aCallId ); |
149 break; |
149 break; |
168 CPEPhoneModelIF::EPEMessageAnswer ); |
168 CPEPhoneModelIF::EPEMessageAnswer ); |
169 break; |
169 break; |
170 |
170 |
171 // 'Replace' from menu |
171 // 'Replace' from menu |
172 case EPhoneInCallCmdReplace: |
172 case EPhoneInCallCmdReplace: |
173 ReplaceCallL(); |
173 ReplaceCallL(); |
174 break; |
174 break; |
175 |
175 |
176 case EPhoneInCallCmdSwap: |
176 case EPhoneInCallCmdSwap: |
177 iStateMachine->SendPhoneEngineMessage( |
177 iStateMachine->SendPhoneEngineMessage( |
178 CPEPhoneModelIF::EPEMessageSwap ); |
178 CPEPhoneModelIF::EPEMessageSwap ); |
216 |
216 |
217 // ----------------------------------------------------------- |
217 // ----------------------------------------------------------- |
218 // CPhoneGsmInCall::HandleColpNoteL |
218 // CPhoneGsmInCall::HandleColpNoteL |
219 // ----------------------------------------------------------- |
219 // ----------------------------------------------------------- |
220 // |
220 // |
221 void CPhoneGsmInCall::HandleColpNoteL( TInt aCallId ) |
221 void CPhoneGsmInCall::HandleColpNoteL( |
|
222 TInt aCallId ) |
222 { |
223 { |
223 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneGsmInCall::HandleColpNoteL() "); |
224 __LOGMETHODSTARTEND(EPhoneControl, "CPhoneGsmInCall::HandleColpNoteL() "); |
224 |
225 |
225 MPEEngineInfo* EngineInfo = CPhoneState::iStateMachine->PhoneEngineInfo(); |
226 MPEEngineInfo* EngineInfo = CPhoneState::iStateMachine->PhoneEngineInfo(); |
226 |
227 |
227 TPhoneCmdParamGlobalNote globalNoteParam; |
228 if ( EngineInfo->RemoteColpNumber( aCallId ).Length() ) |
228 globalNoteParam.SetText( EngineInfo->RemoteColpNumber( aCallId ) ); |
229 { |
229 globalNoteParam.SetType( EAknGlobalInformationNote ); |
230 TPhoneCmdParamGlobalNote globalNoteParam; |
230 globalNoteParam.SetTextResourceId( |
231 globalNoteParam.SetText( EngineInfo->RemoteColpNumber( aCallId ) ); |
|
232 globalNoteParam.SetType( EAknGlobalInformationNote ); |
|
233 globalNoteParam.SetTextResourceId( |
231 CPhoneMainResourceResolver::Instance()-> |
234 CPhoneMainResourceResolver::Instance()-> |
232 ResolveResourceID( EPhoneColpConnected ) ); |
235 ResolveResourceID( EPhoneColpConnected ) ); |
233 globalNoteParam.SetTone( EAvkonSIDInformationTone ); |
236 globalNoteParam.SetTone( EAvkonSIDInformationTone ); |
234 |
237 |
235 iViewCommandHandle->ExecuteCommandL( |
238 iViewCommandHandle->ExecuteCommandL( |
236 EPhoneViewShowGlobalNote, &globalNoteParam ); |
239 EPhoneViewShowGlobalNote, &globalNoteParam ); |
237 |
240 } |
238 } |
241 } |
239 |
242 |
240 // ----------------------------------------------------------- |
243 // ----------------------------------------------------------- |
241 // CPhoneGsmInCall::BringIncomingToForegroundL() |
244 // CPhoneGsmInCall::BringIncomingToForegroundL() |
242 // ----------------------------------------------------------- |
245 // ----------------------------------------------------------- |
385 __LOGMETHODSTARTEND( EPhoneControl, "CPhoneGsmInCall::SetDivertIndication()"); |
388 __LOGMETHODSTARTEND( EPhoneControl, "CPhoneGsmInCall::SetDivertIndication()"); |
386 |
389 |
387 CPhoneState::SetDivertIndication( aDivertIndication ); |
390 CPhoneState::SetDivertIndication( aDivertIndication ); |
388 |
391 |
389 TRAP_IGNORE( HandeDivertIndicationL() ); |
392 TRAP_IGNORE( HandeDivertIndicationL() ); |
390 } |
393 } |
391 |
394 |
392 // --------------------------------------------------------- |
395 // --------------------------------------------------------- |
393 // CPhoneGsmInCall::HandeDivertIndicationL |
396 // CPhoneGsmInCall::HandeDivertIndicationL |
394 // --------------------------------------------------------- |
397 // --------------------------------------------------------- |
395 // |
398 // |
404 |
407 |
405 if( ringingCallId > KErrNotFound ) |
408 if( ringingCallId > KErrNotFound ) |
406 { |
409 { |
407 TPhoneCmdParamCallHeaderData divertData; |
410 TPhoneCmdParamCallHeaderData divertData; |
408 |
411 |
409 divertData.SetCallFlag( CBubbleManager::EDiverted ); |
412 // <-- QT PHONE START --> |
|
413 // divertData.SetCallFlag( CBubbleManager::EDiverted ); |
|
414 divertData.SetDiverted( ETrue ); |
|
415 // <-- QT PHONE END --> |
410 |
416 |
411 GetRemoteInfoDataL( ringingCallId, remoteInfoText ); |
417 GetRemoteInfoDataL( ringingCallId, remoteInfoText ); |
412 divertData.SetCLIText( |
418 divertData.SetCLIText( |
413 remoteInfoText, |
419 remoteInfoText, |
414 CBubbleManager::ERight ); |
420 // <-- QT PHONE START --> |
|
421 // CBubbleManager::ERight ); |
|
422 TPhoneCmdParamCallHeaderData::ERight ); |
|
423 // <-- QT PHONE END --> |
415 |
424 |
416 divertData.SetCiphering( |
425 divertData.SetCiphering( |
417 iStateMachine->PhoneEngineInfo()->IsSecureCall( ringingCallId ) ); |
426 iStateMachine->PhoneEngineInfo()->IsSecureCall( ringingCallId ) ); |
418 divertData.SetCipheringIndicatorAllowed( |
427 divertData.SetCipheringIndicatorAllowed( |
419 iStateMachine->PhoneEngineInfo()->SecureSpecified() ); |
428 iStateMachine->PhoneEngineInfo()->SecureSpecified() ); |