--- a/contentstorage/srvinc/caprogressnotifier.h	Fri Jun 11 16:13:51 2010 +0300
+++ b/contentstorage/srvinc/caprogressnotifier.h	Thu Jun 24 16:18:29 2010 +0300
@@ -20,100 +20,13 @@
 
 #include <e32base.h>
 #include <usif/sif/sifnotification.h>
+#include <usif/usifcommon.h> 
+
 #include "castorage_global.h"
 using namespace Usif; 
 
 class CCaStorageProxy;
-
-// needed for fake notifier
-#include "cainstallnotifier.h"
-
-/**
- * Interface for updating after installer events.
- */
-class MCaFakeProgressListener
-    {
-public:
-    /**
-     * Pure virtual method.
-     * @param aEvent event type.
-     */
-    virtual void HandleFakeProgressNotifyL(TInt aCurrentProgress) = 0;
-    };
-
-/**
- *  Fake Install notifier.
- *
- *  @since S60 v5.0
- */
-NONSHARABLE_CLASS( CCaFakeProgressNotifier ) : public CActive
-    {
-public:
-
-/**
-     * Creates an instance of CCaFakeProgressNotifier.
-     * @param aListener Reference to notifier interface.
-     */
-IMPORT_C static CCaFakeProgressNotifier* NewL( MCaFakeProgressListener& aListener);
-
-    /**
-     * Destructor.
-     */
-    virtual ~CCaFakeProgressNotifier();
-
-    /**
-     * Starts fake progress notifications.
-     */
-    void StartNotifying();
-    
-private:
-
-    /**
-     * Constructor.
-     * @param aListener Reference to notifier interface.
-     */
-    CCaFakeProgressNotifier( MCaFakeProgressListener& aListener );
-
-    /**
-     * Symbian 2nd phase constructor.
-    */
-    void ConstructL( );
-
-    /**
-     * From CActive.
-     */ 
-    void DoCancel();
-
-    /**
-     * From CActive.
-     */ 
-    void RunL();
-
-    /**
-     * From CActive.
-     */ 
-    TInt RunError( TInt aError );
-
-private:
-
-    /**
-     * Interface for fake notifications
-     * Not Own.
-     */
-    MCaFakeProgressListener& iListener;
-    
-    /**
-     * Timer
-     */
-    RTimer iTimer;
-    
-    /**
-     * Counter for fake notifications
-     */
-    TInt iCount;
-
-    };
-
+class CCaInnerEntry;
 
 /**
  *  Uninstall Progress notifier.
@@ -121,9 +34,7 @@
  *  @since S60 v5.0
  */
 NONSHARABLE_CLASS( CCaProgressNotifier ) : public CBase, 
-        //public MSifOperationsHandler, // USIF not working yet
-        public MCaInstallListener,      //needed for fake
-        public MCaFakeProgressListener  //needed for fake
+        public MSifOperationsHandler
     {
 
 public:
@@ -143,13 +54,18 @@
     /**
      * Constructor.
      */
-    CCaProgressNotifier( );
+    CCaProgressNotifier( CCaStorageProxy& aCaStorageProxy );
 
     /**
      * Symbian 2nd phase constructor.
      * @param aCaStorageProxy Reference to storage.
      */
-    void ConstructL( CCaStorageProxy& aCaStorageProxy );
+    void ConstructL( );
+    
+    void UpdateProgressL( const CSifOperationProgressData& aProgressData );
+    void EndOperationL(TInt aError);
+    TComponentId ComponentIdL(const TDesC& aGlobalComponentId, const TDesC& aSwType);
+    void MarkEntrysForUnistallL(TUint aKey, TComponentId aComponentId);
 
 public:
     /**
@@ -167,18 +83,6 @@
      */
     void ProgressOperationHandler(const CSifOperationProgressData& aProgressData);
     
-public:
-
-    /**
-     * From MCaInstallListener, needed for fake
-     */
-    void HandleInstallNotifyL( TInt aUid );
-     
-    /**
-     * From MCaFakeProgressListener, needed for fake
-     */
-    void HandleFakeProgressNotifyL(TInt aCurrentProgress);
-    
 private:
 
     /**
@@ -188,28 +92,17 @@
      * Commented out since USIF notifications do not
      * work on MCL wk20
      */
-    //CSifOperationsNotifier* iNotifier;
+    CSifOperationsNotifier* iNotifier;
     
     /**
      * Not Own.
      * Reference to the Storage Proxy.
      */
-    CCaStorageProxy* iStorageProxy;
-
-    /**
-     * Uninstall notifier. Own. Needed for fake
-     */
-    CCaInstallNotifier *iUsifUninstallNotifier;
-
-    /**
-     * Install and uninstall notifier. Own. Needed for fake
-     */
-    CCaInstallNotifier *iJavaInstallNotifier;
+    CCaStorageProxy& iStorageProxy;
     
-    /**
-     * Fake uninstall progress notifier. Own. Needed for fake
-     */
-    CCaFakeProgressNotifier *iFakeProgressNotifier;
+    RPointerArray<CCaInnerEntry> iResultArrayItems;
+    
+    TUint iKey;
     
     };