diff -r 5cc91383ab1e -r 7333d7932ef7 iaupdate/IAD/backgroundchecker/inc/iaupdatebgrefreshtimer.h --- a/iaupdate/IAD/backgroundchecker/inc/iaupdatebgrefreshtimer.h Thu Aug 19 10:02:49 2010 +0300 +++ b/iaupdate/IAD/backgroundchecker/inc/iaupdatebgrefreshtimer.h Tue Aug 31 15:21:33 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2008-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" @@ -26,15 +26,17 @@ #include #include -#include "iaupdatebgremindertimer.h" + +#include "iaupdatebginternalfilehandler.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; @@ -49,8 +51,8 @@ class CIAUpdateBGTimer : public CTimer, public MIAUpdateObserver, public MCenRepNotifyHandlerCallback, - public MIAUpdateBGSoftNotificationCallBack, - public MIAUpdateBGReminderTimerCallBack + public MIAUpdateBGSoftNotificationCallBack, + public MIAUpdateBGNotifyObserver { public: @@ -83,6 +85,10 @@ public: //MReminderTimerCallBack void ReminderTimerCallBack(); + + private: // From MIAUpdateBGNotifyObserver + + void HandleIndicatorRemoveL(); private: @@ -121,9 +127,7 @@ TTimeIntervalMinutes TimeIntervalFromNextShowOfNewFeatureDialogL(); TBool IsAgreementAcceptedL(); - - TBool IsAskedAlreadyL(); - + void HandlerFirstTimeL(); TTime GetLastTimeShowNewFeatureDialogL(); @@ -134,27 +138,21 @@ 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 LaunchSoftNotificationL( const TInt& aResourceId, const TInt& SK1, const TInt& SK2 ); + void LaunchNotificationL( const int aNrOfUpdates ); TBool IsAutoUpdateDisabledL(); @@ -168,18 +166,8 @@ 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(); @@ -188,7 +176,6 @@ // Data CIAUpdate* iUpdate; CIAUpdateParameters* iParameters; - CIAUpdateBGReminderTimer* iReminderTimer; CRepository* iIAUpdateCRSession; CCenRepNotifyHandler* iNotifyHandler; TInt iRuns; @@ -197,8 +184,8 @@ CIAUpdateBGInternalFileHandler* iInternalFile; TIAUpdateBGMode iMode; CIAUpdateBGSoftNotification* iSoftNotification; - RResourceFile iResourceFile; - RFs iFs; + + CIAUpdateBGNotifyHandler* iIndicatorNotifyHandler; }; #endif //IAUPDATEBGREFRESHTIMER_H