325 TInt& aSize, TSmlDbItemUid& aParent, TDes8& aMimeType, |
325 TInt& aSize, TSmlDbItemUid& aParent, TDes8& aMimeType, |
326 TDes8& aMimeVer, TRequestStatus& aStatus ) |
326 TDes8& aMimeVer, TRequestStatus& aStatus ) |
327 { |
327 { |
328 LOGGER_ENTERFN( "CMmsDataStore::DoOpenItemL" ); |
328 LOGGER_ENTERFN( "CMmsDataStore::DoOpenItemL" ); |
329 |
329 |
330 LOGGER_WRITE_1( "Opening item %d.", aUid ); |
330 LOGGER_MSG_EC( "Opening item %d.", aUid ); |
331 |
331 |
332 // Store these for later use |
332 // Store these for later use |
333 iCallerStatus = &aStatus; |
333 iCallerStatus = &aStatus; |
334 *iCallerStatus = KRequestPending; |
334 *iCallerStatus = KRequestPending; |
335 |
335 |
336 // Check that we're in a proper state |
336 // Check that we're in a proper state |
337 if ( iCurrentState != EMmsOpenAndWaiting ) |
337 if ( iCurrentState != EMmsOpenAndWaiting ) |
338 { |
338 { |
339 LOGGER_WRITE_1( "CMmsDataStore::DoOpenItemL, invalid state %d.", iCurrentState ); |
339 LOGGER_MSG_EC( "CMmsDataStore::DoOpenItemL, invalid state %d.", iCurrentState ); |
340 User::RequestComplete( iCallerStatus, KErrNotReady ); |
340 User::RequestComplete( iCallerStatus, KErrNotReady ); |
341 return; |
341 return; |
342 } |
342 } |
343 |
343 |
344 TBool userFolderFound( EFalse ); |
344 TBool userFolderFound( EFalse ); |
404 iMsvWait->iStatus) ); |
404 iMsvWait->iStatus) ); |
405 |
405 |
406 if ( error != KErrNone ) |
406 if ( error != KErrNone ) |
407 { |
407 { |
408 User::RequestComplete( iCallerStatus, error ); |
408 User::RequestComplete( iCallerStatus, error ); |
409 LOGGER_WRITE_1("iCodecClient->InitializeChunkedRetrievingL failed with %d.", error); |
409 LOGGER_MSG_EC("iCodecClient->InitializeChunkedRetrievingL failed with %d.", error); |
410 return; |
410 return; |
411 } |
411 } |
412 |
412 |
413 // Wait until the message has been processed |
413 // Wait until the message has been processed |
414 iMsvWait->Start(); |
414 iMsvWait->Start(); |
415 |
415 |
416 if ( iMsvWait->iStatus != KErrNone ) |
416 if ( iMsvWait->iStatus != KErrNone ) |
417 { |
417 { |
418 User::RequestComplete( iCallerStatus, iMsvWait->iStatus.Int() ); |
418 User::RequestComplete( iCallerStatus, iMsvWait->iStatus.Int() ); |
419 LOGGER_WRITE_1( "iCodecClient->InitializeChunkedRetrievingL failed with %d", |
419 LOGGER_MSG_EC( "iCodecClient->InitializeChunkedRetrievingL failed with %d", |
420 iMsvWait->iStatus.Int() ); |
420 iMsvWait->iStatus.Int() ); |
421 return; |
421 return; |
422 } |
422 } |
423 LOGGER_WRITE_1("iUnread: %d", (TInt)iUnread); |
|
424 aSize++; // Status byte will be added also, reserve one additional byte for that. |
423 aSize++; // Status byte will be added also, reserve one additional byte for that. |
425 iCurrentState = EMmsItemOpen; |
424 iCurrentState = EMmsItemOpen; |
426 } |
425 } |
427 } // Open MMS message |
426 } // Open MMS message |
428 |
427 |
480 // ----------------------------------------------------------------------------- |
479 // ----------------------------------------------------------------------------- |
481 void CMmsDataStore::DoCreateItemL( TSmlDbItemUid& aUid, TInt aSize, TSmlDbItemUid aParent, |
480 void CMmsDataStore::DoCreateItemL( TSmlDbItemUid& aUid, TInt aSize, TSmlDbItemUid aParent, |
482 const TDesC8& aMimeType, const TDesC8& /*aMimeVer*/, TRequestStatus& aStatus ) |
481 const TDesC8& aMimeType, const TDesC8& /*aMimeVer*/, TRequestStatus& aStatus ) |
483 { |
482 { |
484 LOGGER_ENTERFN( "CMmsDataStore::DoCreateItemL" ); |
483 LOGGER_ENTERFN( "CMmsDataStore::DoCreateItemL" ); |
485 LOGGER_WRITE_1( "Parent folder: %d.", aParent ); |
484 LOGGER_MSG_EC( "Parent folder: %d.", aParent ); |
486 |
485 |
487 // Store some variables for further use |
486 // Store some variables for further use |
488 iCallerStatus = &aStatus; |
487 iCallerStatus = &aStatus; |
489 *iCallerStatus = KRequestPending; |
488 *iCallerStatus = KRequestPending; |
490 |
489 |
491 // Ensure that we're in proper state |
490 // Ensure that we're in proper state |
492 if ( iCurrentState != EMmsOpenAndWaiting ) |
491 if ( iCurrentState != EMmsOpenAndWaiting ) |
493 { |
492 { |
494 LOGGER_WRITE_1( "Invalid state %d.", iCurrentState ); |
493 LOGGER_MSG_EC( "Invalid state %d.", iCurrentState ); |
495 } |
494 } |
496 |
495 |
497 TBool createFolder( EFalse ); |
496 TBool createFolder( EFalse ); |
498 LOG( aMimeType ); |
497 LOG( aMimeType ); |
499 if ( aMimeType.Compare( KFolderMimeType() ) == 0 ) |
498 if ( aMimeType.Compare( KFolderMimeType() ) == 0 ) |
561 // ----------------------------------------------------------------------------- |
560 // ----------------------------------------------------------------------------- |
562 void CMmsDataStore::DoReplaceItemL( TSmlDbItemUid aUid, TInt aSize, TSmlDbItemUid aParent, |
561 void CMmsDataStore::DoReplaceItemL( TSmlDbItemUid aUid, TInt aSize, TSmlDbItemUid aParent, |
563 TBool /*aFieldChange*/, TRequestStatus& aStatus ) |
562 TBool /*aFieldChange*/, TRequestStatus& aStatus ) |
564 { |
563 { |
565 LOGGER_ENTERFN("CMmsDataStore::DoReplaceItemL"); |
564 LOGGER_ENTERFN("CMmsDataStore::DoReplaceItemL"); |
566 LOGGER_WRITE_1("Replacing item %d.", aUid); |
565 LOGGER_MSG_EC("Replacing item %d.", aUid); |
567 LOGGER_WRITE_1("Parent folder: %d.", aParent); |
566 LOGGER_MSG_EC("Parent folder: %d.", aParent); |
568 |
567 |
569 // Store some variables for further use |
568 // Store some variables for further use |
570 iCallerStatus = &aStatus; |
569 iCallerStatus = &aStatus; |
571 *iCallerStatus = KRequestPending; |
570 *iCallerStatus = KRequestPending; |
572 |
571 |
573 // Ensure proper state |
572 // Ensure proper state |
574 if ( iCurrentState != EMmsOpenAndWaiting ) |
573 if ( iCurrentState != EMmsOpenAndWaiting ) |
575 { |
574 { |
576 LOGGER_WRITE_1("Invalid state %d.", iCurrentState); |
575 LOGGER_MSG_EC("Invalid state %d.", iCurrentState); |
577 } |
576 } |
578 |
577 |
579 // Ensure that we've got enough disk space for the item |
578 // Ensure that we've got enough disk space for the item |
580 if ( iCodecClient->DiskSpaceBelowCriticalLevelL( aSize ) ) |
579 if ( iCodecClient->DiskSpaceBelowCriticalLevelL( aSize ) ) |
581 { |
580 { |
732 // Write specified amount of data to the temporary buffer |
729 // Write specified amount of data to the temporary buffer |
733 // ----------------------------------------------------------------------------- |
730 // ----------------------------------------------------------------------------- |
734 void CMmsDataStore::DoWriteItemL( const TDesC8& aData ) |
731 void CMmsDataStore::DoWriteItemL( const TDesC8& aData ) |
735 { |
732 { |
736 LOGGER_ENTERFN("CMmsDataStore::DoWriteItemL"); |
733 LOGGER_ENTERFN("CMmsDataStore::DoWriteItemL"); |
737 LOGGER_WRITE_1("%d",iWriteCounter); |
734 LOGGER_MSG_EC("%d",iWriteCounter); |
738 |
735 |
739 TInt dataLength = aData.Length(); |
736 TInt dataLength = aData.Length(); |
740 LOGGER_WRITE_1("Data length: %d", dataLength); |
737 LOGGER_MSG_EC("Data length: %d", dataLength); |
741 |
738 |
742 if ( !( dataLength > 0 ) ) // Should never happen... |
739 if ( !( dataLength > 0 ) ) // Should never happen... |
743 { |
740 { |
744 LOGGER_WRITE("Error: no data"); |
741 LOGGER_WRITE("Error: no data"); |
745 User::Leave( KErrArgument ); |
742 User::Leave( KErrArgument ); |
1005 void CMmsDataStore::DoMoveItemL( TSmlDbItemUid aUid, |
1002 void CMmsDataStore::DoMoveItemL( TSmlDbItemUid aUid, |
1006 TSmlDbItemUid aNewParent, TRequestStatus& aStatus ) |
1003 TSmlDbItemUid aNewParent, TRequestStatus& aStatus ) |
1007 { |
1004 { |
1008 LOGGER_ENTERFN("CMmsDataStore::DoMoveItemL"); |
1005 LOGGER_ENTERFN("CMmsDataStore::DoMoveItemL"); |
1009 |
1006 |
1010 LOGGER_WRITE_1("Moving item %d.", aUid); |
1007 LOGGER_MSG_EC("Moving item %d.", aUid); |
1011 |
1008 |
1012 // Store some variables for further use |
1009 // Store some variables for further use |
1013 iCallerStatus = &aStatus; |
1010 iCallerStatus = &aStatus; |
1014 *iCallerStatus = KRequestPending; |
1011 *iCallerStatus = KRequestPending; |
1015 |
1012 |
1016 // Check that we're in proper state |
1013 // Check that we're in proper state |
1017 if ( iCurrentState != EMmsOpenAndWaiting ) |
1014 if ( iCurrentState != EMmsOpenAndWaiting ) |
1018 { |
1015 { |
1019 LOGGER_WRITE_1("CMmsDataStore::DoMoveItemL, invalid state %d.", iCurrentState); |
1016 LOGGER_MSG_EC("CMmsDataStore::DoMoveItemL, invalid state %d.", iCurrentState); |
1020 } |
1017 } |
1021 |
1018 |
1022 // Ensure that we have this item in the message store |
1019 // Ensure that we have this item in the message store |
1023 if ( !MmsItemExists( aUid ) ) |
1020 if ( !MmsItemExists( aUid ) ) |
1024 { |
1021 { |
1049 // Removes item from the message store |
1046 // Removes item from the message store |
1050 // ----------------------------------------------------------------------------- |
1047 // ----------------------------------------------------------------------------- |
1051 void CMmsDataStore::DoDeleteItemL( TSmlDbItemUid aUid, TRequestStatus& aStatus ) |
1048 void CMmsDataStore::DoDeleteItemL( TSmlDbItemUid aUid, TRequestStatus& aStatus ) |
1052 { |
1049 { |
1053 LOGGER_ENTERFN("CMmsDataStore::DoDeleteItemL"); |
1050 LOGGER_ENTERFN("CMmsDataStore::DoDeleteItemL"); |
1054 LOGGER_WRITE_1("Deleting item %d.", aUid); |
1051 LOGGER_MSG_EC("Deleting item %d.", aUid); |
1055 |
1052 |
1056 // Store some variables for further use |
1053 // Store some variables for further use |
1057 iCallerStatus = &aStatus; |
1054 iCallerStatus = &aStatus; |
1058 *iCallerStatus = KRequestPending; |
1055 *iCallerStatus = KRequestPending; |
1059 |
1056 |
1060 TInt error(KErrNone); |
1057 TInt error(KErrNone); |
1061 |
1058 |
1062 // Check that we're in proper state |
1059 // Check that we're in proper state |
1063 if ( iCurrentState != EMmsOpenAndWaiting ) |
1060 if ( iCurrentState != EMmsOpenAndWaiting ) |
1064 { |
1061 { |
1065 LOGGER_WRITE_1("CMmsDataStore::DoDeleteItemL, invalid state %d.", iCurrentState); |
1062 LOGGER_MSG_EC("CMmsDataStore::DoDeleteItemL, invalid state %d.", iCurrentState); |
1066 } |
1063 } |
1067 |
1064 |
1068 // Check if this is a user folder |
1065 // Check if this is a user folder |
1069 if ( iMsvApi->FindUserFolderL( aUid ) ) |
1066 if ( iMsvApi->FindUserFolderL( aUid ) ) |
1070 { |
1067 { |
1071 LOGGER_WRITE("Folder"); |
1068 LOGGER_WRITE("Folder"); |
1072 error = DeleteAllMessagesInFolderL( aUid ); |
1069 error = DeleteAllMessagesInFolderL( aUid ); |
1073 if ( error != KErrNone ) |
1070 if ( error != KErrNone ) |
1074 { |
1071 { |
1075 User::RequestComplete( iCallerStatus, error ); |
1072 User::RequestComplete( iCallerStatus, error ); |
1076 LOGGER_WRITE_1("Deleting MMS messages in folder failed with %d", error); |
1073 LOGGER_MSG_EC("Deleting MMS messages in folder failed with %d", error); |
1077 return; |
1074 return; |
1078 } |
1075 } |
1079 error = iMsvApi->DeleteUserFolderL(aUid); |
1076 error = iMsvApi->DeleteUserFolderL(aUid); |
1080 if ( error != KErrNone ) |
1077 if ( error != KErrNone ) |
1081 { |
1078 { |
1082 // Note: folder is not deleted if contains other message items (like MMS) |
1079 // Note: folder is not deleted if contains other message items (like MMS) |
1083 // In this case DeleteUserFolderL returns KErrInUse. |
1080 // In this case DeleteUserFolderL returns KErrInUse. |
1084 LOGGER_WRITE_1("Deleting folder failed with %d", error); |
1081 LOGGER_MSG_EC("Deleting folder failed with %d", error); |
1085 } |
1082 } |
1086 } |
1083 } |
1087 else if ( MmsItemExists( aUid ) ) |
1084 else if ( MmsItemExists( aUid ) ) |
1088 { |
1085 { |
1089 // Tell CodecClient to delete this message |
1086 // Tell CodecClient to delete this message |
1090 error = iCodecClient->DeleteMM( aUid ); |
1087 error = iCodecClient->DeleteMM( aUid ); |
1091 if ( error != KErrNone ) |
1088 if ( error != KErrNone ) |
1092 { |
1089 { |
1093 User::RequestComplete( iCallerStatus, error ); |
1090 User::RequestComplete( iCallerStatus, error ); |
1094 LOGGER_WRITE_1("CMmsCodecClient::DeleteMM failed with %d", error); |
1091 LOGGER_MSG_EC("CMmsCodecClient::DeleteMM failed with %d", error); |
1095 return; |
1092 return; |
1096 } |
1093 } |
1097 // Inform ChangeFinder of the removed item |
1094 // Inform ChangeFinder of the removed item |
1098 iChangeFinder->ItemDeletedL( aUid ); |
1095 iChangeFinder->ItemDeletedL( aUid ); |
1099 } |
1096 } |
1100 else |
1097 else |
1101 { |
1098 { |
1102 User::RequestComplete( iCallerStatus, KErrNotFound ); |
1099 User::RequestComplete( iCallerStatus, KErrNotFound ); |
1103 LOGGER_WRITE_1("Item %d is not folder or MMS message", aUid); |
1100 LOGGER_MSG_EC("Item %d is not folder or MMS message", aUid); |
1104 return; |
1101 return; |
1105 } |
1102 } |
1106 |
1103 |
1107 LOGGER_WRITE_1("complete error: %d", error); |
1104 LOGGER_WRITE_1("complete error: %d", error); |
1108 // Signal we're done |
1105 // Signal we're done |
1186 // Deletes all items in the specified folder in message store |
1183 // Deletes all items in the specified folder in message store |
1187 // ----------------------------------------------------------------------------- |
1184 // ----------------------------------------------------------------------------- |
1188 TInt CMmsDataStore::DeleteAllMessagesInFolderL( TMsvId aId ) |
1185 TInt CMmsDataStore::DeleteAllMessagesInFolderL( TMsvId aId ) |
1189 { |
1186 { |
1190 LOGGER_ENTERFN("CMmsDataStore::DeleteAllMessagesInFolderL"); |
1187 LOGGER_ENTERFN("CMmsDataStore::DeleteAllMessagesInFolderL"); |
1191 LOGGER_WRITE_1("Folder: %d", aId); |
1188 LOGGER_MSG_EC("Folder: %d", aId); |
1192 |
1189 |
1193 TInt error(KErrNone); |
1190 TInt error(KErrNone); |
1194 |
1191 |
1195 // Get the root folder |
1192 // Get the root folder |
1196 CMsvEntry* msvEntry = iMsvSession->GetEntryL(aId); |
1193 CMsvEntry* msvEntry = iMsvSession->GetEntryL(aId); |
1207 |
1204 |
1208 // We are only interested of the MM content |
1205 // We are only interested of the MM content |
1209 for ( TInt index=0; index < messages->Count(); index++ ) |
1206 for ( TInt index=0; index < messages->Count(); index++ ) |
1210 { |
1207 { |
1211 id = messages->At( index ); |
1208 id = messages->At( index ); |
1212 LOGGER_WRITE_1("Message item %d:", id); |
1209 LOGGER_MSG_EC("Message item %d:", id); |
1213 |
1210 |
1214 error = iMsvSession->GetEntry( id, service, msg ); |
1211 error = iMsvSession->GetEntry( id, service, msg ); |
1215 if ( error != KErrNone ) |
1212 if ( error != KErrNone ) |
1216 { |
1213 { |
1217 LOGGER_WRITE_1("GetEntry failed with %d", error); |
1214 LOGGER_MSG_EC("GetEntry failed with %d", error); |
1218 break; |
1215 break; |
1219 } |
1216 } |
1220 |
1217 |
1221 if ( msg.iMtm == KUidMsgTypeMultimedia ) |
1218 if ( msg.iMtm == KUidMsgTypeMultimedia ) |
1222 { |
1219 { |
1223 error = iCodecClient->DeleteMM( id ); |
1220 error = iCodecClient->DeleteMM( id ); |
1224 if ( error != KErrNone ) |
1221 if ( error != KErrNone ) |
1225 { |
1222 { |
1226 LOGGER_WRITE_1("DeleteMM failed with %d", error); |
1223 LOGGER_MSG_EC("DeleteMM failed with %d", error); |
1227 break; |
1224 break; |
1228 } |
1225 } |
1229 // Update Change Finder |
1226 // Update Change Finder |
1230 iChangeFinder->ItemDeletedL( id ); |
1227 iChangeFinder->ItemDeletedL( id ); |
1231 LOGGER_WRITE("MMS message deleted"); |
1228 LOGGER_WRITE("MMS message deleted"); |
1263 LOGGER_ENTERFN("CMmsDataStore::DoAddedItems"); |
1260 LOGGER_ENTERFN("CMmsDataStore::DoAddedItems"); |
1264 |
1261 |
1265 // Ensure that we're in a proper state |
1262 // Ensure that we're in a proper state |
1266 if ( iCurrentState != EMmsOpenAndWaiting ) |
1263 if ( iCurrentState != EMmsOpenAndWaiting ) |
1267 { |
1264 { |
1268 LOGGER_WRITE_1("CMmsDataStore::DoAddedItems, invalid state %d.", iCurrentState); |
1265 LOGGER_MSG_EC("CMmsDataStore::DoAddedItems, invalid state %d.", iCurrentState); |
1269 } |
1266 } |
1270 |
1267 |
1271 TInt error(KErrNone); |
1268 TInt error(KErrNone); |
1272 |
1269 |
1273 // Clear new-items array |
1270 // Clear new-items array |
1274 iNewItems->Reset(); |
1271 iNewItems->Reset(); |
1275 |
1272 |
1276 // Set current snapshot, this will be compared against the old one |
|
1277 // Search for new items |
1273 // Search for new items |
1278 TRAP( error, iChangeFinder->FindNewItemsL(*iNewItems) ) |
1274 TRAP( error, iChangeFinder->FindNewItemsL(*iNewItems) ) |
1279 if ( error != KErrNone ) |
1275 if ( error != KErrNone ) |
1280 { |
1276 { |
1281 LOGGER_WRITE_1("CMmsDataStore::DoAddedItems, iChangeFinder->FindNewItemsL leaved with %d.", error); |
1277 LOGGER_MSG_EC("CMmsDataStore::DoAddedItems, iChangeFinder->FindNewItemsL leaved with %d.", error); |
1282 } |
1278 } |
1283 |
1279 |
1284 LOGGER_WRITE_1("New item count: %d.", iNewItems->ItemCount()); |
1280 LOGGER_MSG_EC("New item count: %d.", iNewItems->ItemCount()); |
1285 LOGGER_LEAVEFN("CMmsDataStore::DoAddedItems"); |
1281 LOGGER_LEAVEFN("CMmsDataStore::DoAddedItems"); |
1286 |
1282 |
1287 return *iNewItems; |
1283 return *iNewItems; |
1288 } |
1284 } |
1289 |
1285 |
1308 |
1304 |
1309 // Search for deleted items |
1305 // Search for deleted items |
1310 TRAP( error, iChangeFinder->FindDeletedItemsL( *iDeletedItems ) ); |
1306 TRAP( error, iChangeFinder->FindDeletedItemsL( *iDeletedItems ) ); |
1311 if ( error != KErrNone ) |
1307 if ( error != KErrNone ) |
1312 { |
1308 { |
1313 LOGGER_WRITE_1("CMmsDataStore::DoDeletedItems, iChangeFinder->FindDeletedItemsL leaved with %d.", error); |
1309 LOGGER_MSG_EC("CMmsDataStore::DoDeletedItems, iChangeFinder->FindDeletedItemsL leaved with %d.", error); |
1314 } |
1310 } |
1315 |
1311 |
1316 LOGGER_WRITE_1("Deleted item count: %d.", iDeletedItems->ItemCount()); |
1312 LOGGER_MSG_EC("Deleted item count: %d.", iDeletedItems->ItemCount()); |
1317 LOGGER_LEAVEFN("CMmsDataStore::DoDeletedItemsL"); |
1313 LOGGER_LEAVEFN("CMmsDataStore::DoDeletedItemsL"); |
1318 return *iDeletedItems; |
1314 return *iDeletedItems; |
1319 } |
1315 } |
1320 |
1316 |
1321 // ----------------------------------------------------------------------------- |
1317 // ----------------------------------------------------------------------------- |
1352 |
1348 |
1353 // Search for updated items |
1349 // Search for updated items |
1354 TRAP( error, iChangeFinder->FindChangedItemsL( *iUpdatedItems ) ) |
1350 TRAP( error, iChangeFinder->FindChangedItemsL( *iUpdatedItems ) ) |
1355 if ( error != KErrNone ) |
1351 if ( error != KErrNone ) |
1356 { |
1352 { |
1357 LOGGER_WRITE_1("CMmsDataStore::DoModifiedItems, iChangeFinder->FindChangedItemsL leaved with %d.", error); |
1353 LOGGER_MSG_EC("CMmsDataStore::DoModifiedItems, iChangeFinder->FindChangedItemsL leaved with %d.", error); |
1358 } |
1354 } |
1359 |
1355 |
1360 LOGGER_WRITE_1("Modified item count: %d.", iUpdatedItems->ItemCount()); |
1356 LOGGER_MSG_EC("Modified item count: %d.", iUpdatedItems->ItemCount()); |
1361 LOGGER_LEAVEFN("CMmsDataStore::DoModifiedItems"); |
1357 LOGGER_LEAVEFN("CMmsDataStore::DoModifiedItems"); |
1362 return *iUpdatedItems; |
1358 return *iUpdatedItems; |
1363 } |
1359 } |
1364 |
1360 |
1365 // ----------------------------------------------------------------------------- |
1361 // ----------------------------------------------------------------------------- |
1383 |
1379 |
1384 // Search for moved items |
1380 // Search for moved items |
1385 TRAP( error, iChangeFinder->FindMovedItemsL( *iMovedItems ) ); |
1381 TRAP( error, iChangeFinder->FindMovedItemsL( *iMovedItems ) ); |
1386 if ( error != KErrNone ) |
1382 if ( error != KErrNone ) |
1387 { |
1383 { |
1388 LOGGER_WRITE_1("CMmsDataStore::DoMovedItems, iChangeFinder->FindMovedItemsL leaved with %d.", error); |
1384 LOGGER_MSG_EC("CMmsDataStore::DoMovedItems, iChangeFinder->FindMovedItemsL leaved with %d.", error); |
1389 } |
1385 } |
1390 |
1386 |
1391 LOGGER_WRITE_1("Moved item count: %d.", iMovedItems->ItemCount()); |
1387 LOGGER_MSG_EC("Moved item count: %d.", iMovedItems->ItemCount()); |
1392 LOGGER_LEAVEFN("CMmsDataStore::DoMovedItems"); |
1388 LOGGER_LEAVEFN("CMmsDataStore::DoMovedItems"); |
1393 return *iMovedItems; |
1389 return *iMovedItems; |
1394 } |
1390 } |
1395 |
1391 |
1396 // ----------------------------------------------------------------------------- |
1392 // ----------------------------------------------------------------------------- |
1759 if ( folderId != KMsvMyFoldersTemplatesFolderId ) |
1755 if ( folderId != KMsvMyFoldersTemplatesFolderId ) |
1760 { |
1756 { |
1761 error = DeleteAllMessagesInFolderL(folderId); |
1757 error = DeleteAllMessagesInFolderL(folderId); |
1762 if ( error != KErrNone ) |
1758 if ( error != KErrNone ) |
1763 { |
1759 { |
1764 LOGGER_WRITE_1("Deleting messages in folder failed with %d", error); |
1760 LOGGER_MSG_EC("Deleting messages in folder failed with %d", error); |
1765 result = error; |
1761 result = error; |
1766 } |
1762 } |
1767 error = iMsvApi->DeleteUserFolderL( folderId ); |
1763 error = iMsvApi->DeleteUserFolderL( folderId ); |
1768 if ( error != KErrNone && error != KErrInUse ) |
1764 if ( error != KErrNone && error != KErrInUse ) |
1769 { |
1765 { |
1770 // Note: folder is not deleted if contains other message items (like MMS) |
1766 // Note: folder is not deleted if contains other message items (like MMS) |
1771 // In this case DeleteUserFolderL returns KErrInUse. |
1767 // In this case DeleteUserFolderL returns KErrInUse. |
1772 LOGGER_WRITE_1("iMsvApi->DeleteUserFolderL failed with %d", error); |
1768 LOGGER_MSG_EC("iMsvApi->DeleteUserFolderL failed with %d", error); |
1773 result = error; |
1769 result = error; |
1774 } |
1770 } |
1775 } |
1771 } |
1776 } |
1772 } |
1777 |
1773 |