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

equal deleted inserted replaced

-:8110bf1194d1
+:6e7b00453237
 *
 * Description: Native SISX SIF (Software Install Framework) plugin.
 *
 */
-#include "sisxsifpluginactiveimpl.h"    // CSisxSifPluginActiveImpl
+#include "sisxsifpluginactiveimpl.h"        // CSisxSifPluginActiveImpl
-#include "sisxsifpluginuihandler.h"     // CSisxSifPluginUiHandler
+#include "sisxsifpluginuihandlerbase.h"     // CSisxSifPluginUiHandlerBase
-#include "sisxsifpluginuihandlersilent.h" // CSisxSifPluginUiHandlerSilent
+#include "sisxsifpluginuihandler.h"         // CSisxSifPluginUiHandler
-#include "sisxsifcleanuputils.h"        // CleanupResetAndDestroyPushL
+#include "sisxsifpluginuihandlersilent.h"   // CSisxSifPluginUiHandlerSilent
-#include "sisxsifplugin.pan"            // Panic codes
+#include "sisxsifplugininstallparams.h"     // CSisxSifPluginInstallParams
-#include <usif/sif/sifcommon.h>         // Usif::CComponentInfo
+#include "sisxsifcleanuputils.h"            // CleanupResetAndDestroyPushL
-#include <usif/scr/scr.h>               // RSoftwareComponentRegistry
+#include "sisxsifplugin.pan"                // Panic codes
-#include <usif/usiferror.h>             // SIF error codes
+#include <usif/sif/sifcommon.h>             // Usif::CComponentInfo
-#include <swi/sisinstallerrors.h>       // SWI error codes
+#include <usif/scr/scr.h>                   // RSoftwareComponentRegistry
-#include <swi/asynclauncher.h>          // Swi::CAsyncLauncher
+#include <usif/usiferror.h>                 // SIF error codes
-#include <swi/sisregistrysession.h>     // RSisRegistrySession
+#include <swi/sisinstallerrors.h>           // SWI error codes
-#include "sisregistrywritablesession.h" // RSisRegistryWritableSession
+#include <swi/asynclauncher.h>              // Swi::CAsyncLauncher
-#include <e32property.h>                // RProperty
+#include <swi/sisregistrysession.h>         // RSisRegistrySession
-#include <sacls.h>                      // KUidSwiLatestInstallation
+#include "sisregistrywritablesession.h"     // RSisRegistryWritableSession
-#include <featmgr.h>                    // FeatureManager
+#include <e32property.h>                    // RProperty
+#include <sacls.h>                          // KUidSwiLatestInstallation
+#include <featmgr.h>                        // FeatureManager
 // TODO: replace with proper logging
 #ifdef _DEBUG
 #define FLOG(x)         RDebug::Print(x);
 #define FLOG_1(x,y)     RDebug::Print(x, y);
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::NewL()
 // ---------------------------------------------------------------------------
 //
 CSisxSifPluginActiveImpl* CSisxSifPluginActiveImpl::NewL()
