equal
deleted
inserted
replaced
185 TInt /*aErrorStringCode*/ ) |
185 TInt /*aErrorStringCode*/ ) |
186 { |
186 { |
187 // When Bluetooth discovery is finished, but Bluetooth is not enabled pass error code to UI. |
187 // When Bluetooth discovery is finished, but Bluetooth is not enabled pass error code to UI. |
188 if ( aErrorCode == ENoConnection ) |
188 if ( aErrorCode == ENoConnection ) |
189 { |
189 { |
190 if (iDiscoveryObserver){ |
190 if (iDiscoveryObserver) |
191 iDiscoveryObserver->DiscoveryError( aErrorCode ); |
191 { |
192 } |
192 iDiscoveryObserver->DiscoveryError( aErrorCode ); |
193 } |
193 } |
|
194 } |
194 if ( iCancelling ) |
195 if ( iCancelling ) |
195 { |
196 { |
196 // Exection continues in CancelDiscoveryL() |
197 // Exection continues in CancelDiscoveryL() |
197 |
|
198 if ( iDiscoveryObserver ) |
198 if ( iDiscoveryObserver ) |
199 { |
199 { |
200 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
200 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
201 } |
201 } |
202 } |
202 } |
205 if ( iOnGoingDiscovery ) |
205 if ( iOnGoingDiscovery ) |
206 { |
206 { |
207 if ( aStatus == EDiscovering ) |
207 if ( aStatus == EDiscovering ) |
208 { |
208 { |
209 iOnGoingDiscovery = EFalse; |
209 iOnGoingDiscovery = EFalse; |
210 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
210 if ( iDiscoveryObserver ) |
|
211 { |
|
212 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
|
213 } |
211 } |
214 } |
212 else if ( aStatus == EDoneDiscovery ) |
215 else if ( aStatus == EDoneDiscovery ) |
213 { |
216 { |
214 iOnGoingDiscovery = EFalse; |
217 iOnGoingDiscovery = EFalse; |
215 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
218 if ( iDiscoveryObserver ) |
|
219 { |
|
220 iDiscoveryObserver->DeviceDiscoveryCompleted(); |
|
221 } |
216 } |
222 } |
217 else if ( aStatus == ECancellingDiscovery ) |
223 else if ( aStatus == ECancellingDiscovery ) |
218 { |
224 { |
219 iDiscoveryObserver->DiscoveryError( aErrorCode ); |
225 if ( iDiscoveryObserver ) |
|
226 { |
|
227 iDiscoveryObserver->DiscoveryError( aErrorCode ); |
|
228 } |
220 } |
229 } |
221 else |
230 else |
222 { |
231 { |
223 User::Leave( KErrUnknown ); |
232 User::Leave( KErrUnknown ); |
224 } |
233 } |