diff -r 7333d7932ef7 -r 8b7f4e561641 iaupdate/IAD/backgroundchecker/src/iaupdatebginternalfilehandler.cpp --- a/iaupdate/IAD/backgroundchecker/src/iaupdatebginternalfilehandler.cpp Tue Aug 31 15:21:33 2010 +0300 +++ b/iaupdate/IAD/backgroundchecker/src/iaupdatebginternalfilehandler.cpp Wed Sep 01 12:22:02 2010 +0100 @@ -15,6 +15,9 @@ * */ + + + #include #include #include @@ -64,7 +67,7 @@ // CIAUpdateBGInternalFileHandler::CIAUpdateBGInternalFileHandler() : iLastTimeShowNewFeatureDialog( 0 ), iUserRejectNewFeatureDialog( EFalse ), - iMode( EFirstTimeMode ), iFwVersion( NULL ), + iNextRemindTime(0), iIsReminderOn( EFalse ), iMode( EFirstTimeMode ), iFwVersion( NULL ), iSNID(0), iRetryTimes(0) { } @@ -212,6 +215,62 @@ iUserRejectNewFeatureDialog = aUserDecision; } + +// ----------------------------------------------------------------------------- +// CIAUpdateBGInternalFileHandler::ReminderOn +// +// ----------------------------------------------------------------------------- +// +TBool CIAUpdateBGInternalFileHandler::ReminderOn() + { + return iIsReminderOn; + } + + +// ----------------------------------------------------------------------------- +// CIAUpdateBGInternalFileHandler::SetReminder +// +// ----------------------------------------------------------------------------- +// +void CIAUpdateBGInternalFileHandler::SetReminder( TBool aOn ) + { + iIsReminderOn = aOn; + } + + +// ----------------------------------------------------------------------------- +// CIAUpdateBGInternalFileHandler::NextRemindTime +// +// ----------------------------------------------------------------------------- +// +TTime CIAUpdateBGInternalFileHandler::NextRemindTime() + { + return iNextRemindTime; + } + + +// ----------------------------------------------------------------------------- +// CIAUpdateBGInternalFileHandler::SetNextRemindTime +// +// ----------------------------------------------------------------------------- +// +void CIAUpdateBGInternalFileHandler::SetNextRemindTime( TTime aNextRemindTime ) + { + iNextRemindTime = aNextRemindTime; + } + + +// ----------------------------------------------------------------------------- +// CIAUpdateBGInternalFileHandler::SetNextRemindTime +// +// ----------------------------------------------------------------------------- +// +void CIAUpdateBGInternalFileHandler::SetNextRemindTime( TInt64 aNextRemindTime ) + { + iNextRemindTime = aNextRemindTime; + } + + // ----------------------------------------------------------------------------- // CIAUpdateBGInternalFileHandler::SetMode // @@ -222,6 +281,7 @@ iMode = aMode; } + // ----------------------------------------------------------------------------- // CIAUpdateBGInternalFileHandler::Mode // @@ -232,6 +292,7 @@ return iMode; } + // ----------------------------------------------------------------------------- // CIAUpdateBGInternalFileHandler::FwVersion // @@ -242,6 +303,7 @@ return iFwVersion; } + // ---------------------------------------------------------- // CIAUpdateBGInternalFileHandler::SetFwVersionL() // ---------------------------------------------------------- @@ -303,26 +365,6 @@ } // ----------------------------------------------------------------------------- -// CIAUpdateBGInternalFileHandler::NrOfIndicatorEntries -// -// ----------------------------------------------------------------------------- -// -TInt CIAUpdateBGInternalFileHandler::NrOfIndicatorEntries() - { - return iNrOfIndicatiorEntries; - } - - -// ----------------------------------------------------------------------------- -// CIAUpdateBGInternalFileHandler::SetNrOfIndicatorEntries -// -// ----------------------------------------------------------------------------- -// -void CIAUpdateBGInternalFileHandler::SetNrOfIndicatorEntries( TInt aEntries ) - { - iNrOfIndicatiorEntries = aEntries; - } -// ----------------------------------------------------------------------------- // CIAUpdateBGInternalFileHandler::InternalizeL // // ----------------------------------------------------------------------------- @@ -340,6 +382,14 @@ // Static casting is safe to do here because enum and TInt are the same. SetUserRejectNewFeatureDialog( static_cast< TBool >( userDecision ) ); + TInt64 nextRemindTime( 0 ); + aStream >> nextRemindTime; + SetNextRemindTime( nextRemindTime ); + + TInt remindOn( aStream.ReadUint8L() ); + // Static casting is safe to do here because enum and TInt are the same. + SetReminder( static_cast< TBool >( remindOn ) ); + TInt mode( aStream.ReadUint8L() ); SetMode( static_cast (mode) ); @@ -355,10 +405,6 @@ TInt retry ( aStream.ReadUint8L() ); SetRetryTimes( retry ); - - TInt entries ( aStream.ReadUint8L() ); - SetNrOfIndicatorEntries( entries ); - } @@ -378,6 +424,12 @@ TInt userDecision ( UserRejectNewFeatureDialog() ); aStream.WriteUint8L( userDecision ); + TInt64 nextRemindTime( NextRemindTime().Int64() ); + aStream << nextRemindTime; + + TInt remindOn ( ReminderOn() ); + aStream.WriteUint8L( remindOn ); + TInt mode( Mode() ); aStream.WriteUint8L( mode ); @@ -391,10 +443,6 @@ TInt retry ( RetryTimes() ); aStream.WriteUint8L( retry ); - - TInt entries ( NrOfIndicatorEntries() ); - aStream.WriteUint8L( entries ); - } //EOF