FCL/sf/mw/legacypresence: comparison simpledatamodeladapter/src/presenceplugindata.cpp

equal deleted inserted replaced

-:c8caa15ef882
+:e6a66db4e9d0
 /*
-* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2007 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".
 #include <msimpleelement.h>
 #include <msimplepresencelist.h>
 #include <msimplemeta.h>
 #include <simpleutils.h>
 #include <presencecachewriter2.h>
-#include <presencecachereader2.h>
 #include <presencebuddyinfo.h>
 #include <spsettings.h>
 #include <spentry.h>
 #include <spproperty.h>
 #include <spdefinitions.h>
 #include <avabilitytext.h>
 #include <cvimpstsettingsstore.h>
 #include "presenceplugindata.h"
 #include "presenceplugincommon.h"
 #include "presencepluginvirtualgroup.h"
-#include "presencepluginlanguagecodes.h"
 // ---------------------------------------------------------------------------
 // CPresencePluginData::CPresencePluginData
 // ---------------------------------------------------------------------------
 //
 CPresencePluginData::CPresencePluginData(
 	MPresencePluginConnectionObs& aObs,
 	TInt aServiceId ):
 	iConnObs( aObs ),
 	iServiceId( aServiceId ),
-	iPresenceCacheWriter( NULL ),
+	iPresenceCacheWriter( NULL )
-	iPresenceCacheReader( NULL )
 {
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::~CPresencePluginData
 //
 CPresencePluginData::~CPresencePluginData()
 {
 DP_SDA("CPresencePluginData::~CPresencePluginData");
 delete iPresenceCacheWriter;
-delete iPresenceCacheReader;
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::NewL
 // ---------------------------------------------------------------------------
 //
 void CPresencePluginData::ConstructL()
 {
 DP_SDA("CPresencePluginData::ConstructL");
 iPresenceCacheWriter =  MPresenceCacheWriter2::CreateWriterL();
-iPresenceCacheReader = MPresenceCacheReader2::CreateReaderL();
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::NewLC
 // ---------------------------------------------------------------------------
 			                    }
 			                }
 	        }
 //FIND ACTIVITIES ELEMENT
-	    if ( basicElementFound && !activitiesElementFound &&
+	    if ( basicElementFound  &&
 	        !elem2->LocalName().CompareF( KPresenceActivities8 ) )
 	        {
 	        DP_SDA("NotifyToPrInfoL activities found outside basic");
 			            elem2->SimpleElementsL( activitiesElems );
 			            TInt count4 = activitiesElems.Count();
 			                activitiesSimpleElem = activitiesElems[l];
 			                activitiesElementFound = ETrue;
 			                DP_SDA("CPresencePluginData::NotifyToPrInfoL 6");
 			                }
 	        }
-}
+	    // Check note field
+	    if ( basicElementFound  &&
-if ( basicElementFound && !noteSimpleElem )
+	        !elem2->LocalName().CompareF( KPresenceNote8 ) )
-{
+	        {
-noteSimpleElem = ResolveNoteElementL( elems2 );
+	        DP_SDA("NotifyToPrInfoL note field found inside tuple");
-}
+			            noteSimpleElem = elem2;
+	        }
+}
 DP_SDA("NotifyToPrInfoL ALL DONE");
 CleanupStack::PopAndDestroy( &elems2 );
-if ( basicElementFound && activitiesElementFound && noteElemFound )
+if( basicElementFound && activitiesElementFound && noteElemFound )
 {
 DP_SDA("NotifyToPrInfoL ALL DONE break out");
 //Just handle first status information from document
 // In future server should support <timestamp>
 //Also client should be can handle timestaps if there are present
 aPrInfo.AddDevicePresenceL ( NULL );
 aPrInfo.AddServicePresenceL( NULL );
 */
 DP_SDA("CPresencePluginData::NotifyToPrInfoL end");
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::CacheEntriesFromPrInfo
 // ---------------------------------------------------------------------------
 //
 DP_SDA(" CPresencePluginData::SingleUserStatusToXIMPL else closed");
 enumField->SetValueL( NPresenceInfo::ENotAvailable );
 }
 }
 field->SetFieldValue( enumField );
 aCollection.AddOrReplaceFieldL( field );
 CleanupStack::Pop( 2 );            // >> field, enumField
 DP_SDA(" CPresencePluginData::SingleUserStatusToXIMPL check for note");
