Revision: 201023 RCL_3 PDK_3.0.1
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 21 Jun 2010 15:36:19 +0300
branchRCL_3
changeset 42 1367103c24e2
parent 33 94cccd85bd25
child 53 696bfeff199e
Revision: 201023 Kit: 2010125
email/alwaysonlineemailplugin/src/AlwaysOnlineEmailAgentBase.cpp
email/imap4mtm/imapsession/src/cimapsession.cpp
email/imum/Utils/Src/ImumMboxManager.cpp
email/pop3andsmtpmtm/clientmtms/group/IMCM.rss
email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp
email/pop3andsmtpmtm/smtpservermtm/src/IMSM.CPP
messagingappbase/mce/help/data/xhtml.zip
messagingappbase/mce/help/inc/mce.hlp.hrh
messagingappbase/mce/src/MceMainViewListItemArray.cpp
messagingappbase/mce/src/mceui.cpp
messagingappbase/msgavkon/conf/messaging_101F87EB.crml
messagingappbase/msgeditor/viewsrc/MsgEditorView.cpp
messagingappbase/sendui/genericmtmplugin/src/genericmtmplugin.cpp
mobilemessaging/smum/simdialogplugins/defaultsimdlg/src/smssimdialog.cpp
msg_plat/messaging_editor_api/inc/MsgEditorView.h
--- a/email/alwaysonlineemailplugin/src/AlwaysOnlineEmailAgentBase.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/alwaysonlineemailplugin/src/AlwaysOnlineEmailAgentBase.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -897,20 +897,33 @@
     CleanupStack::PopAndDestroy( accounts ); // accounts
 
     // Check ap preferences
-    TImIAPChoice iapChoice = apPrefs->IAPPreference( KMailSettingsIapPreferenceNumber );
-    TInt iapId = iapChoice.iIAP;
+    TInt iapId;
+    if ( apPrefs->NumberOfIAPs()>0 )
+        {
+        TImIAPChoice iapChoice = apPrefs->IAPPreference( KMailSettingsIapPreferenceNumber );
+        iapId = iapChoice.iIAP;
+        }
+    else if( apPrefs->SNAPDefined() )
+        {
+        iapId = apPrefs->SNAPPreference();
+        }
+    else
+        {
+        iapId = 0;
+        }
+    
 
     // if iapId is 0, assume default connection
     // else the iapId points to the actual iap
     if( iapId == 0 )
-    	{
-    	// Default Connection is in use
+        {
+        // Default Connection is in use
         TCmDefConnValue defConSetting;
         iCmManager.ReadDefConnL( defConSetting );
         if( defConSetting.iType == ECmDefConnAlwaysAsk ||
-        	defConSetting.iType == ECmDefConnAskOnce )
-        	{
-        	// always ask not supported in always online plugin
+            defConSetting.iType == ECmDefConnAskOnce )
+            {
+            // always ask not supported in always online plugin
         	User::Leave( KErrNotSupported );
         	}
         else
--- a/email/imap4mtm/imapsession/src/cimapsession.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/imap4mtm/imapsession/src/cimapsession.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -1412,14 +1412,21 @@
 				
 			if (err != KErrNone)
 				{
-				// As well as completing, destroy the command to help free up resources.
-				CompleteAndDestroyCommand(err, ETrue);
+                if(err == KErrImapCorrupt)
+                    {
+                    continueReadingData = ETrue;
+                    }
+                else
+                    {
+                    // As well as completing, destroy the command to help free up resources.
+                    CompleteAndDestroyCommand(err, ETrue);
 
-				// Don't allow the session to be called again.
-				SetSessionState(ESessionUnrecoverable);
-				
-				return;
-				}
+                    // Don't allow the session to be called again.
+                    SetSessionState(ESessionUnrecoverable);
+                    
+                    return;
+                    }
+				}// end of  if (err != KErrNone)
 				
 			// If a literal block is expected next, then find out how big it is expected to be.
 			switch (commandParseState)
--- a/email/imum/Utils/Src/ImumMboxManager.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/imum/Utils/Src/ImumMboxManager.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -366,32 +366,43 @@
     IMUM_CONTEXT( CImumMboxManager::LoadAccountFillIapL, 0, KLogData );
     IMUM_IN();
 	
-	//check IAP number 
+	//check Incoming IAP number 
     if ( aSettings.iIncomingIapPref->NumberOfIAPs() > 0 )
-    	{
-    // Set internet access point (incoming IAP)
-    TImIAPChoice incomingIapChoice =
+        {
+        // Set internet access point (incoming IAP)
+        TImIAPChoice incomingIapChoice =
         aSettings.iIncomingIapPref->IAPPreference( 0 );
-    aSettings.iIncomingIap = incomingIapChoice.iIAP;
-
+        aSettings.iIncomingIap = incomingIapChoice.iIAP;
+        }
+    
+    //check SNAP define    
+    else if( aSettings.iIncomingIapPref->SNAPDefined() )
+        {
+        aSettings.iIncomingIap = aSettings.iIncomingIapPref->SNAPPreference();
+        }    
+    else 
+        {
+        aSettings.iIncomingIap = 0;
+        }
+    
+    //check Outgoing IAP number 
+    if ( aSettings.iOutgoingIapPref->NumberOfIAPs() > 0 )
+        {
     // Set internet access point (Outgoing IAP)
     TImIAPChoice outgoingIapChoice =
         aSettings.iOutgoingIapPref->IAPPreference( 0 );
     aSettings.iOutgoingIap = outgoingIapChoice.iIAP;
-    	}
-		
-	//check SNAP define	
-    else if( aSettings.iIncomingIapPref->SNAPDefined() )
-    	{
-    	aSettings.iIncomingIap = aSettings.iIncomingIapPref->SNAPPreference();
-    	aSettings.iOutgoingIap = aSettings.iOutgoingIapPref->SNAPPreference();
-    	}	
-    else 
-    	{
-    	aSettings.iIncomingIap = 0;
-    	aSettings.iOutgoingIap = 0;
-    	}
-    	
+       }
+    //check SNAP define    
+    else if( aSettings.iOutgoingIapPref->SNAPDefined() )
+        {
+        aSettings.iOutgoingIap = aSettings.iOutgoingIapPref->SNAPPreference();
+        }    
+   else 
+       {
+        aSettings.iOutgoingIap = 0;
+       }
+        
     IMUM_OUT();
     }
 
