# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268649606 -7200 # Node ID a9c7e5670d1775e734a5370330cc19c262ceaf29 # Parent caea42e26caa8f85b2cbde7e712b6b3f920fcb91 Revision: 201009 Kit: 201010 diff -r caea42e26caa -r a9c7e5670d17 email/imap4mtm/group/messaging_email_imap.history.xml --- a/email/imap4mtm/group/messaging_email_imap.history.xml Fri Mar 12 15:42:19 2010 +0200 +++ b/email/imap4mtm/group/messaging_email_imap.history.xml Mon Mar 15 12:40:06 2010 +0200 @@ -3,12 +3,12 @@ Message Type Module (MTM) plugin to Messaging Framework supporting send/receive/edit of IMAP4 email messages. - - - Parsing the server response without [ ]. - - - + + + MarkOnOrOfflineL() moved down. + + + Included missing header file. diff -r caea42e26caa -r a9c7e5670d17 email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp --- a/email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/email/imap4mtm/imapprotocolcontroller/src/cimapprotocolcontroller.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -1416,8 +1416,6 @@ { case EConnect: { - TRAP_IGNORE(MarkOnOrOfflineL(ETrue)); - // Collect the final connect progress information iImapSessionManager->Progress(iProgress.iGenericProgress); @@ -1426,6 +1424,8 @@ TMsvEntry entry=iEntry.Entry(); entry.SetMtmData1(iImapSessionManager->LastSocketActivityTimeout()); User::LeaveIfError( iEntry.ChangeEntry( entry ) ); + + TRAP_IGNORE(MarkOnOrOfflineL(ETrue)); // Create an IMAP IDLE controller delete iImapIdleController; diff -r caea42e26caa -r a9c7e5670d17 messagingappbase/mce/src/mceui.cpp --- a/messagingappbase/mce/src/mceui.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/messagingappbase/mce/src/mceui.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -2954,24 +2954,6 @@ iMMSNotifications = NULL; } - if ( local && ( ( iEntry->Entry().Parent() == KMsvGlobalInBoxIndexEntryId ) || - ( iEntry->Entry().Parent() == KMsvGlobalOutBoxIndexEntryId ) ) ) - { - CheckMMSNotificationsL( selection ); - if ( selection->Count() <= 0 ) - { - // delete mms notifications, if any - if ( iMMSNotifications->Count() > 0 ) - { - //delete MMS notifications - TBuf8<1> params; - HandleMMSNotificationsDeleteL( params ); - } - CleanupStack::PopAndDestroy( selection ); - return; - } - } - if ( local ) { CAknQueryDialog* confDialog = CAknQueryDialog::NewL(); @@ -3006,6 +2988,26 @@ return; } } + + if ( local && ( ( iEntry->Entry().Parent() == KMsvGlobalInBoxIndexEntryId ) || + ( iEntry->Entry().Parent() == KMsvGlobalOutBoxIndexEntryId ) ) ) + { + CheckMMSNotificationsL( selection ); + if ( selection->Count() <= 0 ) + { + // delete mms notifications, if any + if ( iMMSNotifications->Count() > 0 ) + { + //delete MMS notifications + TBuf8<1> params; + HandleMMSNotificationsDeleteL( params ); + } + CleanupStack::PopAndDestroy( selection ); + return; + } + } + + iEntry->SetEntryL( iEntry->Entry().Parent() ); CBaseMtmUi* ui = NULL; diff -r caea42e26caa -r a9c7e5670d17 messagingappbase/msgeditor/mediacontrolsrc/MsgSvgControl.cpp --- a/messagingappbase/msgeditor/mediacontrolsrc/MsgSvgControl.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/messagingappbase/msgeditor/mediacontrolsrc/MsgSvgControl.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -21,6 +21,7 @@ // INCLUDE FILES #include "MsgSvgControl.h" +#include #include #include @@ -149,9 +150,13 @@ // Use svgt thumbnail creation directly CFbsBitmap* thumbnailBitmap = new ( ELeave ) CFbsBitmap; CleanupStack::PushL( thumbnailBitmap ); + TDisplayMode DisplayMode = iCoeEnv->ScreenDevice()->DisplayMode(); + //if DisplayMode is EColor16MAP then change to EColor16MA + //EColor16MAP is not supported by SVG Engine. + if ( DisplayMode == EColor16MAP ) + DisplayMode = EColor16MA; - User::LeaveIfError( thumbnailBitmap->Create( thumbnailSize, - iCoeEnv->ScreenDevice()->DisplayMode() ) ); + User::LeaveIfError( thumbnailBitmap->Create( thumbnailSize, DisplayMode ) ); CFbsBitmap* thumbnailMask = new ( ELeave ) CFbsBitmap; CleanupStack::PushL( thumbnailMask ); diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/mmsui/notmtm/NotUi.rss --- a/mobilemessaging/mmsui/notmtm/NotUi.rss Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/mmsui/notmtm/NotUi.rss Mon Mar 15 12:40:06 2010 +0200 @@ -510,8 +510,6 @@ RESOURCE TBUF r_notmtm_wait_deleting { buf = qtn_notif_wait_delete; } RESOURCE TBUF r_notmtm_wait_deleting_many { buf = qtn_notif_wait_delete_many; } - RESOURCE TBUF r_notmtm_quest_delete_message { buf = qtn_query_common_conf_delete_me; } - RESOURCE TBUF r_notmtm_quest_delete_messages { buf = qtn_query_common_conf_delete_ms; } RESOURCE TBUF r_notmtm_inbox_status_retrieving { buf = qtn_mms_notification_state_retrieving; } RESOURCE TBUF r_notmtm_inbox_status_waiting { buf = qtn_mms_notification_state_waiting; } RESOURCE TBUF r_notmtm_inbox_status_failed { buf = qtn_mms_notification_state_failed; } diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/mmsui/notmtmsrc/NotMtmUi.cpp --- a/mobilemessaging/mmsui/notmtmsrc/NotMtmUi.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/mmsui/notmtmsrc/NotMtmUi.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -1274,25 +1274,8 @@ { deleteMode = EMmsDeleteNotificationOnly; } - CAknQueryDialog* dlg = CAknQueryDialog::NewL(); - HBufC* prompt; - if( iFlags & EDeletingMany ) - { - prompt = StringLoader::LoadLC( R_NOTMTM_QUEST_DELETE_MESSAGES, aSelection.Count(), iCoeEnv ); - } - else - { - prompt = StringLoader::LoadLC( R_NOTMTM_QUEST_DELETE_MESSAGE, iCoeEnv ); - } - // Lets prompt the question - TInt retVal = dlg->ExecuteLD( R_NOTUI_CONFIRMATION_QUERY, *prompt ); - CleanupStack::PopAndDestroy( prompt ); - - if( !retVal ) - { // Answered NO - return msvoperation; // Return NULL operation - } } + if( deleteMode == -1 ) { // For some reason deleteMode was not set return msvoperation; // Return NULL operation diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/mmsui/viewer/MmsViewer.rss --- a/mobilemessaging/mmsui/viewer/MmsViewer.rss Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/mmsui/viewer/MmsViewer.rss Mon Mar 15 12:40:06 2010 +0200 @@ -392,7 +392,6 @@ MENU_ITEM { command = EMmsViewerForward; txt = qtn_mms_om_forward; }, MENU_ITEM { command = EMmsViewerDelete; txt = qtn_msg_om_delete; }, MENU_ITEM { command = EFindItemMenuPlaceHolder; txt = ""; }, - MENU_ITEM { command = EMmsViewerSaveObject; txt = qtn_mms_om_save_object; }, MENU_ITEM { command = EMmsViewerShowMessage; txt = qtn_mms_om_play_message; }, MENU_ITEM { command = EMmsViewerObjects; txt = qtn_mms_om_objects; }, diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h --- a/mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/mmsui/viewerinc/UniMmsViewerAppUi.h Mon Mar 15 12:40:06 2010 +0200 @@ -577,6 +577,11 @@ void HandleLongTapEventL( const TPoint& aPenEventLocation, const TPoint& aPenEventScreenLocation ); + + /** + * For Handling iMskId for an embedded object + */ + void HandleSelectionKeyL( ); private: // Functions from base classes diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp --- a/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/mmsui/viewersrc/UniMmsViewerAppUi.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -1195,17 +1195,6 @@ } - if ( ! ( Document( )->SmilType( ) == EMmsSmil - && ( focusedControl == EMsgComponentIdBody - || focusedControl == EMsgComponentIdImage - || focusedControl == EMsgComponentIdAudio -#ifdef RD_SVGT_IN_MESSAGING - || focusedControl == EMsgComponentIdSvg -#endif - || focusedControl == EMsgComponentIdVideo ) ) ) - { - aMenuPane->SetItemDimmed( EMmsViewerSaveObject, ETrue ); - } if ( ! ( iSupportedFeatures & EMmsFeatureUpload ) || !iUploadServices.Count( ) ) @@ -2824,6 +2813,7 @@ { TPointerEvent* pointerEvent = static_cast( aArg2 ); CMsgBaseControl* baseControl = static_cast( aArg1 ); + TWsEvent* wsEvent = static_cast(aArg2); if ( pointerEvent && pointerEvent->iType == TPointerEvent::EButton1Down ) @@ -2849,9 +2839,10 @@ } else if ( (!iTapConsumed) && (pointerEvent && pointerEvent->iType == TPointerEvent::EButton1Up) ) - { - iLongTapDetector->CancelAnimationL(); + { + iLongTapDetector->MonitorWsMessage(*wsEvent); iTapConsumed = ETrue; + CMsgBaseControl* focusedControl = iView->FocusedControl(); if ( baseControl && iPointerTarget == baseControl ) { switch( iMskId ) @@ -2870,20 +2861,23 @@ case R_MMSVIEWER_MSK_BUTTON_PLAY_SVG: #endif { - // Read current MSK resource to get a command id - // to execute. - TResourceReader reader; - iEikonEnv->CreateResourceReaderLC( - reader, iMskId ); - reader.ReadInt8(); // version - HandleCommandL( reader.ReadUint16() ); - CleanupStack::PopAndDestroy(); // resource buffer + HandleSelectionKeyL(); *static_cast( aArg3 ) = ETrue; // handled } default: ; } } + else if ( focusedControl && iPointerTarget == focusedControl ) + { + if ( iMskId == R_MMSVIEWER_MSK_BUTTON_PLAY_VIDEO || + iMskId == R_MMSVIEWER_MSK_BUTTON_STOP_VIDEO ) + { + HandleSelectionKeyL(); + *static_cast( aArg3 ) = ETrue; // handled + } + } + iPointerTarget = NULL; } } @@ -5527,6 +5521,21 @@ iTapConsumed = ETrue; } } - } + } +// --------------------------------------------------------- +// CMmsViewerAppUi::HandleSelectionKeyL +// Function for handling the selection key +// --------------------------------------------------------- +void CMmsViewerAppUi::HandleSelectionKeyL() + { + // Read current MSK resource to get a command id + // to execute. + TResourceReader reader; + iEikonEnv->CreateResourceReaderLC( + reader, iMskId ); + reader.ReadInt8(); // version + HandleCommandL( reader.ReadUint16() ); + CleanupStack::PopAndDestroy(); // resource buffer + } // End of File diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp --- a/mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/smum/src/SmumSettingsDialogGSM.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -321,7 +321,7 @@ // The count of setting items depends of setting type TInt numberOfSettingItems = iTypeOfSettings ? - ESmumSendOptReplyViaSameCentreLBI : ESmumReplyViaSameCentreLBI ; + ESmumSendOptReplyViaSameCentreLBI + 1: ESmumReplyViaSameCentreLBI + 1 ; iSettingsArrayIndex = new(ELeave) CArrayFixFlat( numberOfSettingItems ); // Iterate through settings for (TInt count = 0; count < numberOfSettingItems; count++) diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp --- a/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/unieditor/application/src/UniEditorAppUi.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -1795,7 +1795,7 @@ { TPointerEvent* event = static_cast( aArg2 ); CMsgBaseControl* control = static_cast( aArg1 ); - + TWsEvent* wsEvent = static_cast(aArg2); if ( event->iType == TPointerEvent::EButton1Down ) { iFocusedControl = control; @@ -1816,7 +1816,7 @@ } else if ( (!iTapConsumed) && (event->iType == TPointerEvent::EButton1Up) ) { - iLongTapDetector->CancelAnimationL(); + iLongTapDetector->MonitorWsMessage(*wsEvent); iTapConsumed = ETrue; if ( control && iFocusedControl == control && @@ -7851,8 +7851,19 @@ plugin->SetEncodingSettings(EFalse, doc->AlternativeEncodingType(), doc->CharSetSupport()); } //Call the plugin SMS adaptation API to get PDU Info - plugin->GetNumPDUsL( inputBuff, numOfRemainingChars, numOfPDUs, unicodeMode, alternativeEncodingType); - + TRAPD( err, plugin->GetNumPDUsL( inputBuff, numOfRemainingChars, numOfPDUs, unicodeMode, alternativeEncodingType) ); + if ( err == KErrOverflow ) + { + iSmsBodyLength = buffLength; + delete iPrevBuffer; + iPrevBuffer = editorTxt; + return; + } + else if ( err != KErrNone ) + { + User::Leave(err); + } + //save current buffer delete iPrevBuffer; iPrevBuffer = editorTxt; diff -r caea42e26caa -r a9c7e5670d17 mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp --- a/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp Fri Mar 12 15:42:19 2010 +0200 +++ b/mobilemessaging/unieditor/smsplugin/src/UniSmsPlugin.cpp Mon Mar 15 12:40:06 2010 +0200 @@ -1831,7 +1831,11 @@ iRichText->InsertL(0, aBuf); //call SMS stack API to get PDU info - smsMsg.GetEncodingInfoL( aNumOfPDUs, numOfUnconvChars, numOfDowngradedChars, aNumOfRemainingChars ); + TRAPD( err, smsMsg.GetEncodingInfoL( aNumOfPDUs, numOfUnconvChars, numOfDowngradedChars, aNumOfRemainingChars ) ); + if (err != KErrNone) + { + User::Leave(err); + } #ifdef USE_LOGGER UNILOGGER_WRITE(" ---Get Encoding Info details:--- ");