--- a/contentpublishingsrv/contentpublishingutils/pluginvalidator/src/charvesterpluginvalidator.cpp	Wed Jun 09 10:01:25 2010 +0300
+++ b/contentpublishingsrv/contentpublishingutils/pluginvalidator/src/charvesterpluginvalidator.cpp	Mon Jun 21 16:00:38 2010 +0300
@@ -1,30 +1,35 @@
 /*
-* Copyright (c) 2006 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:
+ * Copyright (c) 2006 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:
+ *
+ */
 
 #include <e32property.h>
 #include <ecom/ecom.h>
 #include <mmf/common/mmfcontrollerpluginresolver.h>
 #include <contentharvesterplugin.h> // harvesting plugin
-
 #include "charvesterpluginvalidator.h"
 #include "cblacklisthandler.h"
 
-const TUint32 KInProgressPropertyKey	= { 0x1028000E };
-const TUint32 KHarvesterUid	= { 0x10282E5A };
+const TUint32 KInProgressPropertyKey =
+    {
+    0x1028000E
+    };
+const TUint32 KHarvesterUid =
+    {
+    0x10282E5A
+    };
 
 // ======== MEMBER FUNCTIONS ========
 
@@ -32,12 +37,12 @@
 //
 // ----------------------------------------------------------------------------
 //
-EXPORT_C CHarvesterPluginValidator* CHarvesterPluginValidator::NewL( TUid aUid,
-                                                   TAny *aParameter )
+EXPORT_C CHarvesterPluginValidator* CHarvesterPluginValidator::NewL(
+        TUid aUid, TAny *aParameter)
     {
-    CHarvesterPluginValidator* self =
-          CHarvesterPluginValidator::NewLC( aUid , aParameter );
-    CleanupStack::Pop( self );
+    CHarvesterPluginValidator* self = CHarvesterPluginValidator::NewLC(aUid,
+            aParameter);
+    CleanupStack::Pop(self);
     return self;
     }
 
@@ -45,25 +50,24 @@
 //
 // ----------------------------------------------------------------------------
 //
-EXPORT_C CHarvesterPluginValidator* CHarvesterPluginValidator::NewLC( TUid aUid,
-                                                    TAny *aParameter )
+EXPORT_C CHarvesterPluginValidator* CHarvesterPluginValidator::NewLC(
+        TUid aUid, TAny *aParameter)
     {
-    CHarvesterPluginValidator* self = new( ELeave )
-        CHarvesterPluginValidator( aUid, aParameter );
-    CleanupStack::PushL( self );
+    CHarvesterPluginValidator* self = new (ELeave) CHarvesterPluginValidator(
+            aUid, aParameter);
+    CleanupStack::PushL(self);
     self->ConstructL();
     return self;
     }
 
-
-
 // ---------------------------------------------------------------------------
 // destructor
 // ---------------------------------------------------------------------------
 CHarvesterPluginValidator::~CHarvesterPluginValidator()
     {
-    iInProgressProperty.Close( );
+    iInProgressProperty.Close();
     delete iBlacklist;
+    delete iUpdateIdle;
     }
 
 // ----------------------------------------------------------------------------
@@ -71,11 +75,11 @@
 // ----------------------------------------------------------------------------
 //
 CHarvesterPluginValidator::CHarvesterPluginValidator(TUid aUid,
-    TAny* aParameter) :
+        TAny* aParameter) :
     CPluginValidator(aUid, aParameter)
-{
+    {
 
-}
+    }
 
 // ----------------------------------------------------------------------------
 //
@@ -84,45 +88,44 @@
 void CHarvesterPluginValidator::ConstructL()
     {
     iBlacklist = CBlacklistHandler::NewL();
+    iUpdateIdle = CIdle::NewL( CActive::EPriorityIdle );
+    iUpdateIdle->Start( TCallBack( UpdateCallback, this ) );
     CPluginValidator::ConstructL();
     }
 