@@ -413,7 +424,7 @@
     // Set the newly created one as a default account
     if ( aSettings.iDefaultAccountId == KMsvUnknownServiceIndexEntryId )
         {
-		if( !FeatureManager::FeatureSupported( KFeatureIdSelectableEmail ) ||
+    	if( !FeatureManager::FeatureSupported( KFeatureIdSelectableEmail ) ||
 			!MsvUiServiceUtilitiesInternal::OtherEmailMTMExistL( 
 			iMailboxApi.MsvSession(), aSettings.iMailboxId ) )
 			{
--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Mon Jun 21 15:36:19 2010 +0300
@@ -203,5 +203,5 @@
 
 RESOURCE INT8 store_plain_body_text
 	{
-	value = 1;
+	value = 0;
 	}
--- a/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/pop3andsmtpmtm/servermtmutils/src/imcvrecv.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1998-2010 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"
@@ -3976,7 +3976,11 @@
 			iLex.UnGetToMark(initMark);
 			ParseRfc2231ParameterInfoL(aTag, rBuffer, offset );
 			}
-			CleanupStack::Pop(rBuffer8);
+		if( param.Length() > 0 )
+		    {
+            CleanupStack::Pop(rBuffer8);
+		    }
+			
 		}
 	}
 
--- a/email/pop3andsmtpmtm/smtpservermtm/src/IMSM.CPP	Wed Jun 09 09:37:26 2010 +0300
+++ b/email/pop3andsmtpmtm/smtpservermtm/src/IMSM.CPP	Mon Jun 21 15:36:19 2010 +0300
@@ -791,26 +791,13 @@
 */
 void CMsgImOutboxSend::Complete(TInt status)
 	{
-	if (iState != EStateMobilityError)
-		{
-		// Respond to any outstanding bearer mobility requests as we are about
-		// to exit and we don't need to hold up the migration.
-		if (PreparingForMigration())
-			{
-			SignalMigrate();
-			}
-		else if (iMobilityOperation == EMobilityOperationMigrating &&
-		         iState == EStateConnectingSession)
-			{
-			if (iMobilityManager)
-				{
-				iMobilityManager->NewCarrierAccepted();
-				}
-			}
-		}
-
+    // sending of all the emails has completed, no need listen for Mobility Manager
+	delete iMobilityManager;
+    iMobilityManager=NULL;
+	
 	delete iSession;
 	iSession = NULL;
+	
 	delete iSessionManager;
 	iSessionManager = NULL;
 
@@ -1224,8 +1211,8 @@
 	delete iWaiter;	
 #endif
 
+	delete iMobilityManager;
 	delete iSessionManager;
-	delete iMobilityManager;
 	}
 
 CDesCArray& CMsgImOutboxSend::BccRcptArray()
