diff -r 92f864ef0288 -r ae54820ef82c iaupdate/IAD/ui/src/iaupdatefirsttimeinfo.cpp --- a/iaupdate/IAD/ui/src/iaupdatefirsttimeinfo.cpp Wed Jun 23 18:20:02 2010 +0300 +++ b/iaupdate/IAD/ui/src/iaupdatefirsttimeinfo.cpp Tue Jul 06 14:23:31 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2008 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" @@ -20,7 +20,6 @@ //INCLUDES #include "iaupdatefirsttimeinfo.h" -#include "iaupdatefirsttimedatefile.h" #include // bafl.lib #include // estor.lib @@ -108,19 +107,8 @@ iAgreementAccepted = ETrue; WriteDataL(); } - -// --------------------------------------------------------------------------- -// CIAUpdateFirstTimeInfo::SetAgreementAskedL -// Set Nokia agreement as asked (prompted) to an user -// --------------------------------------------------------------------------- -// -void CIAUpdateFirstTimeInfo::SetAgreementAskedL() - { - ReadDataL(); - iAgreementAsked = ETrue; - WriteDataL(); - } - + + // --------------------------------------------------------------------------- // CIAUpdateFirstTimeInfo::SetAutomaticUpdatesAskedL // Set automatic update checks as prompted to an use @@ -132,26 +120,6 @@ iAutomaticUpdateChecksAsked = ETrue; WriteDataL(); } - -// --------------------------------------------------------------------------- -// CIAUpdateFirstTimeInfo::SetFirstTimeIfNotSetL -// -// --------------------------------------------------------------------------- -// -void CIAUpdateFirstTimeInfo::SetFirstTimeIfNotSetL() - { - if ( !AutomaticUpdateChecksAskedL() ) - { - CIAUpdateFirstTimeDateFile* firstTimeDateFile = - CIAUpdateFirstTimeDateFile::NewLC( KIAUpdateFirstTimeDateFile ); - if ( firstTimeDateFile->FirstTime().Int64() == 0 ) - { - firstTimeDateFile->SetCurrentFirstTime(); - firstTimeDateFile->WriteDataL(); - } - CleanupStack::PopAndDestroy( firstTimeDateFile ); - } - } // --------------------------------------------------------------------------- // CIAUpdateFirstTimeInfo::AgreementAcceptedL @@ -164,18 +132,6 @@ return iAgreementAccepted; } - -// --------------------------------------------------------------------------- -// CIAUpdateFirstTimeInfo::AgreementAskedL -// Is Nokia agreement of Application Update already asked -// --------------------------------------------------------------------------- -// -TBool CIAUpdateFirstTimeInfo::AgreementAskedL() - { - ReadDataL(); - return iAgreementAsked; - } - // --------------------------------------------------------------------------- // CIAUpdateFirstTimeInfo::AutomaticUpdateChecksAskedL // Is activation for automatic update cheks from network already asked @@ -187,37 +143,6 @@ return iAutomaticUpdateChecksAsked; } -// --------------------------------------------------------------------------- -// CIAUpdateFirstTimeInfo::FirstTimeDelayL -// -// --------------------------------------------------------------------------- -// -TBool CIAUpdateFirstTimeInfo::FirstTimeDelayL() - { - TBool firstTimeDelay = EFalse; - if ( !AutomaticUpdateChecksAskedL() ) - { - CIAUpdateFirstTimeDateFile* firstTimeDateFile = - CIAUpdateFirstTimeDateFile::NewL( KIAUpdateFirstTimeDateFile ); - - TTime firstTime( firstTimeDateFile->FirstTime() ); - - delete firstTimeDateFile; - - TTime expireTime( firstTime ); - - expireTime += KFirstTimeDelayInDays; - - TTime universalTime; - universalTime.UniversalTime(); - - if ( universalTime < expireTime && universalTime >= firstTime ) - { - firstTimeDelay = ETrue; - } - } - return firstTimeDelay; - } // ----------------------------------------------------------------------------- // CIAUpdateFirstTimeInfo::ReadDataL @@ -231,7 +156,6 @@ if ( err == KErrNotFound ) { iAgreementAccepted = EFalse; - iAgreementAsked = EFalse; iAutomaticUpdateChecksAsked = EFalse; } else @@ -282,7 +206,6 @@ void CIAUpdateFirstTimeInfo::InternalizeL( RReadStream& aStream ) { iAgreementAccepted = aStream.ReadInt32L(); - iAgreementAsked = aStream.ReadInt32L(); iAutomaticUpdateChecksAsked = aStream.ReadInt32L(); } @@ -295,7 +218,6 @@ void CIAUpdateFirstTimeInfo::ExternalizeL( RWriteStream& aStream ) { aStream.WriteInt32L( iAgreementAccepted ); - aStream.WriteInt32L( iAgreementAsked ); aStream.WriteInt32L( iAutomaticUpdateChecksAsked ); }