FCL/sf/mw/btservices: comparison bluetoothengine/btnotif/btnotifsrv/src/btnotifoutgoingpairinghandler.cpp

equal deleted inserted replaced

-:91746b151f97
+:997690c3397a
 */
 #include "btnotifoutgoingpairinghandler.h"
 #include <btengconstants.h>
 #include <btservices/btdevextension.h>
-#include "btnotifpairingmanager.h"
+#include "btnotifsecuritymanager.h"
+#include "bluetoothtrace.h"
 /**  Length of the default PIN. */
 const TInt KDefaultHeadsetPinLength = 4;
 enum TPairingStageId
 // ---------------------------------------------------------------------------
 // C++ default constructor
 // ---------------------------------------------------------------------------
 //
-CBTNotifOutgoingPairingHandler::CBTNotifOutgoingPairingHandler( CBTNotifPairingManager& aParent, const TBTDevAddr& aAddr)
+CBTNotifOutgoingPairingHandler::CBTNotifOutgoingPairingHandler( CBTNotifSecurityManager& aParent, const TBTDevAddr& aAddr)
 :  CBTNotifBasePairingHandler( aParent, aAddr )
 {
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // NewL
 // ---------------------------------------------------------------------------
 //
-CBTNotifBasePairingHandler* CBTNotifOutgoingPairingHandler::NewL( CBTNotifPairingManager& aParent,
+CBTNotifBasePairingHandler* CBTNotifOutgoingPairingHandler::NewL( CBTNotifSecurityManager& aParent,
 const TBTDevAddr& aAddr )
 {
 CBTNotifOutgoingPairingHandler* self = new( ELeave ) CBTNotifOutgoingPairingHandler( aParent, aAddr );
 CleanupStack::PushL( self );
 self->ConstructL();
 // Accept the request only this device is not busy with another pairing request.
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::HandleOutgoingPairL( const TBTDevAddr& aAddr, TUint aCod )
 {
-// TRACE_FUNC_ARG( ( _L(" cod 0x%08x"), aCod ) )
+BOstrace1(TRACE_DEBUG,DUMMY_DEVLIST," cod 0x%08x", aCod );
 if ( iActive->IsActive() || aAddr != iAddr )
 {
 // we don't allow another pairing request.
 User::Leave( KErrServerBusy );
 }
 }
 else
 {
 iPairMode = EBTOutgoingNoneHeadsetPairing;
 }
-// SetOutgoPairProperty( iOutgoProperty, iAddr, iPairMode );
 DoPairingL();
 }
 // ---------------------------------------------------------------------------
 // Cancels an outstanding pair request by self-destruct
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::CancelOutgoingPair()
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 iParent.RenewPairingHandler( NULL );
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::GetPinCode(
 TBTPinCode& aPin, const TBTDevAddr& aAddr, TInt aMinPinLength )
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 aPin().iLength = 0;
 if ( aMinPinLength <= KDefaultHeadsetPinLength
 && aAddr == iAddr
 && iPairMode == EBTOutgoingHeadsetAutoPairing)
 {
 // Abort pairing handling, request the owner to destroy this.
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::StopPairHandling( const TBTDevAddr& aAddr )
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 if ( aAddr == iAddr )
 {
 iParent.OutgoingPairCompleted( KErrCancel );
 iParent.RenewPairingHandler( NULL );
 }
 // Pairing result will be received when pairing operation completes.
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::DoHandlePairServerResult( TInt aResult )
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 	if (aResult == (KHCIErrorBase-EPairingNotAllowed))
 		{
 		// if EPairingNotAllowed is recieved then any further pairing attempts will fail
 		// so don't attampt to pair
 iPairMode = EBTOutgoingPairNone;
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::DoHandleRegistryNewPairedEvent(
 const TBTNamelessDevice& aDev )
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 TInt err( KErrNone );
 // If pairing was performed using Just Works mode, we set a
 // UICookie to indicate that the device is successfully
 // bonded so that this device will be listed in paired device view of
 // bluetooth application:
 if ( aDev.LinkKeyType() == ELinkKeyUnauthenticatedNonUpgradable )
 {
-// TRACE_INFO( ( _L( "[BTENG] CBTEngOtgPair, Just Works pairing" ) ) );
+BOstrace0(TRACE_DEBUG,DUMMY_DEVLIST,"[BTNOTIF] Outgoing Pairing, Just Works pairing");
 err = iParent.AddUiCookieJustWorksPaired( aDev );
 }
 iActive->Cancel();
 SetPairResult( err ? err : KErrNone );
+if(err == KErrNone){
+TRAP_IGNORE(ShowPairingResultNoteL(err));
+}
 iParent.OutgoingPairCompleted( err );
 iParent.RenewPairingHandler( NULL );
 }
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::RequestCompletedL(
 CBtSimpleActive* aActive, TInt aStatus )
 {
-// TRACE_FUNC_ARG( ( _L( "reqid %d, status: %d, pair mode %d " ), aId, aStatus, iPairMode ) )
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
+BOstraceExt3(TRACE_DEBUG,DUMMY_DEVLIST,"reqid %d, status: %d, pair mode %d ", aActive->RequestId(), aStatus, iPairMode);
 if( aActive->RequestId() == EDedicatedBonding &&
 				( aStatus == KErrRemoteDeviceIndicatedNoBonding ||
 					( aStatus && iPairMode != EBTOutgoingNoneHeadsetPairing && iPairMode != EBTOutgoingPairNone ) )   )
 {
 // try general pairing if the remote doesn't have dedicated bonding, or
 }
 else if ( aStatus && iPairMode == EBTOutgoingHeadsetAutoPairing )
 {
 iPairMode = EBTOutgoingHeadsetManualPairing;
 // auto pairing with headset failed, try to pair again with manual pin:
-// ( void ) SetOutgoPairProperty( iOutgoProperty, iAddr, iPairMode );
+BOstrace0(TRACE_DEBUG,DUMMY_DEVLIST," auto pairing failed, switch to manual pairing");
-// TRACE_INFO( _L( " auto pairing failed, switch to manual pairing") );
 DoPairingL();
 }
 else if ( aStatus && aActive->RequestId() == EGeneralBonding &&
 iPairMode == EBTOutgoingHeadsetManualPairing )
 {
 {
 SetPairResult( aStatus );
 }
 if ( aStatus )
 {
-// todo: show error note?
 iParent.OutgoingPairCompleted( aStatus );
 }
 }
 }
 // cancels an outstanding request according to the given id.
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::CancelRequest( TInt aRequestId )
 {
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 switch ( aRequestId )
 {
 case EDedicatedBonding:
 {
 iBondingSession.Close();
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::HandleError(
 CBtSimpleActive* aActive, TInt aError )
 {
-// TRACE_FUNC_ARG( ( _L( "error: %d" ), aError ) )
+BOstrace1(TRACE_DEBUG,DUMMY_DEVLIST,"error: %d", aError );
 // Our RunL can actually not leave, so we should never reach here.
 (void) aActive;
 iParent.OutgoingPairCompleted( aError );
 iParent.RenewPairingHandler( NULL );
 }
 // decide the next state and issue pair request
 // ---------------------------------------------------------------------------
 //
 void CBTNotifOutgoingPairingHandler::DoPairingL()
 {
-// TRACE_FUNC_ENTRY
+BOstraceFunctionEntry0( DUMMY_DEVLIST );
 TPairingStageId currentMode = ( TPairingStageId ) iActive->RequestId();
 ASSERT( !iActive->IsActive() );
 TPairingStageId nextMode( EGeneralBonding );
 // if running BTv2.0 stack, dedicated bonding method
 else if(currentMode == EGeneralBondingRetryTimer)
 {
 nextMode = EGeneralBondingRetry;
 }
-// TRACE_INFO( ( _L( "[BTENG] CBTEngOtgPair::DoPairingL: bonding mode: pre %d, next %d"), currentMode, nextMode ) );
+BOstraceExt2(TRACE_DEBUG,DUMMY_DEVLIST,"[BTENG] CBTEngOtgPair::DoPairingL: bonding mode: pre %d, next %d", currentMode, nextMode);
 iActive->SetRequestId( nextMode );
 if ( nextMode == EDedicatedBonding )
 {
 iBondingSession.Start( *iParent.PairingServer(), iAddr, iActive->RequestStatus() );
 iSocket.Close();
 User::LeaveIfError( iSocket.Open( iParent.SocketServ(), KL2CAPDesC ) );
 iSocket.Connect( iSockAddr, iActive->RequestStatus() );
 }
 iActive->GoActive();
-// TRACE_FUNC_EXIT
+BOstraceFunctionExit0( DUMMY_DEVLIST );
 }

changeset 40	997690c3397a
parent 33	837dcc42fd6a
child 41	0b2439c3e397