Binary file messagingappbase/mce/help/data/xhtml.zip has changed
--- a/messagingappbase/mce/help/inc/mce.hlp.hrh	Wed Jun 09 09:37:26 2010 +0300
+++ b/messagingappbase/mce/help/inc/mce.hlp.hrh	Mon Jun 21 15:36:19 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2010 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"
@@ -41,5 +41,6 @@
 _LIT(KMCE_HLP_OUTBOX, "MCE_HLP_OUTBOX"); // 
 _LIT(KMCE_HLP_DELIVERY_REPORTS, "MCE_HLP_DELIVERY_REPORTS"); // 
 _LIT(KMCE_HLP_MMS_NOTIFICATIONS, "MCE_HLP_MMS_NOTIFICATIONS"); // 
+_LIT(KFIND_HLP, "FIND_HLP"); // 
 
 #endif 
\ No newline at end of file
--- a/messagingappbase/mce/src/MceMainViewListItemArray.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/messagingappbase/mce/src/MceMainViewListItemArray.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -1201,16 +1201,15 @@
         if(iDefaultViewSettings == KMceConversationview )
            {
            TInt msgCount = 0;
-           TInt unreadCount = 0;
-           iBitmapResolver.HasUnreadMessagesL(KMsvGlobalInBoxIndexEntryId,msgCount,unreadCount);
+           TInt unreadCount = 0;                   
+           TRAPD(Errcode,iBitmapResolver.HasUnreadMessagesL(KMsvGlobalInBoxIndexEntryId,msgCount,unreadCount));         
            if( unreadCount > 0 ) 
                {
                bitmapidx =  EMceBitmapIndexConversationNew ;
                }
            }    
         tempText.AppendNum(bitmapidx);
-        TPtrC Ptr(item.iPrintableText); 
-        TInt len = Ptr.Length();
+        TPtrC Ptr(item.iPrintableText);          
         TInt  pos = Ptr.Locate(KColumnListSeparator);
         TPtrC Ptr1(Ptr.Mid(pos));
         tempText.Append(Ptr1);                
--- a/messagingappbase/mce/src/mceui.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/messagingappbase/mce/src/mceui.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -4865,6 +4865,7 @@
 
             CMsvOperation* oper = mtmUi->ReplyL(
                 KMsvDraftEntryIdValue, parts, singleOpWatcher->iStatus );
+            iEditorOperation = singleOpWatcher;
 
             CleanupStack::PushL( oper );
             iOperations.AppendL( singleOpWatcher );
@@ -4894,6 +4895,7 @@
 
         CMsvOperation* oper = ui.ReplyL(
             KMsvDraftEntryIdValue, parts, singleOpWatcher->iStatus );
+        iEditorOperation = singleOpWatcher;
 
         CleanupStack::PushL( oper );
         iOperations.AppendL( singleOpWatcher );
@@ -6463,6 +6465,7 @@
 
     CMsvOperation* oper = ui.ForwardL(
         KMsvDraftEntryIdValue, parts, singleOpWatcher->iStatus );
+    iEditorOperation = singleOpWatcher;
 
     CleanupStack::PushL( oper );
     iOperations.AppendL( singleOpWatcher );
Binary file messagingappbase/msgavkon/conf/messaging_101F87EB.crml has changed
--- a/messagingappbase/msgeditor/viewsrc/MsgEditorView.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/messagingappbase/msgeditor/viewsrc/MsgEditorView.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -93,7 +93,9 @@
     iEditorModeFlags( aEditorModeFlags ),
     iLineHeight( MsgEditorCommons::MsgBaseLineDelta() ),
     iBaseLineOffset( MsgEditorCommons::MsgBaseLineOffset() ),
-    iResourceLoader( *iCoeEnv )
+    iResourceLoader( *iCoeEnv ),
+    iPrevFocus( EMsgNoneFocused ), 
+    iMoveUpDownEvent( EFalse) 
     {
     }
 
@@ -243,11 +245,13 @@
         TInt newFocus = iHeader->FirstFocusableControl( 0, EMsgFocusDown );
         if ( newFocus == KErrNotFound )
             {
+            iPrevFocus = EMsgHeaderFocused; 
             iCurrentFocus = EMsgBodyFocused;
             newFocus = iBody->FirstFocusableControl( 0, EMsgFocusDown );
             
             if ( newFocus == KErrNotFound )
                 {
+				iPrevFocus = EMsgNoneFocused;
                 iCurrentFocus = EMsgNoneFocused;
                 }
             else
@@ -782,7 +786,9 @@
             }
         }
     
+    iMoveUpDownEvent = ETrue; 
     EnsureCorrectFormPosition( ( aKeyEvent.iCode == EKeyDownArrow ) && focusRotated, forceScrollUp );
