FCL/sf/mw/appinstall: comparison appinstaller/AppinstUi/sisxsifplugin/src/sisxsifpluginactiveimpl.cpp

equal deleted inserted replaced

-:d1838696558c
+:9dcba1ee99f7
 #include <featmgr.h>                        // FeatureManager
 #include <syslangutil.h>                    // GetInstalledLanguages
 // TODO: replace with proper logging
 #ifdef _DEBUG
-#define FLOG(x)         RDebug::Print(x);
+#define FLOG(x)         RDebug::Print(x)
-#define FLOG_1(x,y)     RDebug::Print(x, y);
+#define FLOG_1(x,y)     RDebug::Print((x),(y))
-#define FLOG_2(x,y,z)   RDebug::Print(x, y, z);
+#define FLOG_2(x,y,z)   RDebug::Print((x),(y),(z))
-#define FLOG_3(x,y,z,v) RDebug::Print(x, y, z, v);
+#define FLOG_3(x,y,z,v) RDebug::Print((x),(y),(z),(v))
 #else
 #define FLOG(x)
 #define FLOG_1(x,y)
 #define FLOG_2(x,y,z)
 #define FLOG_3(x,y,z,v)
 void CSisxSifPluginActiveImpl::DoUninstallL( TComponentId aComponentId,
 		const COpaqueNamedParams& aInputParams, COpaqueNamedParams& aOutputParams,
 		TRequestStatus& aStatus )
 {
 CommonRequestPreambleL( aInputParams, aOutputParams, aStatus );
+FLOG_1( _L("CSisxSifPluginActiveImpl::DoUninstallL, IsSilentMode=%d"), IsSilentMode() );
 TUid uid;
 CComponentEntry *entry = CComponentEntry::NewLC();
 GetComponentAndUidL( aComponentId, *entry, uid );
 iUiHandler->PublishStartL( *entry, EUninstalling );
 //
 void CSisxSifPluginActiveImpl::DoActivateL( TComponentId aComponentId,
 TRequestStatus& aStatus )
 {
 CommonRequestPreambleL( aStatus );
+FLOG( _L("CSisxSifPluginActiveImpl::DoActivateL()") );
 Swi::RSisRegistryWritableSession sisRegSession;
 User::LeaveIfError( sisRegSession.Connect() );
 CleanupClosePushL( sisRegSession );
 sisRegSession.ActivateComponentL( aComponentId );
 //
 void CSisxSifPluginActiveImpl::DoDeactivateL( TComponentId aComponentId,
 TRequestStatus& aStatus )
 {
 CommonRequestPreambleL( aStatus );
+FLOG( _L("CSisxSifPluginActiveImpl::DoDeactivateL()") );
 Swi::RSisRegistryWritableSession sisRegSession;
 User::LeaveIfError( sisRegSession.Connect() );
 CleanupClosePushL( sisRegSession );
 sisRegSession.DeactivateComponentL( aComponentId );
 // CSisxSifPluginActiveImpl::GetLastInstalledComponentIdL()
 // ---------------------------------------------------------------------------
 //
 TComponentId CSisxSifPluginActiveImpl::GetLastInstalledComponentIdL()
 {
+FLOG( _L("CSisxSifPluginActiveImpl::GetLastInstalledComponentIdL, begin") );
 __ASSERT_DEBUG( iOperation == EInstall, Panic( ESisxSifInternalError ) );
 // Find the id of the last installed component and return it
 TInt uid;
 User::LeaveIfError( RProperty::Get( KUidSystemCategory, KUidSwiLatestInstallation, uid ) );
 TUid tuid( TUid::Uid( uid ) );
 TComponentId componentId = sisRegistrySession.GetComponentIdForUidL( tuid );
 CleanupStack::PopAndDestroy( &sisRegistrySession );
+FLOG_1( _L("CSisxSifPluginActiveImpl::GetLastInstalledComponentIdL, ret 0x%08x"), componentId );
 return componentId;
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::GetComponentAndUidL()
 // CSisxSifPluginActiveImpl::SetInstallPrefsRevocationServerUriL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::SetInstallPrefsRevocationServerUriL( const TDesC& aUri )
 {
+FLOG_1( _L("CSisxSifPluginActiveImpl::SetInstallPrefsRevocationServerUriL '%S'"), &aUri );
 if( aUri.Length() )
 {
 HBufC8* uriBuf = HBufC8::NewLC( aUri.Length() );
 TPtr8 uri( uriBuf->Des() );
 uri.Copy( aUri );
 // CSisxSifPluginActiveImpl::UpdateInstallPrefsForPerformingOcspL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::UpdateInstallPrefsForPerformingOcspL()
 {
-if( IsSilentMode() )
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateInstallPrefsForPerformingOcspL") );
-{
-TBool performOcsp( iInstallParams->PerformOCSP() != ENotAllowed );
+TBool performOcsp = EFalse;
-iInstallPrefs->SetPerformRevocationCheck( performOcsp );
+/*
+* performOcsp decision table:
-if( performOcsp )
+*
+* KSWInstallerOcspProcedure settings:
+*                 |  Must    |  On      |  Off     |  Undefined  |
+* ----------------+----------+----------+----------+-------------+
+* Normal install: |  ETrue   |  ETrue   |  EFalse  |  EFalse     |
+* ----------------+----------+----------+----------+-------------+
+* Silent install having KSifInParam_PerformOCSP value:           |
+* - EAllowed      |  ETrue   |  ETrue   |  EFalse  |  EFalse     |
+* - ENotAllowed   |  ETrue   |  EFalse  |  EFalse  |  EFalse     |
+* - EUserConfirm  |  ETrue   |  ETrue   |  EFalse  |  EFalse     |
+* - undefined     |  ETrue   |  ETrue   |  EFalse  |  EFalse     |
+* ----------------+----------+----------+----------+-------------+
+*/
+CRepository* cenRep = CRepository::NewLC( KCRUidSWInstallerSettings );
+TInt ocspProcedure = ESWInstallerOcspProcedureOff;
+cenRep->Get( KSWInstallerOcspProcedure, ocspProcedure );    // return value ignored
+FLOG_1( _L("CSisxSifPluginActiveImpl::UpdateInstallPrefsForPerformingOcspL, ocspProcedure=%d"),
+ocspProcedure );
+switch( ocspProcedure )
+{
+case ESWInstallerOcspProcedureMust:
+performOcsp = ETrue;
+break;
+case ESWInstallerOcspProcedureOn:
+if( IsSilentMode() )
+{
+performOcsp = ( iInstallParams->PerformOCSP() != ENotAllowed );
+}
+else
+{
+performOcsp = ETrue;
+}
+break;
+case ESWInstallerOcspProcedureOff:
+default:
+// already EFalse
+break;
+}
+FLOG_1( _L("CSisxSifPluginActiveImpl::UpdateInstallPrefsForPerformingOcspL, performOcsp=%d"),
+performOcsp );
+if( performOcsp )
+{
+if( IsSilentMode() && iInstallParams->OCSPUrl().Length() )
 {
 SetInstallPrefsRevocationServerUriL( iInstallParams->OCSPUrl() );
 }
-}
+else
-else
-{
-CRepository* cenRep = CRepository::NewLC( KCRUidSWInstallerSettings );
-TInt ocspProcedure = ESWInstallerOcspProcedureOff;
-(void)cenRep->Get( KSWInstallerOcspProcedure, ocspProcedure );
-TBool performOcsp( ocspProcedure != ESWInstallerOcspProcedureOff );
-iInstallPrefs->SetPerformRevocationCheck( performOcsp );
-if( performOcsp )
 {
 HBufC* ocspUrlBuf = HBufC::NewLC(
 NCentralRepositoryConstants::KMaxUnicodeStringLength );
 TPtr ocspUrl( ocspUrlBuf->Des() );
-(void)cenRep->Get( KSWInstallerOcspDefaultURL, ocspUrl );
+cenRep->Get( KSWInstallerOcspDefaultURL, ocspUrl );     // return value ignored
 SetInstallPrefsRevocationServerUriL( ocspUrl );
 CleanupStack::PopAndDestroy( ocspUrlBuf );
 }
+}
-CleanupStack::PopAndDestroy( cenRep );
-}
+CleanupStack::PopAndDestroy( cenRep );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::StartInstallingL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::StartInstallingL()
 {
+FLOG( _L("CSisxSifPluginActiveImpl::StartInstallingL, begin") );
 	const CComponentInfo::CNode& rootNode( iComponentInfo->RootNodeL() );
 	TBool driveSelection = rootNode.DriveSeletionRequired();
 	iUiHandler->SetDriveSelectionRequired( driveSelection );
 	TInt maxInstalledSize = rootNode.MaxInstalledSize();
 	iUiHandler->SetMaxInstalledSize( maxInstalledSize );
 Panic( ESisxSifInternalError );
 }
 iPhase = ERunningOperation;
 SetActive();
+FLOG( _L("CSisxSifPluginActiveImpl::StartInstallingL, end") );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::StartSilentInstallingL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::StartSilentInstallingL()
 {
+FLOG( _L("CSisxSifPluginActiveImpl::StartSilentInstallingL, begin") );
 // TODO: fix this, removed temporarily to allow installations
 #ifdef _NOT_DEFINED_
 const CComponentInfo::CNode& rootNode( iComponentInfo->RootNodeL() );
 TBool isAuthenticated = ( rootNode.Authenticity() == EAuthenticated );
 else
 #endif
 {
 StartInstallingL();
 }
+FLOG( _L("CSisxSifPluginActiveImpl::StartSilentInstallingL, end") );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::FinalizeInstallationL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::FinalizeInstallationL()
 {
+FLOG( _L("CSisxSifPluginActiveImpl::FinalizeInstallationL, begin") );
 UpdateStartupListL();
 if( iOutputParams )
 {
 TComponentId componentId = GetLastInstalledComponentIdL();
 iOutputParams->AddIntL( KSifOutParam_ComponentId, componentId );
 }
 iUiHandler->PublishCompletionL();
 	iUiHandler->DisplayCompleteL();
+	FLOG( _L("CSisxSifPluginActiveImpl::FinalizeInstallationL, end") );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::UpdateStartupListL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::UpdateStartupListL()
 {
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, begin") );
 if( FeatureManager::FeatureSupported( KFeatureIdExtendedStartup ) )
 {
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, KFeatureIdExtendedStartup") );
 TFullName name( KStartupListUpdaterName );
 name.Append( '*' );
 TFindProcess findProcess( name );
 if( findProcess.Next( name ) == KErrNone )
 {
 // already running, no need to do anything
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, startuplistupdater running") );
 return;
 }
 RProcess process;
 CleanupClosePushL( process );
 TInt result = process.Create( KStartupListUpdaterExecutable, KNullDesC );
+FLOG_1( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, create result=%d"), result );
 if( result == KErrNone )
 {
 TRequestStatus rendezvousStatus;
 process.Rendezvous( rendezvousStatus );
 // start process and wait until it is started
 process.Resume();
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, waiting for rendezvous") );
 User::WaitForRequest( rendezvousStatus );
 // ignore possible errors
 result = rendezvousStatus.Int();
+FLOG_1( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, result=%d"), result );
 }
 CleanupStack::PopAndDestroy( &process );
 }
+FLOG( _L("CSisxSifPluginActiveImpl::UpdateStartupListL, end") );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::FillDeviceSupportedLanguagesL()
 // ---------------------------------------------------------------------------

changeset 80	9dcba1ee99f7
parent 69	b18a4bf55ddb