+// Handle notes field if found
-// Handle note field if found and buddy is "available".
+if ( aNoteElement )
-if ( aNoteElement &&
-NPresenceInfo::EOffline != enumField->Value() &&
-NPresenceInfo::ENotAvailable != enumField->Value() )
 {
 DP_SDA(" CPresencePluginData::SingleUserStatusToXIMPL note elems found");
 // consider mapping note text to enum value if value not mapped
-UserNoteToXIMPL( aPresenceFactory, aNoteElement, aCollection );
+UserNoteToXIMPL( aPresenceFactory, aNoteElement,
+aCollection );
 }
 }
 CleanupStack::PopAndDestroy( nodeContent );
 DP_SDA(" CPresencePluginData::SingleUserStatusToXIMPL end");
 }
 // Maybe should check which prefix to use,
 // but assume that no secure is used if prefix missing
 TInt len = aPresentityUri.Length() + KMyLenSipPrefix;
 buf = buf->ReAllocL( len );
 //update pointer after realloc
-CleanupStack::Pop( 1 );
+CleanupStack::Pop( buf );
 CleanupStack::PushL( buf );
 // Since realloc may have changed the location in memory
 // we must also reset ptr
 pBuf.Set( buf->Des() );
 pBuf.Append( KMySip8 );
 //
 TInt CPresencePluginData::ServiceId()
 {
 return iServiceId;
 }
-// ---------------------------------------------------------------------------
-// CPresencePluginData::ServiceNameLC()
-// ---------------------------------------------------------------------------
-//
-HBufC* CPresencePluginData::ServiceNameLC( TInt aServiceId ) const
-{
-CSPSettings* spSettings = CSPSettings::NewLC();
-CSPEntry* entry = CSPEntry::NewLC();
-HBufC* serviceName = NULL;
-User::LeaveIfError( spSettings->FindEntryL( aServiceId, *entry ) );
-serviceName = entry->GetServiceName().AllocL();
-CleanupStack::PopAndDestroy( entry );
-CleanupStack::PopAndDestroy( spSettings );
-CleanupStack::PushL( serviceName );
-return serviceName;
-}
-// ---------------------------------------------------------------------------
-// CPresencePluginData::ResolveCacheXspIdentifierL()
-// ---------------------------------------------------------------------------
-//
-HBufC* CPresencePluginData::ResolveCacheXspIdentifierL(
-const TDesC& aIdentity ) const
-{
-DP_SDA( "CPresencePluginData::ResolveCacheXspIdentifierL" );
-CSPSettings* spSettings = CSPSettings::NewLC();
-CSPEntry* entry = CSPEntry::NewLC();
-User::LeaveIfError( spSettings->FindEntryL( iServiceId, *entry ) );
-TInt cacheUriLength = ( entry->GetServiceName().Length() +
-aIdentity.Length() + 1 );
-HBufC* cacheUri = HBufC::NewL( cacheUriLength );
-TPtr cacheUriPtr( cacheUri->Des() );
-cacheUriPtr.Append( entry->GetServiceName() );
-cacheUriPtr.Append( ':' );
-cacheUriPtr.Append( aIdentity );
-CleanupStack::PopAndDestroy( entry );
-CleanupStack::PopAndDestroy( spSettings );
-DP_SDA2( "CPresencePluginData::ResolveCacheXspIdentifierL returns: %S", cacheUri );
-return cacheUri;
-}
 // ---------------------------------------------------------------------------
 // CPresencePluginData::WriteBlockItemsToCacheL()
 // ---------------------------------------------------------------------------
 //
 void CPresencePluginData::WriteStatusToCacheL(
 aAvailability );
 DP_SDA2( "CPresencePluginData::WriteStatusToCacheL, availabilityText: %S",
 &aAvailabilityText );
 DP_SDA2( "CPresencePluginData::WriteStatusToCacheL, statusMessage: %S",
 &aStatusMessage );