-
 // ----------------------------------------------------------------------------
 //
 // ----------------------------------------------------------------------------
 //
 void CHarvesterPluginValidator::ManagePluginsL()
     {
-    TInt errorCode = iInProgressProperty.Define( TUid::Uid( KHarvesterUid ),
-            KInProgressPropertyKey, RProperty::EInt );
+    TInt errorCode = iInProgressProperty.Define(TUid::Uid(KHarvesterUid),
+            KInProgressPropertyKey, RProperty::EInt);
 
-    if ( KErrAlreadyExists == errorCode )
-      {
-      TInt value(-1);
-      iInProgressProperty.Get( TUid::Uid( KHarvesterUid ),
-            KInProgressPropertyKey, value);
-      if ( value == 1 )
+    if (KErrAlreadyExists == errorCode)
         {
-        // property value == inprogress
-        // there was a panic in the previous startup
-        // so we make unofficial blacklist official
-        iBlacklist->CopyBlacklistL( EFalse );
+        TInt value(-1);
+        iInProgressProperty.Get(TUid::Uid(KHarvesterUid),
+                KInProgressPropertyKey, value);
+        if (value == 1)
+            {
+            // property value == inprogress
+            // there was a panic in the previous startup
+            // so we make unofficial blacklist official
+            iBlacklist->CopyBlacklistL(EFalse);
+            }
         }
-      }
     else
-      {
-      User::LeaveIfError( errorCode );
-      }
+        {
+        User::LeaveIfError(errorCode);
+        }
     // copy blacklisted plugins to unoffical blacklist at startup
-    iBlacklist->CopyBlacklistL( ETrue );
+    iBlacklist->CopyBlacklistL(ETrue);
 
     // set property value to 1 (which means "in progress")
-    iInProgressProperty.Set( TUid::Uid( KHarvesterUid ),
-        KInProgressPropertyKey, 1 );
-
+    iInProgressProperty.Set(TUid::Uid(KHarvesterUid), KInProgressPropertyKey,
+            1);
     CPluginValidator::ManagePluginsL();
-
     // set property value to 0 (which means "finished")
     iInProgressProperty.Set( TUid::Uid( KHarvesterUid ),
         KInProgressPropertyKey, 0 );
@@ -132,32 +135,66 @@
 //
 // ----------------------------------------------------------------------------
 //
-void CHarvesterPluginValidator::LoadPluginL( TPluginInfo& aPluginInfo )
+void CHarvesterPluginValidator::LoadPluginL(TPluginInfo& aPluginInfo)
     {
-    if ( !iBlacklist->IsPresentL( aPluginInfo.iImplementationUid ) )
-      {
-      //first we append UID to the blacklist
-      iBlacklist->AppendL( aPluginInfo.iImplementationUid );
-      TAny* plug ( NULL );
-      TInt err( KErrNone );
-      TRAP( err, plug = REComSession::CreateImplementationL(
-                    aPluginInfo.iImplementationUid,
-                    aPluginInfo.iDtor_ID_Key, iParameter ) );
-      if( err==KErrNone && plug )
+    if (!iBlacklist->IsPresentL(aPluginInfo.iImplementationUid))
         {
-      TRAP_IGNORE(
-        CleanupStack::PushL( plug );
-        aPluginInfo.iPlugin = plug;
-        iPluginArray.AppendL( aPluginInfo );
-        CleanupStack::Pop( plug );
-           static_cast<CContentHarvesterPlugin*>( plug )->UpdateL()
-            );
+        //first we append UID to the blacklist
+        iBlacklist->AppendL(aPluginInfo.iImplementationUid);
+        TAny* plug(NULL);
+        TInt err(KErrNone);
+            TRAP( err, plug = REComSession::CreateImplementationL(
+                            aPluginInfo.iImplementationUid,
+                            aPluginInfo.iDtor_ID_Key, iParameter ) );
+        if (err == KErrNone && plug)
+            {
+                TRAP_IGNORE(
+                        CleanupStack::PushL( plug );
+                        aPluginInfo.iPlugin = plug;
+                        iPluginArray.AppendL( aPluginInfo );
+                        CleanupStack::Pop( plug );
+                );
+            }
+        //no panic during load so we can remove UID from blacklist
+        iBlacklist->RemoveL(aPluginInfo.iImplementationUid);
         }
-      //no panic during load so we can remove UID from blacklist
-      iBlacklist->RemoveL( aPluginInfo.iImplementationUid );
-      }
     }
 
+// ----------------------------------------------------------------------------
+//
+// ----------------------------------------------------------------------------
+//
+void CHarvesterPluginValidator::UpdatePluginsL()
+    {
+    // set property value to 1 (which means "in progress")
+    iInProgressProperty.Set(TUid::Uid(KHarvesterUid), KInProgressPropertyKey,
+            1);
+    for (TInt i = 0; i < iPluginArray.Count(); i++)
+        {
+        //first we append UID to the blacklist
+        iBlacklist->AppendL(iPluginArray[i].iImplementationUid);
 
+        TRAP_IGNORE( static_cast<CContentHarvesterPlugin*>
+                    ( iPluginArray[i].iPlugin )->UpdateL() );
 
+        //no panic during update so we can remove UID from blacklist
+        iBlacklist->RemoveL(iPluginArray[i].iImplementationUid);
+        }
+    // set property value to 0 (which means "finished")
+    iInProgressProperty.Set(TUid::Uid(KHarvesterUid), KInProgressPropertyKey,
+            0);
+    }
 
+// -----------------------------------------------------------------------------
+//
+// -----------------------------------------------------------------------------
+//  
+TInt CHarvesterPluginValidator::UpdateCallback( TAny* aValidator )
+    {
+    if ( aValidator )
+        {
+        TRAP_IGNORE( static_cast<CHarvesterPluginValidator*>(aValidator)->
+                UpdatePluginsL( ));
+        }
+    return KErrNone;
+    }