# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1266612458 -7200 # Node ID 1d7827e39b52f89845246fede632f2f5abdec0e0 # Parent 4697dfb2d7ad2252a461b3465ed001303baff8aa Revision: 201003 Kit: 201007 diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imap4mtm/group/messaging_email_imap.history.xml --- a/email/imap4mtm/group/messaging_email_imap.history.xml Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imap4mtm/group/messaging_email_imap.history.xml Fri Feb 19 22:47:38 2010 +0200 @@ -3,9 +3,12 @@ Message Type Module (MTM) plugin to Messaging Framework supporting send/receive/edit of IMAP4 email messages. - - - + + + Parsing the server response without [ ]. + + + Included missing header file. diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imap4mtm/group/messaging_email_imap.mrp --- a/email/imap4mtm/group/messaging_email_imap.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imap4mtm/group/messaging_email_imap.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_email_imap source \sf\app\messaging\email\imap4mtm diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imap4mtm/imapservermtm/test/group/bld.inf --- a/email/imap4mtm/imapservermtm/test/group/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imap4mtm/imapservermtm/test/group/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -67,28 +67,28 @@ ../script/t_unit_imapservermtm_not_busy.txt /epoc32/winscw/c/msgtest/scripts/imapunit/t_unit_imapservermtm_not_busy.txt ../script/t_unit_imapservermtm_synchronise_with_inbox_selected_script.txt /epoc32/winscw/c/msgtest/scripts/imapunit/t_unit_imapservermtm_synchronise_with_inbox_selected_script.txt -//..\script\t_unit_imapservermtm_cancelbackgsync.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_cancelbackgsync.txt -//..\script\t_unit_imapservermtm_batchoperation.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_batchoperation.txt -//..\script\t_unit_imapservermtm_busy.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_busy.txt -//..\script\t_unit_imapservermtm_select.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_select.txt -//..\script\t_unit_imapservermtm_synchronise.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_synchronise.txt -//..\script\t_unit_imapservermtm_synctree.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_synctree.txt -//..\script\t_unit_imapservermtm_fullsync.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_fullsync.txt -//..\script\t_unit_imapservermtm_localsubscribe.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_localsubscribe.txt -//..\script\t_unit_imapservermtm_localunsubscribe.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_localunsubscribe.txt -//..\script\t_unit_imapservermtm_folderfullsync.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_folderfullsync.txt -//..\script\t_unit_imapservermtm_waitforbackg.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_waitforbackg.txt -//..\script\t_unit_imapservermtm_renamefolder.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_renamefolder.txt -//..\script\t_unit_imapservermtm_undeleteall.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_undeleteall.txt -//..\script\t_unit_imapservermtm_cancelofflineop.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_cancelofflineop.txt -//..\script\t_unit_imapservermtm_populate.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_populate.txt -//..\script\t_unit_imapservermtm_unsupportedcmds.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_unsupportedcmds.txt -//..\script\t_unit_imapservermtm_copytolocal.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_copytolocal.txt -//..\script\t_unit_imapservermtm_copyfromlocal.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_copyfromlocal.txt -//..\script\t_unit_imapservermtm_copywithinservice.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_copywithinservice.txt -//..\script\t_unit_imapservermtm_movetolocal.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_movetolocal.txt -//..\script\t_unit_imapservermtm_movefromlocal.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_movefromlocal.txt -//..\script\t_unit_imapservermtm_movewithinservice.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_movewithinservice.txt -//..\script\t_unit_imapservermtm_deleteall.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_deleteall.txt -//..\script\t_unit_imapservermtm_create.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_create.txt -//..\script\t_unit_imapservermtm_change.txt \epoc32\winscw\c\msgtest\Scripts\ImapUnit\t_unit_imapservermtm_change.txt +//../script/t_unit_imapservermtm_cancelbackgsync.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_cancelbackgsync.txt +//../script/t_unit_imapservermtm_batchoperation.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_batchoperation.txt +//../script/t_unit_imapservermtm_busy.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_busy.txt +//../script/t_unit_imapservermtm_select.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_select.txt +//../script/t_unit_imapservermtm_synchronise.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_synchronise.txt +//../script/t_unit_imapservermtm_synctree.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_synctree.txt +//../script/t_unit_imapservermtm_fullsync.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_fullsync.txt +//../script/t_unit_imapservermtm_localsubscribe.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_localsubscribe.txt +//../script/t_unit_imapservermtm_localunsubscribe.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_localunsubscribe.txt +//../script/t_unit_imapservermtm_folderfullsync.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_folderfullsync.txt +//../script/t_unit_imapservermtm_waitforbackg.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_waitforbackg.txt +//../script/t_unit_imapservermtm_renamefolder.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_renamefolder.txt +//../script/t_unit_imapservermtm_undeleteall.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_undeleteall.txt +//../script/t_unit_imapservermtm_cancelofflineop.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_cancelofflineop.txt +//../script/t_unit_imapservermtm_populate.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_populate.txt +//../script/t_unit_imapservermtm_unsupportedcmds.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_unsupportedcmds.txt +//../script/t_unit_imapservermtm_copytolocal.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_copytolocal.txt +//../script/t_unit_imapservermtm_copyfromlocal.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_copyfromlocal.txt +//../script/t_unit_imapservermtm_copywithinservice.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_copywithinservice.txt +//../script/t_unit_imapservermtm_movetolocal.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_movetolocal.txt +//../script/t_unit_imapservermtm_movefromlocal.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_movefromlocal.txt +//../script/t_unit_imapservermtm_movewithinservice.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_movewithinservice.txt +//../script/t_unit_imapservermtm_deleteall.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_deleteall.txt +//../script/t_unit_imapservermtm_create.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_create.txt +//../script/t_unit_imapservermtm_change.txt /epoc32/winscw/c/msgtest/Scripts/ImapUnit/t_unit_imapservermtm_change.txt diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imap4mtm/imapservermtm/test/group/t_unit_imapservermtm_server.mmp --- a/email/imap4mtm/imapservermtm/test/group/t_unit_imapservermtm_server.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imap4mtm/imapservermtm/test/group/t_unit_imapservermtm_server.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -69,8 +69,8 @@ USERINCLUDE ../inc ../../../../pop3andsmtpmtm/clientmtms/inc USERINCLUDE ../../inc ../../../../pop3andsmtpmtm/servermtmutils/inc USERINCLUDE ../../../imapsettings/inc -//USERINCLUDE ..\..\..\imaptransporthandler\inc -//USERINCLUDE ..\..\..\imaputils\inc +//USERINCLUDE ../../../imaptransporthandler/inc +//USERINCLUDE ../../../imaputils/inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_ESTLIB_SYSTEMINCLUDE USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imap4mtm/imapsession/src/cimapcommand.cpp --- a/email/imap4mtm/imapsession/src/cimapcommand.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imap4mtm/imapsession/src/cimapcommand.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -935,12 +935,11 @@ __LOG_FORMAT((iLogId, "CImapCommand::GetResponseTextCodeL() - Found %S", &response)); } - else - { - __LOG_TEXT(iLogId, "CImapCommand::GetResponseTextCodeL() - Not Found"); - response.Set(KNullDesC8); - } - + + //Case where there is no [ ] for Server Response from servers like tuukka + //(ie) * OK PERMANENTFLAGS (\seen \answered \flagged \deleted \draft \priority) + //we would be returning iUnparsedData, without editing the data + return response; } diff -r 4697dfb2d7ad -r 1d7827e39b52 email/imum/Utils/Data/ImumUtils.rss --- a/email/imum/Utils/Data/ImumUtils.rss Tue Feb 02 00:08:43 2010 +0200 +++ b/email/imum/Utils/Data/ImumUtils.rss Fri Feb 19 22:47:38 2010 +0200 @@ -46,4 +46,5 @@ #include "../Data/ImumCommonDialogs.ra" #include "../Data/ImumFolderSubscription.ra" #include "../Data/ImumMailSettings.ra" -#include "../Data/ImumMailWizard.ra" \ No newline at end of file +#include "../Data/ImumMailWizard.ra" +// End of File diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/clientmtms/group/IMCMCOPY.mmp --- a/email/pop3andsmtpmtm/clientmtms/group/IMCMCOPY.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/clientmtms/group/IMCMCOPY.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -11,27 +11,27 @@ // Contributors: // // Description: -// MMP file for the IMCM copy which sits in system\libs. +// MMP file for the IMCM copy which sits in system/libs. // This is necessary due to the dll requiring to be loaded both // dynamically and implicitly, combined with VC6's pernickity // insistence on finding the exact .PDB file specified within // the DLL. -// Since this is only required for WINS\UDEB builds, BLD.INF only +// Since this is only required for WINS/UDEB builds, BLD.INF only // invokes this MMP for WINS builds. // // TARGET imcmcopy.dll -TARGETPATH \system\libs +TARGETPATH /system/libs TARGETTYPE dll CAPABILITY All -TCB UID 0x10003C5F 0x10004839 VENDORID 0x70000001 -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE imcmmain.cpp miuthdr.cpp miutpars.cpp miutset.cpp pop3set.cpp smtpset.cpp imapset.cpp ssmtpset.cpp miutlog.cpp miutatch.cpp offop.cpp miutmsg.cpp popcmtm.cpp smtcmtm.cpp miutconv.cpp -USERINCLUDE ..\inc -SYSTEMINCLUDE \epoc32\include +USERINCLUDE ../inc +SYSTEMINCLUDE /epoc32/include LIBRARY euser.lib estor.lib bafl.lib efsrv.lib etext.lib msgs.lib charconv.lib SMPSAFE diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP --- a/email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/clientmtms/src/MIUTMSG.CPP Fri Feb 19 22:47:38 2010 +0200 @@ -6925,6 +6925,11 @@ attachment->SetSize(iSize); file.Close(); TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); + if(filename.Length() == 0) + { + User::Leave(KErrArgument); + } + attachment->SetAttachmentNameL(filename); CleanupStack::Pop(attachment); // ownership passed to attachment manager @@ -6939,6 +6944,11 @@ TMsvEmailEntry emailEntry = iMsvEntry.Entry(); TFileName filename = HtmlFilename(iMsvEntry, GetDefaultAttachmentName()); + if(filename.Length() == 0) + { + User::Leave(KErrArgument); + } + emailEntry.iDetails.Set(filename); emailEntry.iSize = iSize; return iMsvEntry.ChangeL(emailEntry, aStatus); @@ -6946,8 +6956,9 @@ TFileName CImHtmlConverter::HtmlFilename(CMsvEntry& aEntry, TPtrC aFileName) { - TFileName path; TFileName name; + name.Zero(); + TMsvEntry entry = aEntry.Entry(); // this is not used at all , need to get rid of this if (entry.iDetails.Length()) diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/clientmtms/test/group/T_imcm04.mmp --- a/email/pop3andsmtpmtm/clientmtms/test/group/T_imcm04.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/clientmtms/test/group/T_imcm04.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -18,9 +18,9 @@ CAPABILITY All -TCB UID 0x1000007A 0x10274054 -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE T_IMCM04.CPP -USERINCLUDE ..\..\inc ..\inc +USERINCLUDE ../../inc ../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/clientmtms/test/testrom/bld.inf --- a/email/pop3andsmtpmtm/clientmtms/test/testrom/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/clientmtms/test/testrom/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_imcm_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_imcm_prepare_for_test.bat -t_imcm_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_imcm_prepare_for_test.bat -t_imcm.iby \epoc32\rom\include\t_imcm.iby +t_imcm_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_imcm_prepare_for_test.bat +t_imcm_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_imcm_prepare_for_test.bat +t_imcm.iby /epoc32/rom/include/t_imcm.iby diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/group/messaging_email.history.xml --- a/email/pop3andsmtpmtm/group/messaging_email.history.xml Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/group/messaging_email.history.xml Fri Feb 19 22:47:38 2010 +0200 @@ -4,6 +4,14 @@ Message Type Module (MTM) plugin to Messaging Framework supporting send/receive/edit of POP3 email messages. + + Restricting the field size of the header to 5000, to avoid DOS condition. + + + + Handling error condtion, if filename buffer is empty. + + Updated mmp files. diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/group/messaging_email.mrp --- a/email/pop3andsmtpmtm/group/messaging_email.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/group/messaging_email.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_email # everything except imapservermtm and imap diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_POPSECURESOCKETS.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_POPSECURESOCKETS.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_POPSECURESOCKETS.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -31,7 +31,7 @@ USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_PopFullDsk.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_PopFullDsk.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_PopFullDsk.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -23,8 +23,8 @@ SOURCE T_PopFullDsk.cpp T_mtmcmd.cpp USERINCLUDE ../inc USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\inc -USERINCLUDE ..\..\inc +USERINCLUDE ../inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_pops4.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_pops4.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_pops4.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -23,7 +23,7 @@ SOURCE T_pops4.cpp USERINCLUDE ../inc ../../../../pop3andsmtpmtm/clientmtms/inc USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_pops5.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_pops5.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_pops5.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -31,7 +31,7 @@ USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_pops6.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_pops6.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_pops6.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -23,7 +23,7 @@ USERINCLUDE ../inc USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_popsCancelProgress.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_popsCancelProgress.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_popsCancelProgress.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -23,7 +23,7 @@ USERINCLUDE ../inc USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/group/T_pops_synchronise.mmp --- a/email/pop3andsmtpmtm/popservermtm/test/group/T_pops_synchronise.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/group/T_pops_synchronise.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -31,7 +31,7 @@ USERINCLUDE ../../../../pop3andsmtpmtm/servermtmutils/inc ../../../../pop3andsmtpmtm/clientmtms/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/popservermtm/test/testrom/bld.inf --- a/email/pop3andsmtpmtm/popservermtm/test/testrom/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/popservermtm/test/testrom/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_pops_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_pops_prepare_for_test.bat -t_pops_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_pops_prepare_for_test.bat -t_pops.iby \epoc32\rom\include\t_pops.iby +t_pops_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_pops_prepare_for_test.bat +t_pops_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_pops_prepare_for_test.bat +t_pops.iby /epoc32/rom/include/t_pops.iby diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp --- a/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -254,11 +254,16 @@ // Folding headers, RFC 2822, section 2.2.3 { // make sure we're not about to exceed the buffer - if((iOutputLine->Length() + iInputLine.Length()) > iOutputLine->Des().MaxLength()) - iOutputLine = iOutputLine->ReAllocL(iOutputLine->Length() + iInputLine.Length()); - - // now copy the remaining data into the buffer - iOutputLine->Des().Append(iInputLine); + //Restricting the field size of the header to 5000, to avoid -4 error + //and which at times ends up in DOS condition [denial of service- user wouldn't be able to download any further mails]. + if (iOutputLine->Length()<5000) + { + if((iOutputLine->Length() + iInputLine.Length()) > iOutputLine->Des().MaxLength()) + iOutputLine = iOutputLine->ReAllocL(iOutputLine->Length() + iInputLine.Length()); + + // now copy the remaining data into the buffer + iOutputLine->Des().Append(iInputLine); + } } } else diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/servermtmutils/test/group/T_IMSK01.mmp --- a/email/pop3andsmtpmtm/servermtmutils/test/group/T_IMSK01.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/servermtmutils/test/group/T_IMSK01.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -17,9 +17,9 @@ TARGETTYPE exe CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE t_imsk01.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib imut.lib EmailTestUtils.lib MsvTestUtils.lib imcm.lib VENDORID 0x70000001 diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/servermtmutils/test/testrom/bld.inf --- a/email/pop3andsmtpmtm/servermtmutils/test/testrom/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/servermtmutils/test/testrom/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_imut_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_imut_prepare_for_test.bat -t_imut_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_imut_prepare_for_test.bat -t_imut.iby \epoc32\rom\include\t_imut.iby +t_imut_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_imut_prepare_for_test.bat +t_imut_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_imut_prepare_for_test.bat +t_imut.iby /epoc32/rom/include/t_imut.iby diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS01.mmp --- a/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS01.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS01.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -21,7 +21,7 @@ SOURCEPATH ../src SOURCE t_smts01.cpp -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS02.mmp --- a/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS02.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTS02.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -20,7 +20,7 @@ CAPABILITY NetworkServices LocalServices ReadUserData ReadDeviceData WriteDeviceData NetworkControl ProtServ SOURCEPATH ../src SOURCE t_smts02.cpp -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTSSECURESOCKETS.mmp --- a/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTSSECURESOCKETS.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/group/T_SMTSSECURESOCKETS.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -21,7 +21,7 @@ CAPABILITY NetworkServices LocalServices ReadUserData ReadDeviceData WriteDeviceData NetworkControl ProtServ SOURCEPATH ../src SOURCE T_SMTSSECURESOCKETS.cpp -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/group/T_smts00.mmp --- a/email/pop3andsmtpmtm/smtpservermtm/test/group/T_smts00.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/group/T_smts00.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -22,7 +22,7 @@ SOURCEPATH ../src SOURCE t_smts00.cpp -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/group/t_smtssmtpauth.mmp --- a/email/pop3andsmtpmtm/smtpservermtm/test/group/t_smtssmtpauth.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/group/t_smtssmtpauth.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -22,7 +22,7 @@ SOURCEPATH ../src SOURCE t_smtssmtpauth.cpp USERINCLUDE ../../../../pop3andsmtpmtm/clientmtms/inc ../../../../pop3andsmtpmtm/servermtmutils/inc -USERINCLUDE ..\..\inc +USERINCLUDE ../../inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgsrvnstore/server/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc USERINCLUDE ../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/email/inc diff -r 4697dfb2d7ad -r 1d7827e39b52 email/pop3andsmtpmtm/smtpservermtm/test/testrom/bld.inf --- a/email/pop3andsmtpmtm/smtpservermtm/test/testrom/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/email/pop3andsmtpmtm/smtpservermtm/test/testrom/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_smts_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_smts_prepare_for_test.bat -t_smts_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_smts_prepare_for_test.bat -t_smts.iby \epoc32\rom\include\t_smts.iby +t_smts_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_smts_prepare_for_test.bat +t_smts_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_smts_prepare_for_test.bat +t_smts.iby /epoc32/rom/include/t_smts.iby diff -r 4697dfb2d7ad -r 1d7827e39b52 messaging_info/messaging_metadata/messaging_metadata.mrp --- a/messaging_info/messaging_metadata/messaging_metadata.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/messaging_info/messaging_metadata/messaging_metadata.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_metadata source \sf\app\messaging\messaging_info\messaging_metadata source \sf\app\messaging\package_definition.xml diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/mce/src/MceMessageListView.cpp --- a/messagingappbase/mce/src/MceMessageListView.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/mce/src/MceMessageListView.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -2539,7 +2539,26 @@ == KErrNone ) { iMsgListContainer->ClearSelection(); - SetFolderL( aNewFolderId ); + + if ((oldId == KMsvGlobalOutBoxIndexEntryId) || (aNewFolderId == KMsvGlobalOutBoxIndexEntryId)) + { + iFolderId = aNewFolderId; + iMsgListContainer->MakeVisible(EFalse); + AppUi()->RemoveFromStack(iMsgListContainer); + delete iMsgListContainer; + iMsgListContainer = NULL; + CreateListboxL(); + iMsgListContainer->SetRect(ClientRect()); + AppUi()->AddToStackL( *this,iMsgListContainer ); + iMsgListContainer->ActivateL(); + iMsgListContainer->MakeVisible(ETrue); + iMsgListContainer->SetFolderL( iFolderId ); + } + else + { + SetFolderL( aNewFolderId ); + } + TUid mtm = iMsgListContainer->FolderEntry().iMtm; if ( mtm == KSenduiMtmImap4Uid ) { diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/mce/src/mceui.cpp --- a/messagingappbase/mce/src/mceui.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/mce/src/mceui.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -470,7 +470,8 @@ } iMsgDeletedStatus = EFalse; iServerStarted = EFalse ; - + iEmailNotifHandler = NULL; +#ifndef __WINSCW__ // Handling of NCN reset TRAPD( err, iEmailNotifHandler = CMceEmailNotifHandler::NewL() ); MCELOGGER_WRITE_FORMAT("ConstructL iEmailNotifHandler err %d", err); @@ -478,7 +479,7 @@ { iEmailNotifHandler = NULL; } - +#endif ZoomLevelChangedL( ReadZoomLevelL() ); iEmailApi = CreateEmailApiL( iSession ); @@ -4892,8 +4893,8 @@ CMsvEntrySelection* sel = iMceListView->ListContainer() ->CurrentItemSelectionL(); CleanupStack::PushL( sel ); - - if ( sel->Count() <= 0 ) + TInt selCount = sel->Count(); + if ( selCount <= 0 ) { CleanupStack::PopAndDestroy( 2 ); // singleOpWatcher, sel return; @@ -4922,6 +4923,10 @@ type, *iSession, op->RequestStatus(), sel ); op->SetOperationL( subOp ); // this takes ownership immediately, so no cleanupstack needed. + if ( selCount == 1 ) + { + op->MakeProgressVisibleL(EFalse); + } op->SetProgressDecoder( *subOp ); CleanupStack::Pop( op ); @@ -5504,14 +5509,17 @@ if ( iMceMainView->ListContainer() ) // Cannot set roaming if ListContainer is empty { - // Set roaming status - iMceMainView->ListContainer()->ListItems()->SetRoaming( - event->RegistrationStatus() == ENetworkRegistrationRoaming ); + CMceMainViewListItemArray* array = iMceMainView->ListContainer()->ListItems(); + if ( array && (array->Count() > 0) ) // List item array should not be empty + { + // Set roaming status + array->SetRoaming( event->RegistrationStatus() == ENetworkRegistrationRoaming ); - if ( MceViewActive( EMceMainViewActive ) ) - { - //update icon only if main view is open - iMceMainView->ListContainer()->DrawDeferred(); + if ( MceViewActive( EMceMainViewActive ) ) + { + //update icon only if main view is open + iMceMainView->ListContainer()->DrawDeferred(); + } } } } diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/msgavkon/conf/messaging.confml Binary file messagingappbase/msgavkon/conf/messaging.confml has changed diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/msgavkon/muiu_internal/data/muiu_internal.rss --- a/messagingappbase/msgavkon/muiu_internal/data/muiu_internal.rss Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/msgavkon/muiu_internal/data/muiu_internal.rss Fri Feb 19 22:47:38 2010 +0200 @@ -30,6 +30,7 @@ #include #include //qtn_find_number_call_send_key; qtn_find_call_to_sender #include +#include @@ -203,6 +204,7 @@ // RESOURCE TBUF r_muiu_qtn_phob_note_no_number { buf = qtn_phob_note_no_number; } +RESOURCE TBUF r_muiu__mce_settings_sms_conversion { buf = qtn_mce_settings_sms_conversion; } // End of File diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/msgavkon/muiu_internal/inc/MessagingInternalPSKeys.h --- a/messagingappbase/msgavkon/muiu_internal/inc/MessagingInternalPSKeys.h Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/msgavkon/muiu_internal/inc/MessagingInternalPSKeys.h Fri Feb 19 22:47:38 2010 +0200 @@ -40,6 +40,10 @@ const TUint32 KMceTemplatesDialog = 0x00000003; // The New PSK introduced from 5.0 +// Tells whether Msg Sent as settings to be removed from Text settings view +const TUint32 KMuiuRemoveMsgSentSettings = 0x00000004; + +// The New PSK introduced from 5.0 const TUid KPSUidMsgEditor = {0x101F87FF}; diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/msgavkon/muiu_internal/settingsarray/inc/MuiuSettingsArray.h --- a/messagingappbase/msgavkon/muiu_internal/settingsarray/inc/MuiuSettingsArray.h Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/msgavkon/muiu_internal/settingsarray/inc/MuiuSettingsArray.h Fri Feb 19 22:47:38 2010 +0200 @@ -119,6 +119,11 @@ * Opens Sc number edit setting page */ TBool HandleEditScNumberL( TInt aIndex ); + + /* + * Check if the read string is "Message sent as" + */ + TBool IsMessageSentStringL( HBufC* aString ); protected: /* diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/msgavkon/muiu_internal/settingsarray/src/MuiuSettingsArray.cpp --- a/messagingappbase/msgavkon/muiu_internal/settingsarray/src/MuiuSettingsArray.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/msgavkon/muiu_internal/settingsarray/src/MuiuSettingsArray.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -29,6 +29,9 @@ #include #include #include "MuiuSettingsArray.h" +#include +#include +#include // CONSTANTS const TInt KMuiuSettingsArrayGranularity = 4; @@ -106,6 +109,10 @@ item.iType = EMuiuSettingsUnknown; HBufC* txt = reader.ReadHBufCL(); // message text item.iLabelText.Copy( *txt ); + TBool flag = EFalse; + //If string retrived from resource is "Message sent as" + flag = IsMessageSentStringL( txt ); + delete txt; const TMuiuSettingsType type = ( TMuiuSettingsType ) reader.ReadInt16(); @@ -136,6 +143,7 @@ } CleanupStack::PopAndDestroy(); //reader2 item.iMuiuSettingsItemArray = array; + if(!flag) AppendL( item ); CleanupStack::Pop( array ); //array } @@ -435,4 +443,25 @@ return tempText; } +// --------------------------------------------------------- +// CMuiuSettingsArray::IsMessageSentStringL +// --------------------------------------------------------- +// +TBool CMuiuSettingsArray::IsMessageSentStringL(HBufC* aString) + { + TInt flag = EFalse; + HBufC* string = StringLoader::LoadLC( R_MUIU__MCE_SETTINGS_SMS_CONVERSION); + if (aString->Compare(string->Des()) == 0) + { + TInt val = 0; + TInt ret = RProperty::Get( KPSUidMuiu, KMuiuRemoveMsgSentSettings, val ); + if ( ret == KErrNone && val != 0 ) + { + flag = ETrue; + RProperty::Set( KPSUidMuiu, KMuiuRemoveMsgSentSettings, 0) ; + } + } + CleanupStack::PopAndDestroy( string ); + return flag; + } // End of File diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/Group/messaging_obex.mrp --- a/messagingappbase/obexmtms/Group/messaging_obex.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/Group/messaging_obex.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_obex source \sf\app\messaging\messagingappbase\obexmtms binary \sf\app\messaging\messagingappbase\obexmtms\Group all diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/agent/SdpagentStub.mmp --- a/messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/agent/SdpagentStub.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/agent/SdpagentStub.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -28,8 +28,8 @@ SOURCE ProtocolWrapper.cpp SOURCE engine.cpp -USERINCLUDE . ..\inc ..\..\inc -SYSTEMINCLUDE \epoc32\include +USERINCLUDE . ../inc ../../inc +SYSTEMINCLUDE /epoc32/include LIBRARY euser.lib LIBRARY esock.lib LIBRARY bluetooth.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/bld.inf --- a/messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/TObexMTM/obexstub/BluetoothSdpStub/sdp/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -20,10 +20,10 @@ PRJ_MMPFILES PRJ_TESTEXPORTS -//inc\btsdp.h -//inc\btsdp.inl +//inc/btsdp.h +//inc/btsdp.inl PRJ_TESTMMPFILES -agent\sdpagentstub.mmp -//test\tsdpdb.mmp -//test\tsdpag.mmp +agent/sdpagentstub.mmp +//test/tsdpdb.mmp +//test/tsdpag.mmp diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/BLD.INF --- a/messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -21,13 +21,13 @@ PRJ_TESTEXPORTS //this code builds against the binary interface of irobex //for it to build successfully, -//the relative path to master\common\generic\infra-red\.... must be changed to match your +//the relative path to master/common/generic/infra-red/.... must be changed to match your //respective perforce client spec. setting -..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\inc\ir_sock.h -..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\inc\ir_sock.inl -..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\inc\obex.h -..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\inc\obex.inl +../../../../../../../../../master/common/generic/infra-red/irda/inc/ir_sock.h +../../../../../../../../../master/common/generic/infra-red/irda/inc/ir_sock.inl +../../../../../../../../../master/common/generic/infra-red/irda/inc/obex.h +../../../../../../../../../master/common/generic/infra-red/irda/inc/obex.inl PRJ_TESTMMPFILES -..\group\irobexstub.mmp // Bluetooth and IrDA OBEX, using OBEX STUB +../group/irobexstub.mmp // Bluetooth and IrDA OBEX, using OBEX STUB diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/irobexstub.mmp --- a/messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/irobexstub.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/TObexMTM/obexstub/IrobexStub/group/irobexstub.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -34,26 +34,26 @@ //this code builds against the binary interface of irobex //for it to build successfully, -//the relative path to master\common\generic\infra-red\.... must be changed to match your +//the relative path to master/common/generic/infra-red/.... must be changed to match your //respective perforce client spec. setting -DEFFILE ..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\bwins\irobex2.def -//DEFFILE ..\..\..\..\..\..\..\infra-red\irda\bwins\irobex2.def +DEFFILE ../../../../../../../../../master/common/generic/infra-red/irda/bwins/irobex2.def +//DEFFILE ../../../../../../../infra-red/irda/bwins/irobex2.def #else -DEFFILE ..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\bmarm\irobex2.def +DEFFILE ../../../../../../../../../master/common/generic/infra-red/irda/bmarm/irobex2.def #endif // Source files modified by the stub -SOURCEPATH ..\irobex +SOURCEPATH ../irobex SOURCE obex.cpp SOURCE obex_client.cpp SOURCE obex_server.cpp // Source files for exsiting irobex.dll -SOURCEPATH ..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\irobex +SOURCEPATH ../../../../../../../../../master/common/generic/infra-red/irda/irobex SOURCE obexobjectexpandedbaseobject.cpp SOURCE obexheader.cpp SOURCE obexheaderset.cpp @@ -71,18 +71,18 @@ SOURCE usbconn.cpp // Source files for the obex header utils class, used by the stub and t_obexmtm test harness -SOURCEPATH ..\..\..\testutils\headerutils\src +SOURCEPATH ../../../testutils/headerutils/src SOURCE cobextestbaseheaderlist.cpp SOURCE cobextestheaderlist.cpp -USERINCLUDE ..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\irobex -USERINCLUDE ..\..\..\..\..\..\..\..\..\master\common\generic\infra-red\irda\inc -USERINCLUDE ..\..\..\inc -USERINCLUDE ..\..\..\testutils\msgth\inc -USERINCLUDE ..\..\..\testutils\headerutils\inc +USERINCLUDE ../../../../../../../../../master/common/generic/infra-red/irda/irobex +USERINCLUDE ../../../../../../../../../master/common/generic/infra-red/irda/inc +USERINCLUDE ../../../inc +USERINCLUDE ../../../testutils/msgth/inc +USERINCLUDE ../../../testutils/headerutils/inc -SYSTEMINCLUDE \epoc32\include +SYSTEMINCLUDE /epoc32/include LIBRARY euser.lib LIBRARY efsrv.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/TObexMTM/testutils/msgth/group/msgth.mmp --- a/messagingappbase/obexmtms/TObexMTM/testutils/msgth/group/msgth.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/TObexMTM/testutils/msgth/group/msgth.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -19,9 +19,9 @@ CAPABILITY All -TCB UID 0x1000008d 0x1000cafe VENDORID 0x70000001 -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE harness.cpp commands.cpp parsers.cpp testframeparse.cpp testframeutils.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc USERINCLUDE ../../../../../../../../mw/messagingmw/messagingfw/msgtest/testutils/base/inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_ESTLIB_SYSTEMINCLUDE diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/btmtm/btclient/group/BLD.INF --- a/messagingappbase/obexmtms/btmtm/btclient/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/btmtm/btclient/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -25,10 +25,10 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../Include/btcmtm.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(btcmtm.h) -//..\include\btmsgtypeuid.h <- exported by the generic mtm build process. +//../include/btmsgtypeuid.h <- exported by the generic mtm build process. ../Include/btHeader.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(btheader.h) #ifndef SYMBIAN_ENABLE_SPLIT_HEADERS #ifdef SYMBIAN_OLD_EXPORT_LOCATION diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/btmtm/btserver/group/BLD.INF --- a/messagingappbase/obexmtms/btmtm/btserver/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/btmtm/btserver/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -26,7 +26,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/irmtm/irclient/group/BLD.INF --- a/messagingappbase/obexmtms/irmtm/irclient/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/irmtm/irclient/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -26,7 +26,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../include/IRCMTM.H SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(ircmtm.h) ../include/irHeader.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(irheader.h) diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/irmtm/irserver/group/BLD.INF --- a/messagingappbase/obexmtms/irmtm/irserver/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/irmtm/irserver/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -26,7 +26,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include #ifdef SYMBIAN_OLD_EXPORT_LOCATION ../include/IRS.H /epoc32/include/irs.h diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/obexmtm/obexclient/group/BLD.INF --- a/messagingappbase/obexmtms/obexmtm/obexclient/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/obexmtm/obexclient/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -22,7 +22,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../include/obexClientMtm.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(obexclientmtm.h) diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/obexmtm/obexserver/group/BLD.INF --- a/messagingappbase/obexmtms/obexmtm/obexserver/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/obexmtm/obexserver/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -22,7 +22,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../include/obexSendOp.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(obexsendop.h) ../include/obexServerMtm.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(obexservermtm.h) diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/obexmtms/obexmtm/obexutil/group/BLD.INF --- a/messagingappbase/obexmtms/obexmtm/obexutil/group/BLD.INF Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/obexmtms/obexmtm/obexutil/group/BLD.INF Fri Feb 19 22:47:38 2010 +0200 @@ -17,7 +17,7 @@ // specify the source file followed by its destination here // copy will be used to copy the source file to its destination // If there's no destination then the source file will be copied -// to the same name in \epoc32\include +// to the same name in /epoc32/include ../include/obexHeader.h SYMBIAN_APP_LAYER_PLATFORM_EXPORT_PATH(obexheader.h) ../include/obexHeaderList.h SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(obexheaderlist.h) diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/smartmessaging/ringbc/src/RingingToneBioControl.cpp --- a/messagingappbase/smartmessaging/ringbc/src/RingingToneBioControl.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/smartmessaging/ringbc/src/RingingToneBioControl.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -228,7 +228,8 @@ // if playing, do not show context sensitive menu. if ( iPlayerState != EMsgAsyncControlStatePlaying ) { - AddMenuItemL(aMenuPane, R_SM_PLAYBACK, ERingtPlayback, EFirstMenuItem); + //removing the playback option from options menu, single click will do the playing + //AddMenuItemL(aMenuPane, R_SM_PLAYBACK, ERingtPlayback, EFirstMenuItem); AddMenuItemL(aMenuPane, R_SM_ADD_COMPOSER, ERingtAddComposer, ESecondMenuItem); } @@ -1178,45 +1179,41 @@ #ifdef RD_SCALABLE_UI_V2 void CRingingToneBioControl::HandlePointerEventL( const TPointerEvent& aPointerEvent ) { + + if ( AknLayoutUtils::PenEnabled() ) { switch ( aPointerEvent.iType ) { case TPointerEvent::EButton1Down: { - TBool hitted = iAudioControl->HitRegionContains( - aPointerEvent.iPosition, *this ); + //nothing to do here + } + break; + case TPointerEvent::EButton1Up: + { + TBool hitted = iAudioControl->HitRegionContains( aPointerEvent.iPosition, *this ); if( hitted ) - { - if( !iAudioControl->IsFocused() ) - { - //stylus touch to audio control sets it focused - iAudioControl->SetFocus( IsFocused() ); - } - else if ( iPlayerState != EMsgAsyncControlStatePlaying && iAudioControl->IsFocused() ) - { - //playback is triggered when focused control is touched with stylus - PlaybackL(); - } - else if ( iPlayerState == EMsgAsyncControlStatePlaying && iAudioControl->IsFocused() ) - { - //stylus hit to audio control when playback is in - //progress stops the playing - StopPlayback(); - } + { + if ( iPlayerState != EMsgAsyncControlStatePlaying ) + { + //playback is triggered when focused control is touched with stylus + iAudioControl->SetFocus(EFalse); + PlaybackL(); + } + else if ( iPlayerState == EMsgAsyncControlStatePlaying ) + { + //stylus hit to audio control when playback is in + //progress stops the playing + StopPlayback(); + } } - else if ( iAudioControl->IsFocused() ) - { - //hitting anywhere else than the control removes the focus from it - iAudioControl->SetFocus( EFalse ); - } - break; } + break; default: break; } } - } #else void CRingingToneBioControl::HandlePointerEventL( const TPointerEvent& /*aPointerEvent*/ ) diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/smilparser/GROUP/messaging_gmxml.mrp --- a/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/smilparser/GROUP/messaging_gmxml.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_gmxml source \sf\app\messaging\messagingappbase\smilparser binary \sf\app\messaging\messagingappbase\smilparser\GROUP all diff -r 4697dfb2d7ad -r 1d7827e39b52 messagingappbase/smilparser/SMILdtd/GROUP/t_smil_dom.mmp --- a/messagingappbase/smilparser/SMILdtd/GROUP/t_smil_dom.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/messagingappbase/smilparser/SMILdtd/GROUP/t_smil_dom.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -20,8 +20,8 @@ CAPABILITY All -TCB UID 0 VENDORID 0x70000001 -SOURCEPATH ..\tsrc -USERINCLUDE ..\tinc +SOURCEPATH ../tsrc +USERINCLUDE ../tinc APP_LAYER_SYSTEMINCLUDE_SYMBIAN OS_LAYER_ESTLIB_SYSTEMINCLUDE SOURCE t_SmilDom.cpp t_TestScript.cpp t_ScriptRunner.cpp t_LogFileWriter.cpp diff -r 4697dfb2d7ad -r 1d7827e39b52 mmsengine/mmsconf/messaging_mmssettings-config.history.xml --- a/mmsengine/mmsconf/messaging_mmssettings-config.history.xml Tue Feb 02 00:08:43 2010 +0200 +++ b/mmsengine/mmsconf/messaging_mmssettings-config.history.xml Fri Feb 19 22:47:38 2010 +0200 @@ -3,6 +3,10 @@ + + version attribute is changed to 1 from mmssettings_10202d4c.crml file + + messaging_mmssettings-config is made a new component under mmsengine. diff -r 4697dfb2d7ad -r 1d7827e39b52 mmsengine/mmsconf/messaging_mmssettings-config.mrp --- a/mmsengine/mmsconf/messaging_mmssettings-config.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/mmsengine/mmsconf/messaging_mmssettings-config.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_mmssettings-config # configuration files - source in is messaging_mmssettings, and diff -r 4697dfb2d7ad -r 1d7827e39b52 mmsengine/mmsconf/mmssettings_10202d4c.crml Binary file mmsengine/mmsconf/mmssettings_10202d4c.crml has changed diff -r 4697dfb2d7ad -r 1d7827e39b52 mmsengine/mmssettings/group/messaging_mmssettings.mrp --- a/mmsengine/mmssettings/group/messaging_mmssettings.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/mmsengine/mmssettings/group/messaging_mmssettings.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_mmssettings source \sf\app\messaging\mmsengine\mmssettings\bwins diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp --- a/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -2818,17 +2818,32 @@ { TPointerEvent* pointerEvent = static_cast( aArg2 ); CMsgBaseControl* baseControl = static_cast( aArg1 ); - if(iLongTapDetector) - { - iLongTapDetector->EnableLongTapAnimation(ETrue); - iLongTapDetector->PointerEventL( *pointerEvent ); - } + if ( pointerEvent && pointerEvent->iType == TPointerEvent::EButton1Down ) { // We are looking for a valid tap (button down and up) // on a focused object. iPointerTarget = baseControl; + + if(baseControl && (iMskId == R_MMSVIEWER_MSK_BUTTON_PLAY_PRESENTATION + || iMskId == R_MMSVIEWER_MSK_BUTTON_PLAY_AUDIO + || iMskId ==R_MMSVIEWER_MSK_BUTTON_OPEN_IMAGE + || iMskId ==R_MMSVIEWER_MSK_BUTTON_PLAY_VIDEO + || iMskId ==R_MMSVIEWER_MSK_BUTTON_STOP_AUDIO + || iMskId ==R_MMSVIEWER_MSK_BUTTON_STOP_VIDEO + || iMskId ==R_MMSVIEWER_MSK_BUTTON_OPEN_OBJECTS +#ifdef RD_SVGT_IN_MESSAGING + || iMskId ==R_MMSVIEWER_MSK_BUTTON_PLAY_SVG) +#endif + ) + { + if(iLongTapDetector) + { + iLongTapDetector->EnableLongTapAnimation(ETrue); + iLongTapDetector->PointerEventL( *pointerEvent ); + } + } iTapConsumed = EFalse; } else if ( (!iTapConsumed) && (pointerEvent diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/clientmtm/bwins/V2_SMCMU.DEF --- a/mobilemessaging/smsmtm/clientmtm/bwins/V2_SMCMU.DEF Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/clientmtm/bwins/V2_SMCMU.DEF Fri Feb 19 22:47:38 2010 +0200 @@ -266,4 +266,5 @@ ?PopulateMsgEntry@TSmsUtilities@@SAXAAVTMsvEntry@@ABVCSmsMessage@@JABVCSmsSettings@@VTUid@@@Z @ 265 NONAME ; void TSmsUtilities::PopulateMsgEntry(class TMsvEntry &, class CSmsMessage const &, long, class CSmsSettings const &, class TUid) ?Extension_@CSmsClientMtm@@MAEHIAAPAXPAX@Z @ 266 NONAME ; int CSmsClientMtm::Extension_(unsigned int, void * &, void *) ?SaveMessageL@CSmsClientMtm@@QAEXAAVCMsvStore@@AAVTMsvEntry@@@Z @ 267 NONAME ; void CSmsClientMtm::SaveMessageL(class CMsvStore &, class TMsvEntry &) + ?CreateMessageL@CSmsClientMtm@@QAEXAAVTMsvEntry@@@Z @ 268 NONAME ; void CSmsClientMtm::CreateMessageL(class TMsvEntry &) diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/clientmtm/eabi/v2_smcmu.def --- a/mobilemessaging/smsmtm/clientmtm/eabi/v2_smcmu.def Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/clientmtm/eabi/v2_smcmu.def Fri Feb 19 22:47:38 2010 +0200 @@ -289,4 +289,5 @@ _ZN13TSmsUtilities16PopulateMsgEntryER9TMsvEntryRK11CSmsMessagelRK12CSmsSettings4TUid @ 288 NONAME _ZN13CSmsClientMtm10Extension_EjRPvS0_ @ 289 NONAME _ZN13CSmsClientMtm12SaveMessageLER9CMsvStoreR9TMsvEntry @ 290 NONAME + _ZN13CSmsClientMtm14CreateMessageLER9TMsvEntry @ 291 NONAME diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/clientmtm/inc/SMSCLNT.H --- a/mobilemessaging/smsmtm/clientmtm/inc/SMSCLNT.H Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/clientmtm/inc/SMSCLNT.H Fri Feb 19 22:47:38 2010 +0200 @@ -77,7 +77,7 @@ IMPORT_C CSmsSimParamOperation* ReadSimParamsL(TRequestStatus& aObserverRequestStatus); IMPORT_C CSmsSimParamOperation* WriteSimParamsL(const CMobilePhoneSmspList& aList, TRequestStatus& aObserverRequestStatus); IMPORT_C void SaveMessageL(CMsvStore& aEditStore, TMsvEntry& aEntry); - + IMPORT_C void CreateMessageL(TMsvEntry& aEntry); /** Sets the character encoding value. The character encoding value options are 7-bit, 8-bit and 16-Bit Unicode. By default the character set encoding is 7 bit encoding. diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/clientmtm/src/SMSCLNT.CPP --- a/mobilemessaging/smsmtm/clientmtm/src/SMSCLNT.CPP Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/clientmtm/src/SMSCLNT.CPP Fri Feb 19 22:47:38 2010 +0200 @@ -819,20 +819,13 @@ { __ASSERT_DEBUG(iMsvEntry,Panic(ESmscEntryNotSet)); - RestoreServiceAndSettingsL(); - - ResetHeader(); - Body().Reset(); CMsvStore* msvstore=iMsvEntry->ReadStoreL(); CleanupStack::PushL(msvstore); switch (iMsvEntry->Entry().iType.iUid) { case KUidMsvServiceEntryValue: { - CSmsAccount* account = CSmsAccount::NewLC(); - // just v2 - account->LoadSettingsL(*iServiceSettings); - CleanupStack::PopAndDestroy(account); + RestoreServiceAndSettingsL(); break; } case KUidMsvFolderEntryValue: @@ -841,6 +834,9 @@ } case KUidMsvMessageEntryValue: { + ResetHeader(); + Body().Reset(); + CSmsHeader* smsheader=CSmsHeader::NewL(CSmsPDU::ESmsSubmit,Body()); CleanupStack::PushL(smsheader); smsheader->RestoreL(*msvstore); @@ -1539,6 +1535,46 @@ } } + + +/** +Creates a new outgoing SMS message entry as a child of the current context. + +Used by CSendAs::CreateMessageL to create an outgoing SMS message. + +@param +The entry with the required fields set. + +*/ +EXPORT_C void CSmsClientMtm::CreateMessageL(TMsvEntry& aEntry) + { + RestoreServiceAndSettingsL(); + + aEntry.SetVisible(EFalse); + aEntry.SetInPreparation(ETrue); + aEntry.iDate.UniversalTime(); + + // store entry in folder + iMsvEntry->CreateL(aEntry); + SwitchCurrentEntryL(aEntry.Id()); + // End of fix + + delete iSmsHeader; + iSmsHeader=NULL; + iSmsHeader=CSmsHeader::NewL(CSmsPDU::ESmsSubmit,Body()); + iSmsHeader->SetSmsSettingsL(*iServiceSettings); + + // service centre was not being set + TInt defaultSC = iServiceSettings->DefaultServiceCenter(); + if(defaultSC > -1) + { + if (iServiceSettings->ServiceCenterCount() > defaultSC ) + { + iSmsHeader->SetServiceCenterAddressL( iServiceSettings->GetServiceCenter(defaultSC).Address() ); + } + } + } + /** Resets the current SMS message. diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/group/messaging_sms.mrp --- a/mobilemessaging/smsmtm/group/messaging_sms.mrp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/group/messaging_sms.mrp Fri Feb 19 22:47:38 2010 +0200 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2009 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". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component messaging_sms source \sf\app\messaging\mobilemessaging\smsmtm diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/class0smsnotifier/group/class0smsUInotifier.mmp --- a/mobilemessaging/smsmtm/test/class0smsnotifier/group/class0smsUInotifier.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/class0smsnotifier/group/class0smsUInotifier.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -43,7 +43,7 @@ #ifdef WINS DEFFILE ./v2_wins.def #else -DEFFILE .\v2_eabi.def +DEFFILE ./v2_eabi.def #endif SMPSAFE diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/group/T_CSmsSettings.mmp --- a/mobilemessaging/smsmtm/test/group/T_CSmsSettings.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/group/T_CSmsSettings.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -17,10 +17,10 @@ TARGETTYPE exe CAPABILITY All -TCB -USERINCLUDE ..\inc -SOURCEPATH ..\src +USERINCLUDE ../inc +SOURCEPATH ../src SOURCE T_CSmsSettings.cpp -SOURCEPATH ..\..\clientmtm\src +SOURCEPATH ../../clientmtm/src SOURCE SmutSet.cpp APP_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib efsrv.lib conarc.lib estor.lib commdb.lib msgs.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/group/T_SmsSendAs.mmp --- a/mobilemessaging/smsmtm/test/group/T_SmsSendAs.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/group/T_SmsSendAs.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -19,9 +19,9 @@ targettype exe CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src source t_smssendas.cpp -userinclude ..\inc +userinclude ../inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN library euser.lib msgs.lib smcm.lib esock.lib library smstestutils.lib msvtestutils.lib send.lib etext.lib gsmu.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/group/t_SmsReplyToServer.mmp --- a/mobilemessaging/smsmtm/test/group/t_SmsReplyToServer.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/group/t_SmsReplyToServer.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -20,11 +20,11 @@ CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE t_SmsReplyToServer.cpp SOURCE t_SmsReplyToStep.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib LIBRARY testexecuteutils.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/group/t_SmsSpecialIndicationsServer.mmp --- a/mobilemessaging/smsmtm/test/group/t_SmsSpecialIndicationsServer.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/group/t_SmsSpecialIndicationsServer.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -20,11 +20,11 @@ CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src SOURCE t_SmsSpecialIndicationsServer.cpp SOURCE t_SmsSpecialIndicationsStep.cpp -USERINCLUDE ..\inc +USERINCLUDE ../inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN LIBRARY euser.lib testexecuteutils.lib testexecutelogclient.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/group/t_smsinit.mmp --- a/mobilemessaging/smsmtm/test/group/t_smsinit.mmp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/group/t_smsinit.mmp Fri Feb 19 22:47:38 2010 +0200 @@ -17,9 +17,9 @@ targettype exe CAPABILITY All -TCB -SOURCEPATH ..\src +SOURCEPATH ../src source t_smsinit.cpp -userinclude ..\inc +userinclude ../inc APP_LAYER_SYSTEMINCLUDE_SYMBIAN library euser.lib library smstestutils.lib msvtestutils.lib diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smsmtm/test/testrom/bld.inf --- a/mobilemessaging/smsmtm/test/testrom/bld.inf Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smsmtm/test/testrom/bld.inf Fri Feb 19 22:47:38 2010 +0200 @@ -15,7 +15,7 @@ PRJ_TESTEXPORTS -t_smcm_prepare_for_test.bat \epoc32\data\z\system\msgtest\urel\t_smcm_prepare_for_test.bat -t_smcm_prepare_for_test.bat \epoc32\data\z\system\msgtest\udeb\t_smcm_prepare_for_test.bat -t_smcm.iby \epoc32\rom\include\t_smcm.iby +t_smcm_prepare_for_test.bat /epoc32/data/z/system/msgtest/urel/t_smcm_prepare_for_test.bat +t_smcm_prepare_for_test.bat /epoc32/data/z/system/msgtest/udeb/t_smcm_prepare_for_test.bat +t_smcm.iby /epoc32/rom/include/t_smcm.iby diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smum/inc/SmumSettingsDialogGSM.h --- a/mobilemessaging/smum/inc/SmumSettingsDialogGSM.h Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smum/inc/SmumSettingsDialogGSM.h Fri Feb 19 22:47:38 2010 +0200 @@ -72,9 +72,8 @@ ESmumCharSupportInUseLBI, //= 3 ESmumDeliveryReportLBI, //= 4 ESmumValidityPeriodLBI, //= 5 - ESmumMessageConversionLBI, //= 6 - ESmumPreferredConnectionLBI, //= 7 - ESmumReplyViaSameCentreLBI //= 8 + ESmumPreferredConnectionLBI, //= 6 + ESmumReplyViaSameCentreLBI //= 7 }; enum TSmumMainSmsSendingOptSettingLBIndex @@ -83,8 +82,7 @@ ESmumSendOptCharSupportInUseLBI, //= 1, ESmumSendOptDeliveryReportLBI, //= 2, ESmumSendOptValidityPeriodLBI, //= 3, - ESmumSendOptMessageConversionLBI, //= 4, - ESmumSendOptReplyViaSameCentreLBI //= 5 + ESmumSendOptReplyViaSameCentreLBI //= 4 }; diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp --- a/mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -40,6 +40,7 @@ #include #include // CRepository #include // Keys +#include // locals #include "smsui.pan" // for panics @@ -113,6 +114,8 @@ { iListBox->SetScrollBarFrame( NULL, CEikListBox::EOwnedExternally ); } + // To remove sending options from Message Settings + RProperty::Delete( KPSUidMuiu, KMuiuRemoveMsgSentSettings ); delete iPreviousTitleText; delete iSettingsArrayIndex; delete iCentralRapository; @@ -159,6 +162,15 @@ { iUseSimSCsOnly = ETrue; } + // Define the property to remove sending options from Message Settings + TInt r = RProperty::Define( KPSUidMuiu, KMuiuRemoveMsgSentSettings, RProperty::EInt ); + if ( r != KErrAlreadyExists ) + { + User::LeaveIfError( r ); + } + // Initialise the value of key as 0 + RProperty::Set( KPSUidMuiu, KMuiuRemoveMsgSentSettings, 0) ; + SMUMLOGGER_LEAVEFN(" CSmumMainSettingsDialogGSM::ConstructL"); } @@ -299,12 +311,17 @@ SMUMLOGGER_ENTERFN(" CSmumMainSettingsDialogGSM::PreLayoutDynInitL"); // Creating correct listbox depending Settings vs Sending Options iListBox = STATIC_CAST( CEikTextListBox*, Control( ESmsSettingsListBoxId )); + + // To remove sending options from Message Settings ,set the key value as 1 + TInt err = RProperty::Set( KPSUidMuiu, KMuiuRemoveMsgSentSettings, 1 ) ; + User::LeaveIfError(err); + iSettingsArray = CSmumSettingsArray::NewL( iTypeOfSettings ? R_SMS_SENDING_OPTIONS_ITEMS : R_SMS_MAIN_SETTINGS_ITEMS ); // The count of setting items depends of setting type TInt numberOfSettingItems = iTypeOfSettings ? - ESmumSendOptReplyViaSameCentreLBI + 1 : ESmumReplyViaSameCentreLBI + 1; + ESmumSendOptReplyViaSameCentreLBI : ESmumReplyViaSameCentreLBI ; iSettingsArrayIndex = new(ELeave) CArrayFixFlat( numberOfSettingItems ); // Iterate through settings for (TInt count = 0; count < numberOfSettingItems; count++) @@ -575,40 +592,6 @@ } } - // Message conversion - if ( iCSPFeatures & EProtocolIDSupport ) - { - if ( !iSettingsArrayIndex->Find ( iTypeOfSettings ? - ESmumSendOptMessageConversionLBI : ESmumMessageConversionLBI, key, index ) ) - { - // Message Conversion - switch(iSettings.MessageConversion()) - { - case ESmsConvPIDNone: - choicelistIndex = ESmumConversionNone; - break; - case ESmsConvFax: - choicelistIndex = ESmumConversionFax; - break; - case ESmsConvPaging: - choicelistIndex = ESmumConversionPaging; - break; - case ESmsConvX400: - case ESmsConvErmes: - case ESmsConvSpeech: - default: - #if defined (_DEBUG) - Panic( ESmsetdlgUnknownConversion ); - #else - // drop through in release version - choicelistIndex = ESmumConversionNone; - #endif - break; - } - SetItem( index, choicelistIndex); - } - } - // Preferred Connection if ( !iTypeOfSettings ) { @@ -753,40 +736,7 @@ iSettings.SetValidityPeriod( validityPeriod ); } } - - // Message Conversion - if ( iCSPFeatures & EProtocolIDSupport ) - { - if ( !iSettingsArrayIndex->Find ( iTypeOfSettings ? - ESmumSendOptMessageConversionLBI : ESmumMessageConversionLBI, key, index ) ) - { - TInt choicelistIndex = KErrNotFound; - switch( Item( index )) - { - case ESmumConversionNone: - choicelistIndex = ESmsConvPIDNone; - break; - case ESmumConversionFax: - choicelistIndex = ESmsConvFax; - break; - case ESmumConversionPaging: - choicelistIndex = ESmsConvPaging; - break; - default: - #if defined ( _DEBUG ) - Panic( ESmsetdlgUnknownConversion ); - #else - // drop through in release version - choicelistIndex = ESmsConvPIDNone; - #endif - break; - } - iSettings.SetMessageConversion(STATIC_CAST( - TSmsPIDConversion, - choicelistIndex )); - } - } - + // Preferred Connection if ( !iTypeOfSettings ) { @@ -1164,14 +1114,6 @@ ESmumSendOptReplyViaSameCentreLBI : ESmumReplyViaSameCentreLBI ); needToBeCompressed = ETrue; } - if ( !( iCSPFeatures & EProtocolIDSupport )) - { - SMUMLOGGER_WRITE( - "DeleteVariatedSettings - EProtocolIDSupport") - DeleteSettingItemFromArrays( iTypeOfSettings ? - ESmumSendOptMessageConversionLBI : ESmumMessageConversionLBI ); - needToBeCompressed = ETrue; - } if ( !( iCSPFeatures & EValidityPeriodSupport )) { SMUMLOGGER_WRITE( diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp --- a/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -1788,14 +1788,23 @@ { TPointerEvent* event = static_cast( aArg2 ); CMsgBaseControl* control = static_cast( aArg1 ); - if(iLongTapDetector) - { - iLongTapDetector->EnableLongTapAnimation(ETrue); - iLongTapDetector->PointerEventL( *event ); - } + if ( event->iType == TPointerEvent::EButton1Down ) { iFocusedControl = control; + if ( control && + ( control->ControlId() == EMsgComponentIdAudio || + control->ControlId() == EMsgComponentIdImage || + control->ControlId() == EMsgComponentIdVideo || + control->ControlId() == EMsgComponentIdAttachment || + control->ControlId() == EMsgComponentIdSvg ) ) + { + if(iLongTapDetector) + { + iLongTapDetector->EnableLongTapAnimation(ETrue); + iLongTapDetector->PointerEventL( *event ); + } + } iTapConsumed = EFalse; } else if ( (!iTapConsumed) && (event->iType == TPointerEvent::EButton1Up) ) diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/unieditor/smsplugin/inc/UniSmsPlugin.h --- a/mobilemessaging/unieditor/smsplugin/inc/UniSmsPlugin.h Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/unieditor/smsplugin/inc/UniSmsPlugin.h Fri Feb 19 22:47:38 2010 +0200 @@ -231,7 +231,11 @@ /** * returns attachment size. */ - TInt32 AttachmentsSizeL( CMsvStore& aStore ); + TInt32 AttachmentsSizeL( CMsvStore& aStore ); + /** + * resets Unimtm addresslist. + */ + void ResetUniAddresselist(); private: // Data diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp --- a/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -243,7 +243,18 @@ iSmsHeader->StoreL( aStore ); } } - +// ----------------------------------------------------------------------------- +// ResetUniAddresselist +// ----------------------------------------------------------------------------- +// +void CUniSmsPlugin::ResetUniAddresselist() + { + const CMsvRecipientList& uniRecipients = iUniMtm.AddresseeList(); + while ( uniRecipients.Count() ) + { + iUniMtm.RemoveAddressee( 0 ); + } + } // ----------------------------------------------------------------------------- // ConvertFromL // ----------------------------------------------------------------------------- @@ -264,10 +275,11 @@ SmsMtmL()->SwitchCurrentEntryL( aId ); SmsMtmL()->LoadMessageL(); iUniMtm.SwitchCurrentEntryL( aId ); - iUniMtm.LoadMessageL(); + iUniMtm.LoadMessageL(); + ResetUniAddresselist(); + TPtrC name; + TPtrC address; - TPtrC name; - TPtrC address; const CSmsEmailFields& emailFields = SmsMtmL( )->SmsHeader( ).EmailFields(); @@ -641,8 +653,7 @@ CleanupStack::PopAndDestroy( sendOptions ); SmsMtmL()->SaveMessageL(*store, tEntry); - - store->CommitL(); + store->CommitL(); tEntry.iSize = store->SizeL(); if( AttachmentsSizeL( *store ) > 0 ) { diff -r 4697dfb2d7ad -r 1d7827e39b52 mobilemessaging/unieditor/utils/src/UniObjectsViewDialog.cpp --- a/mobilemessaging/unieditor/utils/src/UniObjectsViewDialog.cpp Tue Feb 02 00:08:43 2010 +0200 +++ b/mobilemessaging/unieditor/utils/src/UniObjectsViewDialog.cpp Fri Feb 19 22:47:38 2010 +0200 @@ -975,6 +975,7 @@ 0, TSendingCapabilities::ESupportsAttachments ) ); + aMenuPane->SetItemSpecific( EMmsObjectsSendVia, ETrue ); } } else if ( iDialogType == EForward )