-TBool updateCache( ETrue );
+CSPSettings* spSettings = CSPSettings::NewL();
+CleanupStack::PushL( spSettings );
-HBufC* cacheUri = ResolveCacheXspIdentifierL( aPresentityId );
+// Resolve service name (cache xsp identifier)
-CleanupStack::PushL( cacheUri );
+CSPEntry* entry = CSPEntry::NewLC();
+spSettings->FindEntryL( ServiceId(), *entry );
-DP_SDA(" -> WriteStatusToCacheL - read previous values from cache");
+TInt cacheUriLength = ( entry->GetServiceName().Length() +
-// Read previous values from cache
+aPresentityId.Length() + 1 );
-MPresenceBuddyInfo2* previousPresInfo =
-iPresenceCacheReader->PresenceInfoLC( *cacheUri );
+DP_SDA2(" -> cache uri length: %d", cacheUriLength );
-if ( previousPresInfo )
+HBufC* cacheUri = HBufC::NewLC( cacheUriLength );
-{
+TPtr cacheUriPtr( cacheUri->Des() );
-DP_SDA(" -> WriteStatusToCacheL - get availability value");
+DP_SDA(" -> WriteStatusToCacheL - form cache entry");
-MPresenceBuddyInfo2::TAvailabilityValues availability =
+cacheUriPtr.Append( entry->GetServiceName() );
-previousPresInfo->Availability();
+cacheUriPtr.Append( ':' );
+cacheUriPtr.Append( aPresentityId );
-DP_SDA(" -> WriteStatusToCacheL - get availability text");
+MPresenceBuddyInfo2* buddyPresInfo = MPresenceBuddyInfo2::NewLC();
-TPtrC availabilityText = previousPresInfo->AvailabilityText();
+buddyPresInfo->SetIdentityL( cacheUriPtr );
-DP_SDA(" -> WriteStatusToCacheL - get status message");
+TBuf<20> buf;
+TBool handled = EFalse;
-TPtrC statusMessage = previousPresInfo->StatusMessage();
-CleanupStack::PopAndDestroy(); //previousPresInfo
+buf.Copy( KBlockedExtensionValue );
-DP_SDA2( "CPresencePluginData::WriteStatusToCacheL, OLD STATUS: %d",
+if( aAvailabilityText.Compare( buf ) == 0 )
-availability );
+{
-DP_SDA2( "CPresencePluginData::WriteStatusToCacheL, OLD AVAILABILITY TEXT: %S",
+DP_SDA( " -> WriteStatusToCacheL - set Blocked" );
-&availabilityText );
+buddyPresInfo->SetAnyFieldL( KExtensionKey, KBlockedExtensionValue );
-DP_SDA2( "CPresencePluginData::WriteStatusToCacheL, OLD STATUS MESSAGE: %S",
+handled = ETrue;
-&statusMessage );
+}
-if ( ( aAvailability == availability ) &&
+buf.Copy( KPendingRequestExtensionValue );
-( aAvailabilityText.Compare( availabilityText ) == 0 ) &&
-( aStatusMessage.Compare( statusMessage ) == 0 ))
+if ( aAvailabilityText.Compare( buf ) == 0 )
 {
-DP_SDA(" -> WriteStatusToCacheL - no need to update cache");
+DP_SDA( " -> WriteStatusToCacheL - set Pending request" );
-updateCache = EFalse;
+buddyPresInfo->SetAnyFieldL( KExtensionKey, KPendingRequestExtensionValue );
-}
+handled = ETrue;
 }
