FCL/sf/mw/appinstall: comparison appinstaller/AppinstUi/Daemon/Src/daemoninstaller.cpp

equal deleted inserted replaced

-:6e7b00453237
+:d17dc5398051
 *
 * Description:
 *
 */
-#include <usif/scr/scr.h>
-#include <usif/scr/screntries.h>
 #include "daemoninstaller.h"
 #include "DialogWrapper.h"
 #include "swispubsubdefs.h"
 #include "SWInstDebug.h"
 using namespace Swi;
 const static TInt KInstallRetryWaitTime = 10000000; // 10 secs
 // For uninstaller
 const static TInt KWaitUninstallerTime = 1000000; // 1 secs
 _LIT(KMCSisInstaller,"Daemon-Installer"); // Minor-Component name
 // -----------------------------------------------------------------------
 // Destructor
 // -----------------------------------------------------------------------
 //
 CSisInstaller::~CSisInstaller()
 {
+FLOG( _L("Daemon: CSisInstaller::~CSisInstaller") );
 Cancel();
 iTimer.Close();
 iFilesToInstall.ResetAndDestroy();
 iFilesToInstall.Close();
 delete iInstallLauncher;
 delete iDialogs;
 delete iPreviouslyInstalledAppsCache;
 delete iInstallationFailedAppsCache;
 delete iShutdownWatcher;
 // For uninstaller
 // SisInstaller do not own this so do not delete.
 iProgramStatus = &aMainStatus;
 iUpdateCache = ETrue;
 iFileOpen = EFalse;
+iInstallLauncher = NULL;
 }
 // -----------------------------------------------------------------------
 // CSisInstaller::AddFileToInstallL
 // Set the location of all sis files and the list of them
 //
 void CSisInstaller::StartInstallingL()
 {
 FLOG( _L("Daemon: StartInstallingL") );
-if(!iFilesToInstall.Count())
+if( !iFilesToInstall.Count() )
 {
 // For uninstaller
 // Check state, if installing change it to idle.
 if ( EStateInstalling == iProgramStatus->GetProgramStatus() )
 {
 FLOG( _L("Daemon: StartInstallingL: Set EStateIdle") );
 iProgramStatus->SetProgramStatusToIdle();
 }
+FLOG( _L("Daemon: StartInstallingL: User::Leave(KErrAbort)") );
 User::Leave(KErrAbort);
 }
 // For uninstaller
 // Check state. If idle chage it to installing, but if installing
 // or uninstalling do nothing.
 if ( EStateIdle == iProgramStatus->GetProgramStatus() )
 {
 FLOG( _L("Daemon: StartInstallingL: Set EStateInstalling") );
 iProgramStatus->SetProgramStatus( EStateInstalling );
 }
-FLOG_1( _L("[CSisInstaller] ConstructL iGeneralProcessStatus = %d"),
-iGeneralProcessStatus );
+FLOG_1( _L("Daemon: iGeneralProcessStatus: %d"), iGeneralProcessStatus );
+FLOG_1( _L("Daemon: iInstallLauncher: 0x%x"),iInstallLauncher );
-if ( !iInstallLauncher )
+if ( iInstallLauncher == NULL )
 {
+FLOG( _L("Daemon: Create iInstallLauncher") );
 iInstallLauncher = CSilentLauncher::NewL( iFs );
 // Update cache so we do not try to start install for
 // components which are installed. This is done always
 // when new install session is started (e.g. after mmc insert).
 }
 if ( iState == EDSisInstallerStateIdle )
 {
 // Reset the error
 iInstallErr = KErrNone;
 CompleteSelf();
 }
 }
 // -----------------------------------------------------------------------
 {
 FLOG( _L("Daemon: CSisInstaller::CompleteSelf") );
 if ( !IsActive() )
 {
 TRequestStatus* status = &iStatus;
-User::RequestComplete(status,KErrNone);
+FLOG( _L("Daemon: CompleteSelf: RequestComplete") );
+User::RequestComplete( status, KErrNone );
+FLOG( _L("Daemon: CompleteSelf: SetActive") );
 SetActive();
 }
 }
 // -----------------------------------------------------------------------
 &iSisFile );
 TRAP_IGNORE( iDaemonBehaviour->RequestPluginInstall(
 iSisFile ) );
 // Let's continue to give all packages to plug-in.
