MCL/sf/app/contentcontrol: comparison omads/omadsextensions/adapters/mms/src/mmsdatastore.cpp

equal deleted inserted replaced

-:8e7494275d3a
+:4f0867e42d62
 * Description:  Part of SyncML Data Synchronization Plug In Adapter
 *
 */
 #include <e32base.h>
 #include <msvstd.h>
 #include <msvapi.h>
 #include <msvids.h>
 #include <mtclreg.h>
 #include <mmsconst.h>
 #include <centralrepository.h>
 #include <mmscodecclient.h>
 LOGGER_ENTERFN("CMmsDataStore::DoStoreName");
 if ( iDataBaseOpened )
 {
 LOGGER_LEAVEFN( "CMmsDataStore::DoStoreName" );
-LOGGER_WRITE_1( "Database name: %S", &KNSmlDefaultLocalDbName );
+LOGGER_MSG_EC( "Database name: %S", &KNSmlDefaultLocalDbName );
 return KNSmlDefaultLocalDbName;
 }
 LOGGER_LEAVEFN( "CMmsDataStore::DoStoreName" );
 return KNullDesC;
 delete repository;
 }
 else
 {
-LOGGER_WRITE_1( "CRepository::NewL leaved with %d", error );
+LOGGER_MSG_EC( "CRepository::NewL leaved with %d", error );
 }
 LOGGER_LEAVEFN( "CMmsDataStore::DoMaxObjectSize" );
 return maxSendSize;
 }
 TInt& aSize, TSmlDbItemUid& aParent, TDes8& aMimeType,
 TDes8& aMimeVer, TRequestStatus& aStatus )
 {
 LOGGER_ENTERFN( "CMmsDataStore::DoOpenItemL" );
-LOGGER_WRITE_1( "Opening item %d.", aUid );
+LOGGER_MSG_EC( "Opening item %d.", aUid );
 // Store these for later use
 iCallerStatus = &aStatus;
 *iCallerStatus = KRequestPending;
 // Check that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1( "CMmsDataStore::DoOpenItemL, invalid state %d.", iCurrentState );
+LOGGER_MSG_EC( "CMmsDataStore::DoOpenItemL, invalid state %d.", iCurrentState );
 User::RequestComplete( iCallerStatus, KErrNotReady );
 return;
 }
 TBool userFolderFound( EFalse );
 CMsvEntry* entry( NULL );
 TRAP( error, entry = iMsvSession->GetEntryL(aUid) );
 if ( error != KErrNone )
 {
 User::RequestComplete( iCallerStatus, KErrNotFound );
-LOGGER_WRITE_1("iMsvSession->GetEntryL failed with %d.", error);
+LOGGER_MSG_EC("iMsvSession->GetEntryL failed with %d.", error);
 return;
 }
 TMsvEntry messageEntry = entry->Entry();
 SAFEDELETE( entry );
 iMsvWait->iStatus) );
 if ( error != KErrNone )
 {
 User::RequestComplete( iCallerStatus, error );
-LOGGER_WRITE_1("iCodecClient->InitializeChunkedRetrievingL failed with %d.", error);
+LOGGER_MSG_EC("iCodecClient->InitializeChunkedRetrievingL failed with %d.", error);
 return;
 }
 // Wait until the message has been processed
 iMsvWait->Start();
 if ( iMsvWait->iStatus != KErrNone )
 {
 User::RequestComplete( iCallerStatus, iMsvWait->iStatus.Int() );
-LOGGER_WRITE_1( "iCodecClient->InitializeChunkedRetrievingL failed with %d",
+LOGGER_MSG_EC( "iCodecClient->InitializeChunkedRetrievingL failed with %d",
 iMsvWait->iStatus.Int() );
 return;
 }
-LOGGER_WRITE_1("iUnread: %d", (TInt)iUnread);
 aSize++; // Status byte will be added also, reserve one additional byte for that.
 iCurrentState = EMmsItemOpen;
 }
 } // Open MMS message
 // -----------------------------------------------------------------------------
 void CMmsDataStore::DoCreateItemL( TSmlDbItemUid& aUid, TInt aSize, TSmlDbItemUid aParent,
 const TDesC8& aMimeType, const TDesC8& /*aMimeVer*/, TRequestStatus& aStatus )
 {
 LOGGER_ENTERFN( "CMmsDataStore::DoCreateItemL" );
-LOGGER_WRITE_1( "Parent folder: %d.", aParent );
+LOGGER_MSG_EC( "Parent folder: %d.", aParent );
 // Store some variables for further use
 iCallerStatus = &aStatus;
 *iCallerStatus = KRequestPending;
 // Ensure that we're in proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1( "Invalid state %d.", iCurrentState );
+LOGGER_MSG_EC( "Invalid state %d.", iCurrentState );
 }
 TBool createFolder( EFalse );
 LOG( aMimeType );
 if ( aMimeType.Compare( KFolderMimeType() ) == 0 )
 // -----------------------------------------------------------------------------
 void CMmsDataStore::DoReplaceItemL( TSmlDbItemUid aUid, TInt aSize, TSmlDbItemUid aParent,
 TBool /*aFieldChange*/, TRequestStatus& aStatus )
 {
 LOGGER_ENTERFN("CMmsDataStore::DoReplaceItemL");
-LOGGER_WRITE_1("Replacing item %d.", aUid);
+LOGGER_MSG_EC("Replacing item %d.", aUid);
-LOGGER_WRITE_1("Parent folder: %d.", aParent);
+LOGGER_MSG_EC("Parent folder: %d.", aParent);
 // Store some variables for further use
 iCallerStatus = &aStatus;
 *iCallerStatus = KRequestPending;
 // Ensure proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("Invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("Invalid state %d.", iCurrentState);
 }
 // Ensure that we've got enough disk space for the item
 if ( iCodecClient->DiskSpaceBelowCriticalLevelL( aSize ) )
 {
 CMsvEntry* entry(NULL);
 TRAPD( err, entry = iMsvSession->GetEntryL( aUid ) );
 if ( err != KErrNone )
 {
 User::RequestComplete( iCallerStatus, KErrNotFound );
-LOGGER_WRITE_1("CMsvSession::GetEntryL failed with %d.", err)
+LOGGER_MSG_EC("CMsvSession::GetEntryL failed with %d.", err)
 return;
 }
 TMsvEntry tEntry = entry->Entry();
 delete entry;
 if ( ( updateFolder && aParent != KMsvMyFoldersEntryIdValue )
 || ( !updateFolder && !iMsvApi->ValidFolderL( aParent )
 || ( aParent != tEntry.Parent() ) ) )
 {
 User::RequestComplete( iCallerStatus, KErrNotSupported );
-LOGGER_WRITE_1("Bad parent folder, message entry parent is %d", tEntry.Parent());
+LOGGER_MSG_EC("Bad parent folder, message entry parent is %d", tEntry.Parent());
 return;
 }
 // Store these for further use
 iParentId = aParent;
 else if ( iCurrentState == EMmsItemOpenFieldUpdate )
 {
 if ( iReadCounter++ == 0 )
 {
 TUint8 status = ResolveStatusBits( iUnread );
-LOGGER_WRITE_1("WriteStatusBits: %d", status);
 aBuffer.Append( &status, 1 );
 }
 else
 {
 LOGGER_WRITE("Field update done");
 else if ( iCurrentState == EMmsItemOpen )
 {
 if ( iReadCounter++ == 0 )
 {
 TUint8 status = ResolveStatusBits( iUnread );
-LOGGER_WRITE_1("WriteStatusBits: %d", status);
 aBuffer.Append( &status, 1 );
 iReadPosition = 0;
 iLastDataChunk = EFalse;
 iReadAllData = EFalse;
 }
 }
 }
 else
 {
-LOGGER_WRITE_1("CMmsDataStore::DoReadItemL: bad state %d", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoReadItemL: bad state %d", iCurrentState);
 User::Leave( KErrNotReady );
 }
 LOGGER_LEAVEFN("CMmsDataStore::DoReadItemL");
 }
 // Write specified amount of data to the temporary buffer
 // -----------------------------------------------------------------------------
 void CMmsDataStore::DoWriteItemL( const TDesC8& aData )
 {
 LOGGER_ENTERFN("CMmsDataStore::DoWriteItemL");
-LOGGER_WRITE_1("%d",iWriteCounter);
+LOGGER_MSG_EC("%d",iWriteCounter);
 TInt dataLength = aData.Length();
-LOGGER_WRITE_1("Data length: %d", dataLength);
+LOGGER_MSG_EC("Data length: %d", dataLength);
 if ( !( dataLength > 0 ) ) // Should never happen...
 {
 LOGGER_WRITE("Error: no data");
 User::Leave( KErrArgument );
 iWrittenDataLength += data.Length();
 }
 else // just status update
 {
 UpdateMmsStatusL( iCurrentId, iUnread );
-LOGGER_WRITE_1("Message status updated, iUnread: %d", iUnread);
+LOGGER_MSG_EC("Message status updated: %d", iUnread);
 }
 }
 else
 {
 TPtrC8 data = aData.Mid(0);
 }
 }
 else
 {
-LOGGER_WRITE_1("Wrong state %d", iCurrentState);
+LOGGER_MSG_EC("Wrong state %d", iCurrentState);
 User::Leave( KErrNotReady );
 }
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("iCodecClient->NextDataPart() failed with %d", error);
+LOGGER_MSG_EC("iCodecClient->NextDataPart() failed with %d", error);
 User::Leave( error );
 }
 LOGGER_LEAVEFN("CMmsDataStore::DoWriteItemL");
 }
 {
 error = iFolderObjectParser->ImportFolderXml( iDataBuffer->Ptr(0) );
 if ( error != KErrNone )
 {
 User::RequestComplete( iCallerStatus, error );
-LOGGER_WRITE_1("ImportFolderXml failed with %d", error);
+LOGGER_MSG_EC("ImportFolderXml failed with %d", error);
 return;
 }
 const TDesC& name = iFolderObjectParser->GetName();
 if ( name.Length() <= 0 )
 *iCreatedUid = id;
 iCurrentId = id;
 }
 else
 {
-LOGGER_WRITE_1("iMsvApi->AddFolderL failed with %d", error);
+LOGGER_MSG_EC("iMsvApi->AddFolderL failed with %d", error);
 }
 }
 else
 {
 error = iMsvApi->UpdateUserFolderL( iCurrentId, name );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("iMsvApi->UpdateFolderL failed with %d", error);
+LOGGER_MSG_EC("iMsvApi->UpdateFolderL failed with %d", error);
 }
 }
 }
 else if ( iCurrentState == EMmsItemCreating )
 {
 }
 }
 else
 {
 User::RequestComplete( iCallerStatus, KErrNotSupported );
-LOGGER_WRITE_1("Bad state: %d", iCurrentState);
+LOGGER_MSG_EC("Bad state: %d", iCurrentState);
 return;
 }
 delete iDataBuffer;
 iDataBuffer = NULL;
 iChangeFinder->ItemUpdatedL( snapshotItem );
 }
 }
 else
 {
-LOGGER_WRITE_1( "CMsvSession::GetEntry failed with %d", error );
+LOGGER_MSG_EC( "CMsvSession::GetEntry failed with %d", error );
 }
 }
 // Send message if parent folder is Outbox
 if ( iParentId == KMsvGlobalOutBoxIndexEntryId &&
 {
 iCurrentState = EMmsOpenAndWaiting;
 }
 else
 {
-LOGGER_WRITE_1("Invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("Invalid state %d.", iCurrentState);
 }
 LOGGER_LEAVEFN("CMmsDataStore::DoCloseItem");
 }
 void CMmsDataStore::DoMoveItemL( TSmlDbItemUid aUid,
 TSmlDbItemUid aNewParent, TRequestStatus& aStatus )
 {
 LOGGER_ENTERFN("CMmsDataStore::DoMoveItemL");
-LOGGER_WRITE_1("Moving item %d.", aUid);
+LOGGER_MSG_EC("Moving item %d.", aUid);
 // Store some variables for further use
 iCallerStatus = &aStatus;
 *iCallerStatus = KRequestPending;
 // Check that we're in proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoMoveItemL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoMoveItemL, invalid state %d.", iCurrentState);
 }
 // Ensure that we have this item in the message store
 if ( !MmsItemExists( aUid ) )
 {
 // Removes item from the message store
 // -----------------------------------------------------------------------------
 void CMmsDataStore::DoDeleteItemL( TSmlDbItemUid aUid, TRequestStatus& aStatus  )
 {
 LOGGER_ENTERFN("CMmsDataStore::DoDeleteItemL");
-LOGGER_WRITE_1("Deleting item %d.", aUid);
+LOGGER_MSG_EC("Deleting item %d.", aUid);
 // Store some variables for further use
 iCallerStatus = &aStatus;
 *iCallerStatus = KRequestPending;
 TInt error(KErrNone);
 // Check that we're in proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoDeleteItemL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoDeleteItemL, invalid state %d.", iCurrentState);
 }
 // Check if this is a user folder
 if ( iMsvApi->FindUserFolderL( aUid ) )
 {
 LOGGER_WRITE("Folder");
 error = DeleteAllMessagesInFolderL( aUid );
 if ( error != KErrNone )
 {
 User::RequestComplete( iCallerStatus, error );
-LOGGER_WRITE_1("Deleting MMS messages in folder failed with %d", error);
+LOGGER_MSG_EC("Deleting MMS messages in folder failed with %d", error);
 return;
 }
 error = iMsvApi->DeleteUserFolderL(aUid);
 if ( error != KErrNone )
 {
 // Note: folder is not deleted if contains other message items (like MMS)
 // In this case DeleteUserFolderL returns KErrInUse.
-LOGGER_WRITE_1("Deleting folder failed with %d", error);
+LOGGER_MSG_EC("Deleting folder failed with %d", error);
 }
 }
 else if ( MmsItemExists( aUid ) )
 {
 // Tell CodecClient to delete this message
 error = iCodecClient->DeleteMM( aUid );
 if ( error != KErrNone )
 {
 User::RequestComplete( iCallerStatus, error );
-LOGGER_WRITE_1("CMmsCodecClient::DeleteMM failed with %d", error);
+LOGGER_MSG_EC("CMmsCodecClient::DeleteMM failed with %d", error);
 return;
 }
 // Inform ChangeFinder of the removed item
 iChangeFinder->ItemDeletedL( aUid );
 }
 else
 {
 User::RequestComplete( iCallerStatus, KErrNotFound );
-LOGGER_WRITE_1("Item %d is not folder or MMS message", aUid);
+LOGGER_MSG_EC("Item %d is not folder or MMS message", aUid);
 return;
 }
 LOGGER_WRITE_1("complete error: %d", error);
 // Signal we're done
 *iCallerStatus = KRequestPending;
 // Check that we're in proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoDeleteAllItemsL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoDeleteAllItemsL, invalid state %d.", iCurrentState);
 }
 TInt error(KErrNone);
 TInt result(KErrNone);
 // Deletes all items in the specified folder in message store
 // -----------------------------------------------------------------------------
 TInt CMmsDataStore::DeleteAllMessagesInFolderL( TMsvId aId )
 {
 LOGGER_ENTERFN("CMmsDataStore::DeleteAllMessagesInFolderL");
-LOGGER_WRITE_1("Folder: %d", aId);
+LOGGER_MSG_EC("Folder: %d", aId);
 TInt error(KErrNone);
 // Get the root folder
 CMsvEntry* msvEntry = iMsvSession->GetEntryL(aId);
 // We are only interested of the MM content
 for ( TInt index=0; index < messages->Count(); index++ )
 {
 id = messages->At( index );
-LOGGER_WRITE_1("Message item %d:", id);
+LOGGER_MSG_EC("Message item %d:", id);
 error = iMsvSession->GetEntry( id, service, msg );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("GetEntry failed with %d", error);
+LOGGER_MSG_EC("GetEntry failed with %d", error);
 break;
 }
 if ( msg.iMtm == KUidMsgTypeMultimedia )
 {
 error = iCodecClient->DeleteMM( id );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("DeleteMM failed with %d", error);
+LOGGER_MSG_EC("DeleteMM failed with %d", error);
 break;
 }
 // Update Change Finder
 iChangeFinder->ItemDeletedL( id );
 LOGGER_WRITE("MMS message deleted");
 LOGGER_ENTERFN("CMmsDataStore::DoAddedItems");
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoAddedItems, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoAddedItems, invalid state %d.", iCurrentState);
 }
 TInt error(KErrNone);
 // Clear new-items array
 iNewItems->Reset();
-// Set current snapshot, this will be compared against the old one
 // Search for new items
 TRAP( error, iChangeFinder->FindNewItemsL(*iNewItems) )
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoAddedItems, iChangeFinder->FindNewItemsL leaved with %d.", error);
+LOGGER_MSG_EC("CMmsDataStore::DoAddedItems, iChangeFinder->FindNewItemsL leaved with %d.", error);
 }
