MCL/sf/app/commonemail: comparison emailservices/emailserver/cmailhandlerplugin/src/cmailcpsif.cpp

equal deleted inserted replaced

-:8592a65ad3fb
+:b13141f05c3d
 {
 iMsgInterface->Close();
 iMsgInterface = NULL;
 }
 delete iServiceHandler;
-iInstIdList.ResetAndDestroy();
+for ( TInt i = 0; i < iInstIdList.Count(); i++ )
+{
+iInstIdList.Remove(i);
+}
 CCoeEnv::Static()->DeleteResourceFile( iResourceFileOffset );
 if ( iContentControlClient )
 {
 delete iContentControlClient;
 }
 // ---------------------------------------------------------------------------
 // CMailCpsIf::PublishSetupWizardL
 // ---------------------------------------------------------------------------
 //
-void CMailCpsIf::PublishSetupWizardL(TInt instance)
+void CMailCpsIf::PublishSetupWizardL(TInt aInstance)
 {
 FUNC_LOG;
-TFSMailMsgId mailBoxId;
+if (!iInstIdList[aInstance].iWizardPublished)
-TFSMailMsgId folderId;
+{
+TFSMailMsgId mailBoxId;
-HBufC* setupEmail = StringLoader::LoadLC(R_EMAILWIDGET_TEXT_SETUP_EMAIL);
+TFSMailMsgId folderId;
-iSetupUid = PublishDescriptorL(
+HBufC* setupEmail = StringLoader::LoadLC(R_EMAILWIDGET_TEXT_SETUP_EMAIL);
+iSetupUid = PublishDescriptorL(
 KPubId, KContTypeSetupText,
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 *setupEmail,
 KKeySetupText, KTriggerWizard8);
 PublishImageL(
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 KContTypeSetupIcon,
 KKeySetupIcon,
 EMbmCmailhandlerpluginQgn_prop_cmail_new_mailbox,
 EMbmCmailhandlerpluginQgn_prop_cmail_new_mailbox_mask,
 mailBoxId,
 KNullDes);
 PublishImageL(
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 KContTypeSetupBrandIcon1,
 KKeySetupBrandIcon1,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account_mask,
 mailBoxId,
 KSetupBrand1);
 PublishImageL(
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 KContTypeSetupBrandIcon2,
 KKeySetupBrandIcon2,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account_mask,
 mailBoxId,
 KSetupBrand2);
 PublishImageL(
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 KContTypeSetupBrandIcon3,
 KKeySetupBrandIcon3,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account_mask,
 mailBoxId,
 KSetupBrand3);
 PublishImageL(
-iInstIdList[instance]->Des(),
+iInstIdList[aInstance].iCid,
 KContTypeSetupBrandIcon4,
 KKeySetupBrandIcon4,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account,
 EMbmCmailhandlerpluginQgn_indi_cmail_drop_email_account_mask,
 mailBoxId,
 KSetupBrand4);
+iInstIdList[aInstance].iWizardPublished = ETrue;
 CleanupStack::PopAndDestroy(setupEmail);
+}
 }
 // ---------------------------------------------------------------------------
 // CMailCpsIf::PublishActiveMailboxNameL
 // ---------------------------------------------------------------------------
 textKey.Copy(KKeyBodyText);
 textKey.Append(row);
 iMailboxNameUid = PublishDescriptorL(
 KPubId, contentType,
-iInstIdList[aInstance]->Des(),
+iInstIdList[aInstance].iCid,
 aMailboxName,
 textKey, KTriggerEmailUi8);
 }
 // ---------------------------------------------------------------------------
 textKey.Copy(KKeyBodyText);
 textKey.Append(_L("1"));
 TFSMailMsgId dummy;