-if ( updateCache )
+if ( !handled )
 {
-MPresenceBuddyInfo2* newPresInfo = MPresenceBuddyInfo2::NewLC();
+DP_SDA( " -> WriteStatusToCacheL - set availability text" );
-newPresInfo->SetIdentityL( *cacheUri );
+buddyPresInfo->SetAvailabilityL( aAvailability, aAvailabilityText );
+}
-DP_SDA(" -> WriteStatusToCacheL - update cache");
+if ( aStatusMessage.Length() )
-TBuf<KBufSize20> buf;
+{
-TBool handled = EFalse;
+DP_SDA( " -> WriteStatusToCacheL - set status message" );
+buddyPresInfo->SetStatusMessageL( aStatusMessage );
-buf.Copy( KBlockedExtensionValue );
+}
-if( aAvailabilityText.Compare( buf ) == 0 )
+DP_SDA( " -> WriteStatusToCacheL - write presence to cache" );
-{
+TInt cacheError = iPresenceCacheWriter->WritePresenceL( buddyPresInfo );
-DP_SDA( " -> WriteStatusToCacheL - set Blocked" );
+DP_SDA2( "CPresencePluginEntityWatcher::WriteStatusToCacheL error: %d",
-newPresInfo->SetAnyFieldL( KExtensionKey, KBlockedExtensionValue );
+cacheError );
-handled = ETrue;
-}
+DP_SDA( " -> destroy buddy info" );
+CleanupStack::PopAndDestroy(); // buddyPresInfo
-buf.Copy( KPendingRequestExtensionValue );
-if ( aAvailabilityText.Compare( buf ) == 0 )
-{
-DP_SDA( " -> WriteStatusToCacheL - set Pending request" );
-newPresInfo->SetAnyFieldL( KExtensionKey, KPendingRequestExtensionValue );
-handled = ETrue;
-}
-if ( !handled )
-{
-DP_SDA2( " -> WriteStatusToCacheL - set availability text: %S", &aAvailabilityText );
-newPresInfo->SetAvailabilityL( aAvailability, aAvailabilityText );
-}
-if ( aStatusMessage.Length() )
-{
-DP_SDA2( " -> WriteStatusToCacheL - set status message: %S", &aStatusMessage );
-newPresInfo->SetStatusMessageL( aStatusMessage );
-}
-DP_SDA( " -> WriteStatusToCacheL - write presence to cache" );
-TInt cacheError = iPresenceCacheWriter->WritePresenceL( newPresInfo );
-DP_SDA2( "CPresencePluginEntityWatcher::WriteStatusToCacheL error: %d",
-cacheError );
-DP_SDA( " -> destroy buddy info" );
-CleanupStack::PopAndDestroy(); // newPresInfo
-}
 DP_SDA(" -> destroy uri");
 CleanupStack::PopAndDestroy( cacheUri );
