equal
deleted
inserted
replaced
183 // if we have started a SDP agent |
183 // if we have started a SDP agent |
184 { |
184 { |
185 delete iSdpAgent; |
185 delete iSdpAgent; |
186 |
186 |
187 } |
187 } |
188 |
188 |
189 if(iAttributeArray) |
189 iAttributeArray->ResetAndDestroy(); |
190 iAttributeArray->ResetAndDestroy(); |
|
191 delete iAttributeArray; |
190 delete iAttributeArray; |
192 } |
191 } |
193 |
192 |
194 |
193 |
195 EXPORT_C void CObexSdpUtils::RemoteBtObexQueryL(TBTDevAddr aBtDevAddr) |
194 EXPORT_C void CObexSdpUtils::RemoteBtObexQueryL(TBTDevAddr aBtDevAddr) |
304 // See if we should continue looking at the attributes for this record |
303 // See if we should continue looking at the attributes for this record |
305 if (iNotThisSdpRecord //there was a problem with attribute UUIDs and Uints |
304 if (iNotThisSdpRecord //there was a problem with attribute UUIDs and Uints |
306 || (iExpectedType==EAnythingUntilNextExpectedValue) //we should have got whatever we expected next! |
305 || (iExpectedType==EAnythingUntilNextExpectedValue) //we should have got whatever we expected next! |
307 || (iExpectedType==EUint) //we should always get the Uint we are looking for |
306 || (iExpectedType==EUint) //we should always get the Uint we are looking for |
308 || (iExpectedType==EUUID) //we should always get the UUID we are looking for |
307 || (iExpectedType==EUUID) //we should always get the UUID we are looking for |
309 || (aError)) //an error has occurred, note that not finding an attribute does NOT result in KErrNotFound |
308 || (aError)) //an error has occured, note that not finding an attribute does NOT result in KErrNotFound |
310 { |
309 { |
311 // following is an exception to the rules above... |
310 // following is an exception to the rules above... |
312 if (iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) //it OK to not find what we expect in for attribute because attribute is not mandatory |
311 if (iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) //it OK to not find what we expect in for attribute because attribute is not mandatory |
313 { |
312 { |
314 // therefore everything is OK with the record so far - Request the next attribute |
313 // therefore everything is OK with the record so far - Request the next attribute |
382 } |
381 } |
383 else if (iExpectingSpecific) |
382 else if (iExpectingSpecific) |
384 { |
383 { |
385 if (aUUID != TUUID(iExpectedValue)) |
384 if (aUUID != TUUID(iExpectedValue)) |
386 { |
385 { |
387 // Haven't got what we expected! |
386 // Havn't got what we expected! |
388 iNotThisSdpRecord = ETrue; |
387 iNotThisSdpRecord = ETrue; |
389 } |
388 } |
390 else if (aUUID==TUUID(KObexObjectPushUUIDValue) && iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) |
389 else if (aUUID==TUUID(KObexObjectPushUUIDValue) && iCurrentAttributeId==KBluetoothProfileDescriptorListAttributeId) |
391 { |
390 { |
392 // Remote device complies fully with obex object push profile |
391 // remote device complies fully with obex object push profile |
393 iFullComplianceWithObexObjectPush = ETrue;; |
392 iFullComplianceWithObexObjectPush = ETrue;; |
394 } |
393 } |
395 } |
394 } |
396 else |
395 else |
397 { |
396 { |
443 } |
442 } |
444 else if (iExpectingSpecific) |
443 else if (iExpectingSpecific) |
445 { |
444 { |
446 if (uint != iExpectedValue) |
445 if (uint != iExpectedValue) |
447 { |
446 { |
448 // haven't got what we expected! |
447 // Havn't got what we expected! |
449 iNotThisSdpRecord = ETrue; |
448 iNotThisSdpRecord = ETrue; |
450 } |
449 } |
451 } |
450 } |
452 else |
451 else |
453 { |
452 { |