-PublishDescriptorL( KPubId, contentType, iInstIdList[aInstance]->Des(),
+PublishDescriptorL( KPubId, contentType, iInstIdList[aInstance].iCid,
 aMailboxName, textKey, aAction);
 }
 // ---------------------------------------------------------------------------
 // CMailCpsIf::PublishIndicatorIconL
 // ---------------------------------------------------------------------------
 TBuf8<KMaxDescLen> key;
 key.Copy(KKeyIndicatorIcon);
 key.Append(row8);
 PublishImageL(
-iInstIdList[aInstance]->Des(),
+iInstIdList[aInstance].iCid,
 contentType,
 key,
 aIcon,
 aIcon + 1,
 mailBoxId,
 TBuf8<KMaxDescLen> key;
 key.Copy(KKeyMailboxIcons);
 key.Append(row8);
 PublishImageL(
-iInstIdList[aInstance]->Des(),
+iInstIdList[aInstance].iCid,
 contentType,
 key,
 aIcon,
 aIcon + 1,
 aMailBoxId,
 TBuf8<KMaxDescLen> key;
 key.Copy(KKeyMailboxIcons);
 key.Append(_L8("1"));
-User::LeaveIfNull( iInstIdList[aInstance] );
+if ( GetWidgetInstanceCount() <= aInstance ) User::LeaveIfError( KErrNotFound );
 PublishIconReferenceL(
-iInstIdList[aInstance]->Des(),
+iInstIdList[aInstance].iCid,
 contentType,
 key,
 aIconPath );
 }
 TFSMailMsgId mailBoxId;
 TFSMailMsgId folderId;
 iMailboxNameUid = PublishDescriptorL(
 KPubId, contentType,
-iInstIdList[aInstance]->Des(),
+iInstIdList[aInstance].iCid,
 aText,
 textKey, KNullDes8);
 }
 // ---------------------------------------------------------------------------
 }
 if (trigger.Compare(KSuspend16) == 0)
 {
 // Publishing to homescreen suspended.
 HBufC* cid = contentid.AllocLC();
-	                         TInt widgetInstance = FindWidgetInstanceId(cid->Des());
+TInt widgetInstance = GetWidgetInstanceId(cid->Des());
 							 if(widgetInstance>=0)
 	iAllowedToPublish[widgetInstance] = EFalse;
 CleanupStack::PopAndDestroy( cid );
 }
 else if (trigger.Compare(KResume16) == 0)
 {
 HBufC* cid = contentid.AllocLC();
-if ( FindWidgetInstanceId(cid->Des()) < 0 )
+if ( GetWidgetInstanceId(cid->Des()) < 0 )
 {
-iInstIdList.AppendL( contentid.AllocL() );
+TInstIdInfo instIdInfo;
+instIdInfo.iCid.Copy(cid->Des());
+instIdInfo.iUpdateNeeded = ETrue;
+instIdInfo.iWizardPublished = EFalse;
+iInstIdList.AppendL(instIdInfo);
 }
-TInt widgetInstance = FindWidgetInstanceId(cid->Des());
+TInt widgetInstance = GetWidgetInstanceId(cid->Des());
 if(widgetInstance>=0)// coverity fix, index can be negativ, allowed 0, since it is valid index
 {
-PublishSetupWizardL(widgetInstance);
 iMailCpsHandler->UpdateMailboxesL(widgetInstance, cid->Des());
+PublishSetupWizardL(widgetInstance);
 // Widget visible on the homescreen. Publishing allowed.
 iAllowedToPublish[widgetInstance] = ETrue;
 }
 CleanupStack::PopAndDestroy( cid );
 }
 {
 // Widget added to homescreen
 HBufC* cid = contentid.AllocLC();
 if ( cid->Length() > 0 )
 {
-iInstIdList.AppendL( contentid.AllocL() );
+TInstIdInfo instIdInfo;
+instIdInfo.iCid.Copy(cid->Des());
+instIdInfo.iUpdateNeeded = ETrue;
+instIdInfo.iWizardPublished = EFalse;
+iInstIdList.AppendL(instIdInfo);
 TFSMailMsgId mailBox( iMailCpsHandler->WaitingForNewWidget() );
 if ( mailBox.Id() > 0 )
 {
 // Associate new mailbox to widget setting
 iMailCpsHandler->AssociateWidgetToSetting(
 {
 // Widget removed from homescreen.
 HBufC* cid = contentid.AllocLC();
 ResetPublishedDataL( cid->Des() );
 iMailCpsHandler->DissociateWidgetFromSettingL( cid->Des() );
-TInt widgetInstance = FindWidgetInstanceId( cid->Des() );
+TInt widgetInstance = GetWidgetInstanceId( cid->Des() );
 if (widgetInstance != KErrNotFound )
 {
 iInstIdList.Remove(widgetInstance);
 }
 CleanupStack::PopAndDestroy( cid );
 return iInstIdList.Count();
 }
 // ---------------------------------------------------------------------------
-// CMailCpsIf::FindWidgetInstanceId
+// CMailCpsIf::GetWidgetInstanceId
 // ---------------------------------------------------------------------------
 //
-TInt CMailCpsIf::FindWidgetInstanceId( const TDesC& aContentId )
+TInt CMailCpsIf::GetWidgetInstanceId( const TDesC& aContentId )
 {
 FUNC_LOG;
 TInt instance(KErrNotFound);
 for (TInt i = 0; i < iInstIdList.Count(); i++)
 {
-TInt val = aContentId.Compare(iInstIdList[i]->Des());
+TInt val = aContentId.Compare(iInstIdList[i].iCid);
 if (!val)
 {
 instance = i;
 break;
 }
 {
 FUNC_LOG;
 for ( TInt i = 0; i < iInstIdList.Count(); i++ )
 {
-if ( !iMailCpsHandler->Associated(iInstIdList[i]->Des()) )
+if ( !iMailCpsHandler->Associated(iInstIdList[i].iCid) )
 {
 // Empty e-mail widget found. Associate new account to it.
 iMailCpsHandler->AssociateWidgetToSetting(
-iInstIdList[i]->Des(),
+iInstIdList[i].iCid,
 aMailbox );
 return;
 }
 }
 void CMailCpsIf::NotifyAppListChanged()
 {
 FUNC_LOG;
 }
+// ---------------------------------------------------------------------------
+// CMailCpsIf::SetUpdateNeeded
+// ---------------------------------------------------------------------------
+//
+void CMailCpsIf::SetUpdateNeeded( const TInt aInstance, const TBool aValue )
+{
+FUNC_LOG;
+iInstIdList[aInstance].iUpdateNeeded = aValue;
+}
+// ---------------------------------------------------------------------------
+// CMailCpsIf::UpdateNeeded
+// ---------------------------------------------------------------------------
+//
+TBool CMailCpsIf::UpdateNeeded( const TInt aInstance )
+{
+FUNC_LOG;
+return iInstIdList[aInstance].iUpdateNeeded;
+}

branch	RCL_3
changeset 14	b13141f05c3d
parent 13	8592a65ad3fb
child 16	b5fbb9b25d57