+DP_SDA(" -> destroy sp entry");
+CleanupStack::PopAndDestroy( entry );
+DP_SDA(" -> destroy sp");
+CleanupStack::PopAndDestroy( spSettings );
 DP_SDA("CPresencePluginData::WriteStatusToCacheL end");
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::RemoveCacheL()
 DP_SDA("CPresencePluginData::RemoveCacheL");
 // Resolve service name (cache xsp identifier)
 CSPSettings* spSettings = CSPSettings::NewL();
 CleanupStack::PushL( spSettings );
 CSPEntry* entry = CSPEntry::NewLC();
 DP_SDA2(" -> RemoveCacheL look for service: %d", ServiceId() );
 spSettings->FindEntryL( ServiceId(), *entry );
 DP_SDA(" -> RemoveCacheL cache xsp identifier found");
 CleanupStack::PopAndDestroy( entry );
 DP_SDA(" -> destroy sp");
 CleanupStack::PopAndDestroy( spSettings );
 DP_SDA("CPresencePluginData::DeletePresenceL out");
 }
 // ---------------------------------------------------------------------------
 // CPresencePluginData::StorePresenceOwnPresenceL()
 // ---------------------------------------------------------------------------
 //
 DP_SDA("CPresencePluginData::StorePresenceOwnPresenceL IN");
 DP_SDA2(" -> aServiceId: %d", aServiceId );
 DP_SDA2(" -> SAVE AVAILABILITY VALUE: %d", aAvailability );
 DP_SDA2(" -> SAVE STATUS MESSAGE: %S", &aStatusMessage );
 MVIMPSTSettingsStore* settings = CVIMPSTSettingsStore::NewLC();
 DP_SDA("CPresencePluginData::StorePresenceOwnPresenceL 1");
 // Store availability value to uiservicetabsettings
 void CPresencePluginData::ReadDocumentIdL(
 const TInt aServiceId,
 TDes8& aDocumentId )
 {
 DP_SDA("CPresencePluginData::ReadDocumentIdL IN");
 DP_SDA2(" -> aServiceId: %d", aServiceId );
 MVIMPSTSettingsStore* settings = CVIMPSTSettingsStore::NewLC();
 RBuf8 documentId;
 CleanupStack::PopAndDestroy(); // settings
 DP_SDA("CPresencePluginData::DeletePresenceVariablesL OUT");
 }
-// ---------------------------------------------------------------------------
-// CPresencePluginData::ResolveNoteElementL
-// Returns <note> element corresponding current locale or first <note>
-// element if better match is not found.
-// ---------------------------------------------------------------------------
-//
-MSimpleElement* CPresencePluginData::ResolveNoteElementL(
-const RPointerArray<MSimpleElement>& aElements ) const
-{
-DP_SDA("CPresencePluginData::ResolveNoteElementL" )
-MSimpleElement* bestMatch = NULL;
-MSimpleElement* secondBestMatch = NULL;
-for ( TInt i = aElements.Count() - 1; i >= 0 && NULL == bestMatch; i-- )
-{
-MSimpleElement* element = aElements[i];
-using namespace NPresencePlugin::NPresence;
-if ( 0 == element->LocalName().CompareF( KPresenceNote8 ) )
-{
-if ( IsElementLanguageValidForCurrentLocaleL( *element ) )
-{
-DP_SDA("CPresencePluginData::ResolveNoteElementL, BEST MATCH.")
-bestMatch = element;
-}
-else
-{
-secondBestMatch = element;
-}
-}
-}
-return ( bestMatch ? bestMatch : secondBestMatch );
-}
-// ---------------------------------------------------------------------------
-// CPresencePluginData::IsElementLanguageValidForCurrentLocaleL
-// ---------------------------------------------------------------------------
-//
-TBool CPresencePluginData::IsElementLanguageValidForCurrentLocaleL(
-MSimpleElement& aElement ) const
-{
-DP_SDA( "CPresencePluginData::IsElementLanguageValidForCurrentLocaleL" )
-TBool isLanguageResolved = EFalse;
-_LIT8( KLanguageAttribute, "xml:lang" );
-TLanguage language = User::Language();
-RPointerArray<MSimpleAttribute> attributes;
-CleanupClosePushL( attributes );
-aElement.SimpleAttributesL( attributes );
-for ( TInt i = attributes.Count() - 1; i >= 0 && !isLanguageResolved; i-- )
-{
-if ( 0 == KLanguageAttribute().CompareF( attributes[i]->Name() ) )
-{
-const TDesC8& attributeValue = attributes[i]->Value();
-for ( TInt index = 0; index < KLanguageCodeMappingsCount; index++ )
-{
-if ( language == KLanguageCodeMappings[index].SymbianLanguageCode() &&
-0 == attributeValue.CompareF(
-KLanguageCodeMappings[index].IsoLanguageCode() ) )
-{
-isLanguageResolved = ETrue;
-}
-}
-}
-}
-CleanupStack::Pop( &attributes );
-return isLanguageResolved;
-}
 // End of file

changeset 12	e6a66db4e9d0
parent 0	c8caa15ef882