--- a/iaupdate/IAD/backgroundchecker/inc/iaupdatebgrefreshtimer.h	Tue Aug 31 15:21:33 2010 +0300
+++ b/iaupdate/IAD/backgroundchecker/inc/iaupdatebgrefreshtimer.h	Wed Sep 01 12:22:02 2010 +0100
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2008-2009 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"
@@ -26,17 +26,15 @@
 #include <iaupdateobserver.h>
 #include <barsc.h>
 
-
-#include "iaupdatebginternalfilehandler.h"
+#include "iaupdatebgremindertimer.h"
 #include "iaupdatebgcontrollerfile.h"
 #include "iaupdatebgsoftnotification.h"
 #include "iaupdatebgcheckermode.h"
 
-#include "iaupdatebgnotifyhandler.h"
-
 // FORWARD DECLARATIONS
 class CIAUpdate;
 class CIAUpdateParameters;
+class CAknSoftNotifier;
 class CInternalFileHandler;
 class CIdleObserver;
 
@@ -51,8 +49,8 @@
 class CIAUpdateBGTimer : public CTimer, 
                  public MIAUpdateObserver, 
                  public MCenRepNotifyHandlerCallback, 
-                 public MIAUpdateBGSoftNotificationCallBack,
-                 public MIAUpdateBGNotifyObserver
+                 public MIAUpdateBGSoftNotificationCallBack, 
+                 public MIAUpdateBGReminderTimerCallBack
             
     {
     public:
@@ -85,10 +83,6 @@
     public: //MReminderTimerCallBack
 
         void ReminderTimerCallBack();
-    
-    private: // From MIAUpdateBGNotifyObserver   
-
-         void HandleIndicatorRemoveL();
         
     private:
     
@@ -127,7 +121,9 @@
         TTimeIntervalMinutes TimeIntervalFromNextShowOfNewFeatureDialogL();
         
         TBool IsAgreementAcceptedL();
-       
+        
+        TBool IsAskedAlreadyL();
+        
         void HandlerFirstTimeL();
         
         TTime GetLastTimeShowNewFeatureDialogL();
@@ -138,21 +134,27 @@
  
         TInt SetUserDecisionL( TBool aDecision );
         
+        TBool ReminderOnL();
+
+        TInt SetReminderL( TBool aOn );
+        
+        TTime NextRemindTimeL();
+
+        TInt SetNextRemindTimeL( TTime aTime );
+        
         TIAUpdateBGMode ModeL();
 
         TInt SetModeL( TIAUpdateBGMode aMode );
         
-        TInt NrOfIndicatorEntries();
-
-        TInt SetNrOfIndicatorEntriesL( TInt aEntries );
-        
         TInt RetryTimesL();
 
         TInt SetRetryTimesL( TInt aRetry );
           
+        HBufC* ReadResourceLC( TInt aResourceId );
+        
         void StartIaupdateL() const;
         
-        void LaunchNotificationL( const int aNrOfUpdates );
+        void LaunchSoftNotificationL( const TInt& aResourceId, const TInt& SK1, const TInt& SK2 );
         
         TBool IsAutoUpdateDisabledL();
         
@@ -166,8 +168,18 @@
         
         void DoSoftNotificationCallBackL( TBool aIsAccepted );
         
+        void DoReminderTimerCallBackL();
+        
         void StartUpdatesCheckingL();    
         
+        HBufC8* LoadFileLC(const TDesC& aFile);
+        
+        TInt GetPrivatePathL( TFileName& aPath );
+        
+        TInt SetSessionPrivatePathL( RFs& aFs, const TDesC& aPath ) const;
+        
+        void SetPrivateDriveL( RFs& aFs, const TDesC& aFileName ) const;
+        
         TBool IAUpdateEnabledL() const;
         
         void Shutdown();
@@ -176,6 +188,7 @@
         // Data       
         CIAUpdate* iUpdate; 
         CIAUpdateParameters* iParameters; 
+        CIAUpdateBGReminderTimer* iReminderTimer;
         CRepository* iIAUpdateCRSession; 
         CCenRepNotifyHandler* iNotifyHandler; 
         TInt iRuns;
@@ -184,8 +197,8 @@
         CIAUpdateBGInternalFileHandler* iInternalFile;
         TIAUpdateBGMode iMode;
         CIAUpdateBGSoftNotification* iSoftNotification;
-        
-        CIAUpdateBGNotifyHandler* iIndicatorNotifyHandler;
+        RResourceFile iResourceFile;
+        RFs iFs;
     };        
 
 #endif //IAUPDATEBGREFRESHTIMER_H