equal
deleted
inserted
replaced
20 #include <BTNotif.rsg> // Own resources |
20 #include <BTNotif.rsg> // Own resources |
21 #include "btnauthnotifier.h" // Own class definition |
21 #include "btnauthnotifier.h" // Own class definition |
22 #include "btNotifDebug.h" // Debugging macros |
22 #include "btNotifDebug.h" // Debugging macros |
23 #include <btextnotifiers.h> |
23 #include <btextnotifiers.h> |
24 #include <AknMediatorFacade.h> // Cover UI |
24 #include <AknMediatorFacade.h> // Cover UI |
25 #include <SecondaryDisplay/BTnotifSecondaryDisplayAPI.h> |
25 #include <secondarydisplay/BTnotifSecondaryDisplayAPI.h> |
26 #include <btengconstants.h> |
26 #include <btengconstants.h> |
27 #include <btengsettings.h> |
27 #include <btengsettings.h> |
28 #include <e32cmn.h> |
28 #include <e32cmn.h> |
29 #include <btotgpairpub.inl> |
29 #include <btotgpairpub.inl> |
30 #include <btengprivatecrkeys.h> |
30 #include <btengprivatecrkeys.h> |
154 if ( !iNotifLockProp.Handle() ) |
154 if ( !iNotifLockProp.Handle() ) |
155 { |
155 { |
156 User::LeaveIfError( iNotifLockProp.Attach( |
156 User::LeaveIfError( iNotifLockProp.Attach( |
157 KPSUidBluetoothEnginePrivateCategory, KBTNotifierLocks ) ); |
157 KPSUidBluetoothEnginePrivateCategory, KBTNotifierLocks ) ); |
158 } |
158 } |
159 iLockActive = CBTNotifActive::NewL( this, KBTNotifAuthNotifierLockReq, CActive::EPriorityStandard ); |
159 |
|
160 if(!iLockActive) |
|
161 { |
|
162 iLockActive = CBTNotifActive::NewL( this, KBTNotifAuthNotifierLockReq, CActive::EPriorityStandard ); |
|
163 } |
160 |
164 |
161 CheckAndSubscribeNotifLocks(); |
165 CheckAndSubscribeNotifLocks(); |
162 |
166 |
163 if ( !iSuspended ) |
167 if ( !iSuspended ) |
164 { |
168 { |
287 // |
291 // |
288 void CBTAuthNotifier::Cancel() |
292 void CBTAuthNotifier::Cancel() |
289 { |
293 { |
290 FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel()")); |
294 FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel()")); |
291 |
295 |
292 iLockActive->CancelRequest(); |
296 if (iLockActive) |
293 delete iLockActive; |
297 { |
294 iLockActive = NULL; |
298 iLockActive->CancelRequest(); |
|
299 delete iLockActive; |
|
300 iLockActive = NULL; |
|
301 } |
|
302 |
295 iNotifLockProp.Close(); |
303 iNotifLockProp.Close(); |
296 |
304 |
297 CBTNotifierBase::Cancel(); |
305 CBTNotifierBase::Cancel(); |
298 |
306 |
299 FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel() completed")); |
307 FLOG(_L("[BTNOTIF]\t CBTAuthNotifier::Cancel() completed")); |
300 } |
308 } |
301 |
309 |
536 iLockActive->CancelRequest(); |
544 iLockActive->CancelRequest(); |
537 DoRejectAuthorizationL(); |
545 DoRejectAuthorizationL(); |
538 } |
546 } |
539 } |
547 } |
540 |
548 |
|
549 |
541 // ---------------------------------------------------------- |
550 // ---------------------------------------------------------- |
542 // CBTAuthNotifier::DoRejectAuthorizationL |
551 // CBTAuthNotifier::DoRejectAuthorizationL |
543 // Handle query threshold and block after user rejects authorization |
552 // Handle query threshold and block after user rejects authorization |
544 // ---------------------------------------------------------- |
553 // ---------------------------------------------------------- |
545 // |
554 // |