+    iMoveUpDownEvent = EFalse; 
 
     UpdateScrollBarL();
 
@@ -1764,7 +1770,8 @@
                     iHeader->NotifyControlsForEvent( EMsgViewEventPrepareFocusTransitionDown, 0 ); 
                     }
                 }
-            TMsgFocus previousMsgPart = iCurrentFocus;    
+            TMsgFocus previousMsgPart = iCurrentFocus;
+            iPrevFocus = iCurrentFocus; 
             iCurrentFocus = EMsgBodyFocused;
             
             TInt delta = componentIndex - iBody->CurrentFocus();
@@ -2238,6 +2245,34 @@
         {
         return EFalse;
         }
+    else 
+        {
+        if ( ctrl->ControlType() == EMsgBodyControl 
+             && ctrl->ItemFinder()
+             && ctrl->IsReadOnly()
+             && !iMoveUpDownEvent ) 
+            {
+            TInt countHeader = iHeader->CountMsgControls();
+            for ( TInt i = 0; i < countHeader; i++ )
+                 {
+                 CMsgBaseControl* headerCtrl = iHeader->MsgControl( i );
+                 if ( headerCtrl )
+                     {
+                     TInt controlType;
+                     controlType = headerCtrl->ControlType();
+                     if ( controlType == EMsgAddressControl ||
+                          controlType == EMsgExpandableControl ||
+                          controlType == EMsgAttachmentControl )
+                         {
+                         if ( ControlFullyVisible(headerCtrl) || iPrevFocus == EMsgHeaderFocused )
+                             {
+                             return EFalse; // Ignoring Scroll Event
+                             }
+                         }
+                      }
+                 }
+            }        
+        }
 
     iStateFlags |= EMsgEnsureCorrectFormPositionRequestIssued;
 
@@ -2248,8 +2283,8 @@
 
     if ( lineRect.Height() )
         {
-		if (lineRect.Height() >= iViewRect.Height())
-            {
+        if ( lineRect.iBr.iY > iViewRect.Height() ) 
+           {
             // the view must be scrolled up.
             delta = iViewRect.Height() - lineRect.iBr.iY;
             }
--- a/messagingappbase/sendui/genericmtmplugin/src/genericmtmplugin.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/messagingappbase/sendui/genericmtmplugin/src/genericmtmplugin.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -499,17 +499,13 @@
     TInt                    aAttachmentCount )
     {
     LOGTEXT(_L8("CGenericMtmPlugin::IsWaitNoteNeededL >>"));
-    if ( aMtmUid != KSenduiMtmIrUid && aMtmUid != KSenduiMtmBtUid )
-        {
-        return ETrue;       
-        }
+
 
     const CRichText* bodyText = aMessageData.BodyText();
     const CMessageAddressArray& toAddresses = aMessageData.ToAddressArray();
 
     if ( aAttachmentCount > 0 ||
-       ( bodyText && bodyText->DocumentLength() ) ||
-       ( toAddresses.Count() > 2 ) )
+       ( bodyText && bodyText->DocumentLength() ) )
         {
         LOGTEXT(_L8("CGenericMtmPlugin::IsWaitNoteNeededL <<"));
         return ETrue;
--- a/mobilemessaging/smum/simdialogplugins/defaultsimdlg/src/smssimdialog.cpp	Wed Jun 09 09:37:26 2010 +0300
+++ b/mobilemessaging/smum/simdialogplugins/defaultsimdlg/src/smssimdialog.cpp	Mon Jun 21 15:36:19 2010 +0300
@@ -563,12 +563,6 @@
             }        	
         return EKeyWasConsumed;
         }
-    if( aType == EEventKey && aKeyEvent.iCode == EKeyEscape ) 
-        {
-        iExitCode = EEikCmdExit;
-        TryExitL( EAknCmdExit ); 
-        return EKeyWasConsumed;     
-        }
     if( aType == EEventKeyUp )
         {
         UpdateMskL( );
--- a/msg_plat/messaging_editor_api/inc/MsgEditorView.h	Wed Jun 09 09:37:26 2010 +0300
+++ b/msg_plat/messaging_editor_api/inc/MsgEditorView.h	Mon Jun 21 15:36:19 2010 +0300
@@ -662,6 +662,8 @@
     	
     	MEikEdwinObserver*   iEdwinObserver;
     	RConeResourceLoader  iResourceLoader;
+    	TMsgFocus            iPrevFocus; 
+    	TBool                iMoveUpDownEvent; 
     };
 
 #include <MsgEditorView.inl>