FCL/sf/mw/legacypresence: comparison simpleengine/presencedm/src/presencedmadapter.cpp

equal deleted inserted replaced

-:2580314736af
+:2669f8761a99
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 * Contributors:
 *
 * Description:    OMA Presence Settings Device Management Adapter's source file
 *
 */
 #include <implementationproxy.h>
 #include <nsmldmuri.h>
 #include <utf.h>
 #include <badesca.h>
 TPresSettingsSet tempSet;
 TPresSettingsProperty property;
 HBufC8* luid = Callback().GetLuidAllocL( aUri );
-PRES_DM_LOG(LOG_LIT8("   GetLuidAllocL() => '%S'"), luid );
 TInt settingsId = DesToInt( *luid );
 PRES_DM_LOG(LOG_LIT("   settingsId after callback:%d"), settingsId);
 // check whether above found id is valid or not
 if (!IsPresIDValidL(settingsId))
 {
 //try to find it another way
-if( NSmlDmURI::NumOfURISegs( aUri ) > 1 )
+TPtrC8 removedLastSeg = NSmlDmURI::RemoveLastSeg(aUri);
-{
+TPtrC8 idSegment = NSmlDmURI::LastURISeg(removedLastSeg);
-TPtrC8 idSegment = NSmlDmURI::URISeg( aUri, 2 );
+TInt settingsId = DesToInt(idSegment);
-settingsId = DesToInt(idSegment);
+if (!IsPresIDValidL(settingsId))
-if(!IsPresIDValidL(settingsId))
+status = CSmlDmAdapter::ENotFound;
-{
+PRES_DM_LOG(LOG_LIT("   settingsId found local way:%d"), settingsId);
-status = CSmlDmAdapter::ENotFound;
-}
-PRES_DM_LOG(LOG_LIT("   settingsId found local way:%d"), settingsId);
-}
 }
 // if previous settings id processing was ok
 if (status == CSmlDmAdapter::EOk)
 {
 // check whether above found id is valid or not
 if (!IsPresIDValidL(settingsId))
 {
 //try to find it another way
-if( NSmlDmURI::NumOfURISegs( aUri ) > 1 )
+TPtrC8 removedLastSeg = NSmlDmURI::RemoveLastSeg(aUri);
-{
+TPtrC8 idSegment = NSmlDmURI::LastURISeg(removedLastSeg);
-TPtrC8 idSegment = NSmlDmURI::URISeg( aUri, 2 );
+TInt settingsId = DesToInt(idSegment);
-settingsId = DesToInt(idSegment);
+if (!IsPresIDValidL(settingsId))
-if (!IsPresIDValidL(settingsId))
+status = CSmlDmAdapter::ENotFound;
-{
+PRES_DM_LOG(LOG_LIT("   settingsId found local way:%d"), settingsId);
-status = CSmlDmAdapter::ENotFound;
-}
-PRES_DM_LOG(LOG_LIT("   settingsId found local way:%d"), settingsId);
-}
 }
 // if previous settings id processing was ok
 if (status == CSmlDmAdapter::EOk)
 {
 const TDesC8& /*aArgument*/,
 const TDesC8& /*aType*/,
 const TInt aStatusRef )
 {
 // Not supported
-PRES_DM_LOG(LOG_LIT("ExecuteCommandL"));
 Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::ExecuteCommandL()
 RWriteStream*& /*aStream*/,
 const TDesC8& /*aType*/,
 const TInt aStatusRef )
 {
 // Not supported
-PRES_DM_LOG(LOG_LIT("ExecuteCommandL"));
 Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::CopyCommandL()
 const TDesC8& /*aSourceLUID*/,
 const TDesC8& /*aType*/,
 TInt aStatusRef )
 {
 // Not supported
-PRES_DM_LOG(LOG_LIT("CopyCommandL"));
 Callback().SetStatusL( aStatusRef, CSmlDmAdapter::EError );
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::StartAtomicL()
 // -----------------------------------------------------------------------------
 //
 void CPresenceDMAdapter::StartAtomicL()
 {
-PRES_DM_LOG(LOG_LIT("StartAtomicL"));
 // Not supported
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::CommitAtomicL()
 // -----------------------------------------------------------------------------
 //
 void CPresenceDMAdapter::CommitAtomicL()
 {
-PRES_DM_LOG(LOG_LIT("CommitAtomicL"));
 // Not supported
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::RollbackAtomicL()
 // -----------------------------------------------------------------------------
 //
 void CPresenceDMAdapter::RollbackAtomicL()
 {
-PRES_DM_LOG(LOG_LIT("RollbackAtomicL"));
 // Not supported
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::StreamingSupport()
 // -----------------------------------------------------------------------------
 //
 TBool CPresenceDMAdapter::StreamingSupport( TInt& /*aItemSize*/ )
 {
-PRES_DM_LOG(LOG_LIT("StreamingSupport"));
 return EFalse;
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::StreamCommittedL()
 // -----------------------------------------------------------------------------
 //
 void CPresenceDMAdapter::StreamCommittedL()
 {
-PRES_DM_LOG(LOG_LIT("StreamCommittedL"));
 // Not supported
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::CompleteOutstandingCmdsL()
 {
 HBufC8* utfValue = ConvertLC( *value ); // << utfValue
 aObject.InsertL( 0, *utfValue );
 CleanupStack::PopAndDestroy(utfValue);  // >>> utfValue
 CleanupStack::PopAndDestroy(value);  // >>> value
-PRES_DM_LOG(LOG_LIT(" return( EOk )"));
+PRES_DM_LOG(LOG_LIT(" return(%d)"),CSmlDmAdapter::EOk);
 return CSmlDmAdapter::EOk;
 }
-PRES_DM_LOG(LOG_LIT(" return( ENotFound )"));
+PRES_DM_LOG(LOG_LIT(" return(%d)"),CSmlDmAdapter::ENotFound);
 return CSmlDmAdapter::ENotFound;
 }
 // -----------------------------------------------------------------------------
 // -----------------------------------------------------------------------------
 //
 CSmlDmAdapter::TError CPresenceDMAdapter::GetConRefFromSipIDL( TInt aSipID,
 CBufBase& aObject)
 {
-PRES_DM_LOG(LOG_LIT(" GetConRefFromSipIDL(aSipId:%d)"),aSipID);
+PRES_DM_LOG(LOG_LIT(" GetConRefFromSipIDL(%d)"),aSipID);
 CSmlDmAdapter::TError status = CSmlDmAdapter::EOk;
 TBool found(EFalse);
 CBufBase* result = CBufFlat::NewL(1);
 CleanupStack::PushL(result);    // << result
 // Request all the sip settings identifiers
 Callback().FetchLinkL( KPresDMSipDMNode, *result, status);
-PRES_DM_LOG(LOG_LIT("   FetchLinkL(SIP) status : %d"), status );
 if( status == EOk )
 {
 TPtr8 uriSeg8Ptr = result->Ptr(0);
-HBufC8* uriSegBuffer = uriSeg8Ptr.AllocLC(); // << uriSegBuffer
+HBufC8* uriSegBuffer = uriSeg8Ptr.AllocLC();
-PRES_DM_LOG(LOG_LIT8("   uri : '%S'"), uriSegBuffer );
 TPtr8 uriSegBufferPtr = uriSegBuffer->Des();
 TInt numOfUriSegs = NSmlDmURI::NumOfURISegs(uriSeg8Ptr);
 TInt foundId(KErrNotFound);
 // Check if given SIP set id match with any of found
 // SIP settings identifiers
-while( numOfUriSegs > 0 )
+while( numOfUriSegs > 1)
 {
 idLinkBuffer = NSmlDmURI::LastURISeg(uriSegBufferPtr);
 uriSegBufferPtr = NSmlDmURI::RemoveLastSeg(uriSegBufferPtr);
 idLinkBuffer.Insert(0, KPresDMSipDMNode);
 TPtrC8 finalLink = idLinkBuffer;
 //Reqest the ID
 result->Reset();
 Callback().FetchLinkL( finalLink, *result, status);
-PRES_DM_LOG(LOG_LIT8("   FetchLinkL(%S) status : %d"), &idLinkBuffer, status );
-if( status == EOk )
+foundId = DesToInt(result->Ptr(0));
+if (foundId == aSipID)
 {
-foundId = DesToInt(result->Ptr(0));
+found = ETrue;
-PRES_DM_LOG(LOG_LIT("   foundId : %d"), foundId );
+aObject.InsertL(0, NSmlDmURI::RemoveLastSeg(finalLink));
-if (foundId == aSipID)
-{
-found = ETrue;
-aObject.InsertL(0, NSmlDmURI::RemoveLastSeg(finalLink));
 break;
 }
-}
-numOfUriSegs--;
+numOfUriSegs -= 1;
 }
 CleanupStack::PopAndDestroy( uriSegBuffer );    // >>> uriSegBuffer
 }
 CleanupStack::PopAndDestroy( result );    // >>> result
 // -----------------------------------------------------------------------------
 //
 CSmlDmAdapter::TError CPresenceDMAdapter::GetConRefFromXdmIDL( TInt aXdmID,
 CBufBase& aObject)
 {
-PRES_DM_LOG(LOG_LIT(" GetConRefFromXdmIDL(aXdmId:%d)"),aXdmID);
+PRES_DM_LOG(LOG_LIT(" GetConRefFromXdmIDL(%d)"),aXdmID);
 CSmlDmAdapter::TError status = CSmlDmAdapter::ENotFound;
 if( aXdmID != KErrNotFound )
 {
 CBufBase* result = CBufFlat::NewL(1);
 CleanupStack::PushL(result);    // << result
 // Request all the XDM settings identifiers
 Callback().FetchLinkL( KPresDMXdmDMNode, *result, status);
-PRES_DM_LOG(LOG_LIT("   FetchLinkL(XDM) status : %d"), status );
 TInt id(KErrNotFound);
 TPtrC8 lastUriSegXdm;
 if( status == EOk )
 TBool CPresenceDMAdapter::IsPresIDValidL(TInt aSetId)
 {
 TPresSettingsSet tempSet;
 if ((PresSettingsApi::SettingsSetL(aSetId,tempSet)) == KErrNone)
 return ETrue;
-PRES_DM_LOG(LOG_LIT8(" IsPresIDValidL - Invalid settings : %d"), aSetId );
 return EFalse;
 }
 // -----------------------------------------------------------------------------
 // CPresenceDMAdapter::GetSipIdFromConRefL
 //resultBuf.Zero();
 //result->Read(0, resultBuf,result->Size());
 if( status == EOk )
 {
-TUint32 id = DesToInt( result->Ptr( 0 ) );
+TUint32 id(NULL);
+id = DesToInt( result->Ptr( 0 ) );
 returnId = (TInt)id;
 }
 CleanupStack::PopAndDestroy( result );   // >>> result
 PRES_DM_LOG(LOG_LIT("   status(%d), returnId(%d): end"), status, returnId);

branch	RCL_3
changeset 34	2669f8761a99
parent 0	c8caa15ef882
child 35	fbd2e7cec7ef