-LOGGER_WRITE_1("New item count: %d.", iNewItems->ItemCount());
+LOGGER_MSG_EC("New item count: %d.", iNewItems->ItemCount());
 LOGGER_LEAVEFN("CMmsDataStore::DoAddedItems");
 return *iNewItems;
 }
 LOGGER_ENTERFN("CMmsDataStore::DoDeletedItemsL");
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoDeletedItems, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoDeletedItems, invalid state %d.", iCurrentState);
 }
 TInt error(KErrNone);
 // Clear deleted-items array
 // Search for deleted items
 TRAP( error, iChangeFinder->FindDeletedItemsL( *iDeletedItems ) );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoDeletedItems, iChangeFinder->FindDeletedItemsL leaved with %d.", error);
+LOGGER_MSG_EC("CMmsDataStore::DoDeletedItems, iChangeFinder->FindDeletedItemsL leaved with %d.", error);
 }
-LOGGER_WRITE_1("Deleted item count: %d.", iDeletedItems->ItemCount());
+LOGGER_MSG_EC("Deleted item count: %d.", iDeletedItems->ItemCount());
 LOGGER_LEAVEFN("CMmsDataStore::DoDeletedItemsL");
 return *iDeletedItems;
 }
 // -----------------------------------------------------------------------------
 LOGGER_ENTERFN("CMmsDataStore::DoModifiedItems");
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoModifiedItems, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoModifiedItems, invalid state %d.", iCurrentState);
 }
 TInt error(KErrNone);
 // Clear updated-items array
 // Search for updated items
 TRAP( error, iChangeFinder->FindChangedItemsL( *iUpdatedItems ) )
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoModifiedItems, iChangeFinder->FindChangedItemsL leaved with %d.", error);
+LOGGER_MSG_EC("CMmsDataStore::DoModifiedItems, iChangeFinder->FindChangedItemsL leaved with %d.", error);
 }
