FCL/sf/mw/btservices: comparison bluetoothengine/btui/btuidelegate/btdelegateconnect.cpp

equal deleted inserted replaced

-:997690c3397a
+:0b2439c3e397
 BtDelegateConnect::~BtDelegateConnect()
 {
 delete mBtengConnMan;
 }
+/*!
+* execute connect operation
+*    first check if power is on
+*/
 void BtDelegateConnect::exec( const QVariant &params )
 {
 if ( mActiveHandling ) {
 emit commandCompleted( KErrAlreadyExists );
 return;
 mCod = (mIndex.data(BtDeviceModel::CoDRole)).toInt();
 mMajorProperty = (mIndex.data(BtDeviceModel::MajorPropertyRole)).toInt();
 // first turn on power if needed
-QModelIndex powerIndex = getSettingModel()->index(BtSettingModel::PowerStateRow, 0);
+if (!isBtPowerOn()) {
-PowerStateQtValue powerState = (PowerStateQtValue)getSettingModel()->data(powerIndex, Qt::EditRole).toInt();
-if (powerState == BtPowerOff) {
 if (!mAbstractDelegate) //if there is no other delegate running
 {
 mAbstractDelegate = BtDelegateFactory::newDelegate(BtDelegate::ManagePower,
 getSettingModel(), getDeviceModel() );
 connect( mAbstractDelegate, SIGNAL(commandCompleted(int)), this, SLOT(powerDelegateCompleted(int)) );
 // power is already on
 exec_connect();
 }
 }
+/*!
+* power delegate has completed, continue processing
+*/
 void BtDelegateConnect::powerDelegateCompleted(int status)
 {
-//ToDo: Error handling here
 if (mAbstractDelegate)
 {
 disconnect(mAbstractDelegate);
 delete mAbstractDelegate;
 mAbstractDelegate = 0;
 // error
 emitCommandComplete(status);
 }
 }
+/*!
+* execute connect operation
+*/
 void BtDelegateConnect::exec_connect()
 {
 int error = KErrNone;
 if ( ! mBtengConnMan ){
 if( error ) {
 emitCommandComplete(error);
 }
 }
+/*!
+* connect callback from CBTengConnMan
+*/
 void BtDelegateConnect::ConnectComplete( TBTDevAddr& aAddr, TInt aErr,
 RBTDevAddrArray* aConflicts )
 {
 // It is possible that another audio device has just connected to phone when we are
 // connecting to this audio device. Or a device is connected while this command
 // is idle. No handling for these cases.
 if ( mAddr != aAddr || !mActiveHandling ) {
-return;
-}
-// bteng calls ConnectComplete even if cancelConnect is called,
-// we won't signal the interested party in this case.
-// ToDo: is this needed?
-if ( aErr == KErrCancel ) {
-mActiveHandling = false;
 return;
 }
 // conflict could occur as well if another audio device is already connected
 // since currently we don't support multiple audio device connections.
 // command is finished
 emitCommandComplete(aErr);
 }
 }
+/*!
+* handle user response to query about disconnecting conflict device
+*/
 void BtDelegateConnect::handleUserAnswer( HbAction* answer )
 {
 HbMessageBox* dlg = static_cast<HbMessageBox*>( sender() );
 if( dlg->actions().first() == answer ) {
 // Continue, ie. disconnect conflict device and then try reconnecting again
 connect( mAbstractDelegate, SIGNAL(commandCompleted(int)), this, SLOT(disconnectDelegateCompleted(int)) );
 mAbstractDelegate->exec(paramsList);
 }
 }
 else {
-// Cancel
+// Cancel connect operation
 emitCommandComplete(KErrCancel);
 }
 }
-/*!
-* returns true if call is ongoing
+/*!
+* returns true if phone call is ongoing
 */
 bool BtDelegateConnect::callOngoing()
 {
+// ToDo:  check if there exists Qt PS key for ongoing call
 int callState;
 int err = RProperty::Get(KPSUidCtsyCallInformation, KCTsyCallState, callState);
 if (!err && (callState == EPSCTsyCallStateNone || callState == EPSCTsyCallStateUninitialized)) {
 return false;
 }
 else {
 return true;
 }
 }
+/*!
+* disconnecting conflict device has completed, continue connecting
+*/
 void BtDelegateConnect::disconnectDelegateCompleted(int status)
 {
+if (mAbstractDelegate)
+{
+disconnect(mAbstractDelegate);
+delete mAbstractDelegate;
+mAbstractDelegate = 0;
+}
 // finished disconnecting conflict device, now reconnect to original device
 if ( status == KErrNone ) {
 exec_connect();
 }
 else {
 // disconnect failed, abort
 emitCommandComplete( status );
 }
 }
+/*!
+* not used here
+*/
 void BtDelegateConnect::DisconnectComplete( TBTDevAddr& aAddr, TInt aErr )
 {
 Q_UNUSED(aAddr);
 Q_UNUSED(aErr);
 }
+/*!
+* cancel connect operation
+*   ConnectComplete() callback will be called upon completion of cancel with KErrCancel
+*/
 void BtDelegateConnect::cancel()
 {
 if ( mBtengConnMan ) {
 mBtengConnMan->CancelConnect(mAddr);
 }
 }
+/*!
+* shows user notes with connection success/failure information
+*    cancel operation is handled without a user note
+*/
 void BtDelegateConnect::emitCommandComplete(int error)
 {
 if ( error == KErrNone ) {
 // success, show indicator with connection status
-HbIcon icon = getBadgedDeviceTypeIcon( mCod, mMajorProperty, 0);  // no badging required, only icon
+HbIcon icon = getBadgedDeviceTypeIcon( mCod, mMajorProperty, BtuiNoCorners);
 QString str(hbTrId("txt_bt_dpopinfo_connected_to_1"));
 HbNotificationDialog::launchDialog( icon, hbTrId("txt_bt_dpophead_connected"),
 str.arg(mDeviceName) );
 }
 else if ( error == KErrCancel ) {
-// no user note, return success
+// no user note, return success since cancel operation completed successfully
 error = KErrNone;
 }
 else {
 // failure to connect, show user note
 QString err(hbTrId("txt_bt_info_unable_to_connect_with_bluetooth"));

changeset 41	0b2439c3e397
parent 40	997690c3397a
child 52	4545c04e61e1