-	{
+{
-	FLOG( _L("Constructing CSisxSifPluginActiveImpl") );
+FLOG( _L("Constructing CSisxSifPluginActiveImpl") );
-	CSisxSifPluginActiveImpl *self = new( ELeave ) CSisxSifPluginActiveImpl;
+CSisxSifPluginActiveImpl *self = new( ELeave ) CSisxSifPluginActiveImpl;
-	CleanupStack::PushL( self );
+CleanupStack::PushL( self );
-	self->ConstructL();
+self->ConstructL();
-	CleanupStack::Pop( self );
+CleanupStack::Pop( self );
-	return self;
+return self;
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::~CSisxSifPluginActiveImpl()
 // ---------------------------------------------------------------------------
 //
 CSisxSifPluginActiveImpl::~CSisxSifPluginActiveImpl()
-	{
+{
-	FLOG( _L("Destructing CSisxSifPluginActiveImpl") );
+FLOG( _L("Destructing CSisxSifPluginActiveImpl") );
-	Cancel();
+Cancel();
 delete iAsyncLauncher;
 delete iUiHandler;
-delete iUiHandlerSilent;
 delete iInstallPrefs;
+iInputParams = NULL;    // not owned
+iOutputParams = NULL;   // not owned
+delete iInstallParams;
 delete iComponentInfo;
 delete iFileName;
 FeatureManager::UnInitializeLib();
 iFs.Close();
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::DoCancel()
 // ---------------------------------------------------------------------------
 //
 {
 case EInstall:
 switch( iPhase )
 {
 case EPreprocessing:
-if( iUseSilentMode )
+if( IsSilentMode() )
 {
 StartSilentInstallingL();
 }
 else
 {
 FinalizeInstallationL();
 CompleteClientRequest( KErrNone );
 iPhase = ENotActive;
 break;
+				// TODO: KSifInParam_InstallInactive
 default:
 Panic( ESisxSifInternalError );
 break;
 }
 break;
 void CSisxSifPluginActiveImpl::GetComponentInfo(
 const TDesC& aFileName,
 const TSecurityContext& /*aSecurityContext*/,
 CComponentInfo& aComponentInfo,
 TRequestStatus& aStatus )
-	{
+{
 FLOG_1( _L("CSisxSifPluginActiveImpl::GetComponentInfo: %S"), &aFileName );
 if( !IsActive() )
 {
-iOperation = EGetComponentInfo;
+		CommonRequestPreamble( aStatus );
-aStatus = KRequestPending;
-iClientStatus = &aStatus;
+		TRAPD( err, iAsyncLauncher->GetComponentInfoL( *iUiHandler, aFileName,
-iPhase = ERunningOperation;
-TRAPD( err, iAsyncLauncher->GetComponentInfoL( UiHandlerL(), aFileName,
 *iInstallPrefs, aComponentInfo, iStatus ) );
 if( err )
 {
 FLOG_1( _L("CSisxSifPluginActiveImpl::GetComponentInfo ERROR %d"), err );
 CompleteClientRequest( err );
 return;
 }
+iOperation = EGetComponentInfo;
+iPhase = ERunningOperation;
 SetActive();
 }
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::GetComponentInfo KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::GetComponentInfo()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::GetComponentInfo(
 RFile& aFileHandle,
 const TSecurityContext& /*aSecurityContext*/,
 CComponentInfo& aComponentInfo,
 TRequestStatus& aStatus )
-	{
+{
 FLOG( _L("CSisxSifPluginActiveImpl::GetComponentInfo(RFile)") );
 if( !IsActive() )
 {
-iOperation = EGetComponentInfo;
+		CommonRequestPreamble( aStatus );
-aStatus = KRequestPending;
-iClientStatus = &aStatus;
+		TRAPD( err, iAsyncLauncher->GetComponentInfoL( *iUiHandler, aFileHandle,
-iPhase = ERunningOperation;
-TRAPD( err, iAsyncLauncher->GetComponentInfoL( UiHandlerL(), aFileHandle,
 *iInstallPrefs, aComponentInfo, iStatus ) );
 if( err )
 {
 FLOG_1( _L("CSisxSifPluginActiveImpl::GetComponentInfo ERROR %d"), err );
 CompleteClientRequest( err );
 return;
 }
+iOperation = EGetComponentInfo;
+iPhase = ERunningOperation;
 SetActive();
 }
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::GetComponentInfo KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::Install()
 // ---------------------------------------------------------------------------
 //
 const TDesC& aFileName,
 const TSecurityContext& aSecurityContext,
 const COpaqueNamedParams& aInputParams,
 COpaqueNamedParams& aOutputParams,
 TRequestStatus& aStatus )
-	{
+{
 FLOG_1( _L("CSisxSifPluginActiveImpl::Install: %S"), &aFileName );
 if( !IsActive() )
 {
 CommonRequestPreamble( aInputParams, aOutputParams, aStatus );
-FLOG_1( _L("CSisxSifPluginActiveImpl::Install, iUseSilentMode=%d"), iUseSilentMode );
+FLOG_1( _L("CSisxSifPluginActiveImpl::Install, IsSilentMode=%d"), IsSilentMode() );
-if( iUseSilentMode )
+if( IsSilentMode() )
 {
 if( !aSecurityContext.HasCapability( ECapabilityTrustedUI ) )
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Install, missing ECapabilityTrustedUI") );
 CompleteClientRequest( KErrPermissionDenied );
 {
 iUiHandler->DisplayPreparingInstallL( aFileName );
 }
 SetInstallFileL( aFileName );
-TRAPD( err, iAsyncLauncher->GetComponentInfoL( UiHandlerL( iUseSilentMode ),
+TRAPD( err, iAsyncLauncher->GetComponentInfoL( *iUiHandler, aFileName,
-aFileName, *iInstallPrefs, *iComponentInfo, iStatus ) );
+		*iInstallPrefs, *iComponentInfo, iStatus ) );
 if( err )
 {
 FLOG_1( _L("CSisxSifPluginActiveImpl::Install, GetComponentInfoL ERROR %d"), err );
 CompleteClientRequest( err );
 return;
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::GetComponentInfo, KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::Install()
 // ---------------------------------------------------------------------------
 //
 RFile& aFileHandle,
 const TSecurityContext& aSecurityContext,
 const COpaqueNamedParams& aInputParams,
 COpaqueNamedParams& aOutputParams,
 TRequestStatus& aStatus )
-	{
+{
 TFileName fileName;
 aFileHandle.Name( fileName );
 FLOG_1( _L("CSisxSifPluginActiveImpl::Install(RFile): %S"), &fileName );
 if( !IsActive() )
 {
 CommonRequestPreamble( aInputParams, aOutputParams, aStatus );
-FLOG_1( _L("CSisxSifPluginActiveImpl::Install, iUseSilentMode=%d"), iUseSilentMode );
+FLOG_1( _L("CSisxSifPluginActiveImpl::Install, IsSilentMode=%d"), IsSilentMode() );
-if( iUseSilentMode )
+if( IsSilentMode() )
 {
 if( !aSecurityContext.HasCapability( ECapabilityTrustedUI ) )
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Install, missing ECapabilityTrustedUI") );
 CompleteClientRequest( KErrPermissionDenied );
 {
 iUiHandler->DisplayPreparingInstallL( fileName );
 }
 SetInstallFile( aFileHandle );
-TRAPD( err, iAsyncLauncher->GetComponentInfoL( UiHandlerL( iUseSilentMode ),
+TRAPD( err, iAsyncLauncher->GetComponentInfoL( *iUiHandler, aFileHandle,
-aFileHandle, *iInstallPrefs, *iComponentInfo, iStatus ) );
+		*iInstallPrefs, *iComponentInfo, iStatus ) );
 if( err )
 {
 FLOG_1( _L("CSisxSifPluginActiveImpl::Install, GetComponentInfoL ERROR %d"), err );
 CompleteClientRequest( err );
 return;
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Install KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::Uninstall()
 // ---------------------------------------------------------------------------
 //
 TComponentId aComponentId,
 const TSecurityContext& aSecurityContext,
 const COpaqueNamedParams& aInputParams,
 COpaqueNamedParams& aOutputParams,
 TRequestStatus& aStatus )
-	{
+{
 FLOG_1( _L("CSisxSifPluginActiveImpl::Uninstall, aComponentId %d"), aComponentId );
 if( !IsActive() )
 {
 CommonRequestPreamble( aInputParams, aOutputParams, aStatus );
 {
 FLOG( _L( "CSisxSifPluginActiveImpl::Uninstall, missing ECapabilityTrustedUI") );
 CompleteClientRequest( KErrPermissionDenied );
 return;
 }
-iUseSilentMode = ETrue;     // no complete/error notes launched in RunL
 TRAPD( err, DoUninstallL( aComponentId ) );
 if( err )
 {
 FLOG_1( _L("CSisxSifPluginActiveImpl::Uninstall, DoUninstallL ERROR %d"), err );
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Uninstall KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::Activate()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::Activate(
 TComponentId aComponentId,
 const TSecurityContext& /*aSecurityContext*/,
 TRequestStatus& aStatus )
-	{
+{
 FLOG_1( _L("CSisxSifPluginActiveImpl::Activate, aComponentId %d"), aComponentId );
 if( !IsActive() )
 {
 aStatus = KRequestPending;
 iClientStatus = &aStatus;
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Activate KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::Deactivate()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::Deactivate(
 TComponentId aComponentId,
 const TSecurityContext& /*aSecurityContext*/,
 TRequestStatus& aStatus )
-	{
+{
 FLOG_1( _L("CSisxSifPluginActiveImpl::Deactivate, aComponentId %d"), aComponentId );
 if( !IsActive() )
 {
 aStatus = KRequestPending;
 iClientStatus = &aStatus;
 else
 {
 FLOG( _L("CSisxSifPluginActiveImpl::Deactivate KErrInUse") );
 CompleteClientRequest( KErrInUse );
 }
-	}
+}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::CSisxSifPluginActiveImpl()
 // ---------------------------------------------------------------------------
 //
 iInstallPrefs = Swi::CInstallPrefs::NewL();
 iComponentInfo = CComponentInfo::NewL();
 }
 // ---------------------------------------------------------------------------
-// CSisxSifPluginActiveImpl::UiHandlerL()
+// CSisxSifPluginActiveImpl::CommonRequestPreamble()
 // ---------------------------------------------------------------------------
 //
-Swi::MUiHandler& CSisxSifPluginActiveImpl::UiHandlerL( TBool aUseSilentMode )
+void CSisxSifPluginActiveImpl::CommonRequestPreamble( TRequestStatus& aStatus )
 {
-Swi::MUiHandler* handler = NULL;
+aStatus = KRequestPending;
+iClientStatus = &aStatus;
-if( aUseSilentMode )
-{
+if( iInstallParams )
-if( iUiHandler )
+{
-{
+delete iInstallParams;
-delete iUiHandler;
+iInstallParams = NULL;
-iUiHandler = NULL;
+}
-}
+CreateUiHandlerL();
-if( !iUiHandlerSilent )
-{
+iInputParams = NULL;
-iUiHandlerSilent = CSisxSifPluginUiHandlerSilent::NewL( iFs );
+iOutputParams = NULL;
-}
-handler = iUiHandlerSilent;
-}
-else
-{
-if( iUiHandlerSilent )
-{
-delete iUiHandlerSilent;
-iUiHandlerSilent = NULL;
-}
-if( !iUiHandler )
-{
-iUiHandler = CSisxSifPluginUiHandler::NewL( iFs );
-}
-handler = iUiHandler;
-}
-return *handler;
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::CommonRequestPreamble()
 // ---------------------------------------------------------------------------
 TRequestStatus& aStatus )
 {
 aStatus = KRequestPending;
 iClientStatus = &aStatus;
-TInt silentInstall = 0;
+if( iInstallParams )
-TRAPD( err, aInputParams.GetIntByNameL( KSifInParam_InstallSilently, silentInstall ) );
+{
-iUseSilentMode = ( err == KErrNone && silentInstall != 0 );
+delete iInstallParams;
+iInstallParams = NULL;
+}
+iInstallParams = CSisxSifPluginInstallParams::NewL( aInputParams );
+CreateUiHandlerL();
 iInputParams = &aInputParams;
 iOutputParams = &aOutputParams;
+}
-// TODO: KSifInParam_InstallInactive
-}
+// ---------------------------------------------------------------------------
+// CSisxSifPluginActiveImpl::CreateUiHandlerL()
+// ---------------------------------------------------------------------------
+//
+void CSisxSifPluginActiveImpl::CreateUiHandlerL()
+{
+if( iUiHandler )
+	{
+		delete iUiHandler;
+		iUiHandler = NULL;
+	}
+	if( IsSilentMode() )
+		{
+		iUiHandler = CSisxSifPluginUiHandlerSilent::NewL( iFs );
+		}
+	else
+		{
+		iUiHandler = CSisxSifPluginUiHandler::NewL( iFs );
+		}
+	if( iInstallParams )
+		{
+		iUiHandler->SetInstallParamsL( *iInstallParams );
+		}
+}
+// ---------------------------------------------------------------------------
+// CSisxSifPluginActiveImpl::IsSilentMode()
+// ---------------------------------------------------------------------------
+//
+TBool CSisxSifPluginActiveImpl::IsSilentMode()
+	{
+	return( iInstallParams && iInstallParams->IsSilentMode() );
+	}
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::CompleteClientRequest()
 // ---------------------------------------------------------------------------
 //
 }
 TUid objectId = TUid::Uid( intPropertyEntry->IntValue() );
 CleanupStack::PopAndDestroy( 2, &scrSession );      // propertyEntry, scrSession
-iAsyncLauncher->UninstallL( UiHandlerL( iUseSilentMode ), objectId, iStatus );
+iAsyncLauncher->UninstallL( *iUiHandler, objectId, iStatus );
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::DoActivateL()
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::DoHandleErrorL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::DoHandleErrorL( TInt aError )
 {
+// TODO: add support for:
+// KSifOutParam_ErrCategory
+// KSifOutParam_ErrCode
+// KSifOutParam_ExtendedErrCode
+// KSifOutParam_ErrMessage
+// KSifOutParam_ErrMessageDetails
 if( iOutputParams )
 {
 iOutputParams->AddIntL( KSifOutParam_ExtendedErrCode, aError );
 }
 TInt errorCode = ConvertToSifErrorCode( aError );
-if( !iUseSilentMode && ( errorCode != KErrCancel ) )
+if( errorCode != KErrCancel )
 {
 iUiHandler->DisplayFailedL( errorCode );
 }
 }
 // CSisxSifPluginActiveImpl::StartInstallingL()
 // ---------------------------------------------------------------------------
 //
 void CSisxSifPluginActiveImpl::StartInstallingL()
 {
-Swi::MUiHandler& uiHandler = UiHandlerL( iUseSilentMode );
+	const CComponentInfo::CNode& rootNode( iComponentInfo->RootNodeL() );
+	TBool driveSelection = rootNode.DriveSeletionRequired();
-if( !iUseSilentMode && iUiHandler )
+	iUiHandler->SetDriveSelectionRequired( driveSelection );
-{
+	TInt maxInstalledSize = rootNode.MaxInstalledSize();
-const CComponentInfo::CNode& rootNode( iComponentInfo->RootNodeL() );
+	iUiHandler->SetMaxInstalledSize( maxInstalledSize );
-TBool driveSelection = rootNode.DriveSeletionRequired();
-iUiHandler->SetDriveSelectionRequired( driveSelection );
-TInt maxInstalledSize = rootNode.MaxInstalledSize();
-iUiHandler->SetMaxInstalledSize( maxInstalledSize );
-}
 if( iFileHandle )
 {
-iAsyncLauncher->InstallL( uiHandler, *iFileHandle, *iInstallPrefs, iStatus );
+iAsyncLauncher->InstallL( *iUiHandler, *iFileHandle, *iInstallPrefs, iStatus );
 }
 else if( iFileName )
 {
-iAsyncLauncher->InstallL( uiHandler, *iFileName, *iInstallPrefs, iStatus );
+iAsyncLauncher->InstallL( *iUiHandler, *iFileName, *iInstallPrefs, iStatus );
 }
 else
 {
 Panic( ESisxSifInternalError );
 }
 if( iOutputParams )
 {
 TComponentId componentId = GetLastInstalledComponentIdL();
 iOutputParams->AddIntL( KSifOutParam_ComponentId, componentId );
 }
-if( !iUseSilentMode )
+	iUiHandler->DisplayCompleteL();
-{
-iUiHandler->DisplayCompleteL();
-}
 }
 // ---------------------------------------------------------------------------
 // CSisxSifPluginActiveImpl::UpdateStartupListL()
 // ---------------------------------------------------------------------------

changeset 37	6e7b00453237
parent 33	8110bf1194d1
child 42	d17dc5398051