-LOGGER_WRITE_1("Modified item count: %d.", iUpdatedItems->ItemCount());
+LOGGER_MSG_EC("Modified item count: %d.", iUpdatedItems->ItemCount());
 LOGGER_LEAVEFN("CMmsDataStore::DoModifiedItems");
 return *iUpdatedItems;
 }
 // -----------------------------------------------------------------------------
 LOGGER_ENTERFN("CMmsDataStore::DoMovedItems");
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoMovedItems, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoMovedItems, invalid state %d.", iCurrentState);
 }
 TInt error(KErrNone);
 // Clear moved-items array
 // Search for moved items
 TRAP( error, iChangeFinder->FindMovedItemsL( *iMovedItems ) );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoMovedItems, iChangeFinder->FindMovedItemsL leaved with %d.", error);
+LOGGER_MSG_EC("CMmsDataStore::DoMovedItems, iChangeFinder->FindMovedItemsL leaved with %d.", error);
 }
-LOGGER_WRITE_1("Moved item count: %d.", iMovedItems->ItemCount());
+LOGGER_MSG_EC("Moved item count: %d.", iMovedItems->ItemCount());
 LOGGER_LEAVEFN("CMmsDataStore::DoMovedItems");
 return *iMovedItems;
 }
 // -----------------------------------------------------------------------------
 *iCallerStatus = KRequestPending;
 // Check that we're in proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoResetChangeInfoL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoResetChangeInfoL, invalid state %d.", iCurrentState);
 }
 // Reset change info in ChangeFinder
 iChangeFinder->ResetL();
 iHasHistory = EFalse;
 *iCallerStatus = KRequestPending;
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoCommitChangeInfoL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoCommitChangeInfoL, invalid state %d.", iCurrentState);
 }
 // Notify ChangeFinder
 iChangeFinder->CommitChangesL(aItems);
 iHasHistory = ETrue;
 *iCallerStatus = KRequestPending;
 // Ensure that we're in a proper state
 if ( iCurrentState != EMmsOpenAndWaiting )
 {
-LOGGER_WRITE_1("CMmsDataStore::DoCommitChangeInfoL, invalid state %d.", iCurrentState);
+LOGGER_MSG_EC("CMmsDataStore::DoCommitChangeInfoL, invalid state %d.", iCurrentState);
 }
 // Notify ChangeFinder
 iChangeFinder->CommitChangesL();
 iHasHistory = ETrue;
 else
 {
 error = iCodecClient->GetNextDataPart( iReadDataChunk, iLastDataChunk );
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("iCodecClient->GetNextDataPart failed with %d", error);
+LOGGER_MSG_EC("iCodecClient->GetNextDataPart failed with %d", error);
 return error;
 }
 else
 {
-LOGGER_WRITE_1("iCodecClient->GetNextDataPart succeeded, length %d", iReadDataChunk.Length());
+LOGGER_MSG_EC("iCodecClient->GetNextDataPart succeeded, length %d", iReadDataChunk.Length());
 }
 }
 }
 TInt left = iReadDataChunk.Length() - iReadPosition;
 if ( folderId != KMsvMyFoldersTemplatesFolderId )
 {
 error = DeleteAllMessagesInFolderL(folderId);
 if ( error != KErrNone )
 {
-LOGGER_WRITE_1("Deleting messages in folder failed with %d", error);
+LOGGER_MSG_EC("Deleting messages in folder failed with %d", error);
 result = error;
 }
 error = iMsvApi->DeleteUserFolderL( folderId );
 if ( error != KErrNone && error != KErrInUse )
 {
 // Note: folder is not deleted if contains other message items (like MMS)
 // In this case DeleteUserFolderL returns KErrInUse.
-LOGGER_WRITE_1("iMsvApi->DeleteUserFolderL failed with %d", error);
+LOGGER_MSG_EC("iMsvApi->DeleteUserFolderL failed with %d", error);
 result = error;
 }
 }
 }

branch	RCL_3
changeset 25	4f0867e42d62
parent 24	8e7494275d3a