-// Note that we do not have iStatus as this is not async. call
+// Note that we do not have iStatus as this is not
-// so we can not use EDSisInstallerStateInstalling state.
+// async. call so we can not use
+// EDSisInstallerStateInstalling state.
 iState = EDSisInstallerStateIdle;
 iInstallerState = iState;
 // Plugin interface is not asyncronous. We need to
 // complete self to get all packages to plugin.
 CompleteSelf();
 }
 else
 {
+// Start also the universal indicator.
+TRAP_IGNORE( iDialogs->ActivateIndicatorL( iPercentValue ) );
+// Start to show progress dialog. Dialog is shown
+// only 3 sec.
+TRAP_IGNORE( iDialogs->ShowWaitingNoteL() );
 FLOG_1( _L("Daemon: Start install for %S"), &iSisFile );
 iInstallLauncher->InstallL( iSisFileHandle,
 iSisFile,
 iStatus );
-// Start to show progress dialog. Dialog is shown
-// only 3 sec.
-iDialogs->ShowWaitingNoteL();
-// Start also the universal indicator.
-iDialogs->ActivateIndicatorL( iPercentValue );
 iState = EDSisInstallerStateInstalling;
 iInstallerState = iState;
 SetActive();
 }
 }
 FLOG_1( _L("Daemon: Open File: %S"), &iSisFile );
 TInt err = iSisFileHandle.Open(
 iFs,
 iSisFile,
-EFileRead | EFileShareReadersOnly
+EFileRead | EFileShareReadersOnly );
-/*EFileShareReadersOrWriters|EFileRead*/ );
 if ( err )
 {
 FLOG_1( _L("Daemon: File open ERROR = %d"), err );
 iFileOpen = EFalse;
 	FLOG_1( _L("Daemon: Is UID installed = 0x%x"), packageId.iUid );
 	needsInstalling = !iPreviouslyInstalledAppsCache->
 HasBeenPreviouslyInstalled(packageId);
 	FLOG_1( _L("Daemon: Has been installed (cache) = %d"), !needsInstalling );
-// TODO: Onko rom stubien tarkistus tarpeen jos upgrade ei ole sallittu.
+	// No need to check rom stubs in here anymore.
-// Ei taida kannattaa tarksitaan RU ei pitäisi mennä läpi.
+	// Note 1: SWI Daemon policy has been that RU packages are not installed
-	FLOG( _L("Daemon: HUOM ROM STUBEJA EI TARKISTETA") );
+	// from removable media.
+	// Note 2: UpdateAllL will add all pkg uids in cache (PreviouslyInstalled),
+	// so rom upgrades are not installed since uid is found from the cache.
+	// Note 3: Install params do not allow RU to be installed. So SWI will
+	// reject RU (rom upgrade) package anyway.
 	/*
-	// Huom! edellinen koodi ollut väärin koska UID on jo cachessä !
+	// Note! this code has been wrong. No need to check stubs since
-	// Tarkistus pitää tehdä vain jos UID löytyy cachestä.
+	// policy do not allow RU updates and SWI will reject the install.
 	if ( !needsInstalling )
 {
 RSisRegistrySession registry;
 User::LeaveIfError( registry.Connect() );
 CleanupClosePushL( registry );
 // filen count. Let's not show over 100% to user.
 // This may happend after last package is processed since
 // index counter is updated before install starts.
 iPercentValue = 100;
 }
 }
-//TInt tempVal = (TInt)iPercentValue;
 FLOG_1( _L("Daemon: CalcPercentValue value = %d"), (TInt)iPercentValue );
 }
 //EOF

changeset 42	d17dc5398051
parent 37	6e7b00453237
child 80	9dcba1ee99f7