MCL/sf/mw/appinstall: comparison appinstaller/AppinstUi/Daemon/Src/daemonbehaviour.cpp

equal deleted inserted replaced

-:ba25891c3a9e
+:c42dffbd5b4f
 #include "SWInstDebug.h"
 #include "sisregistryentry.h"
 namespace Swi
-	{
+{
-	// For uninstaller
+// For uninstaller
-	CDaemonBehaviour* CDaemonBehaviour::NewL( CProgramStatus& aMainStatus )
+CDaemonBehaviour* CDaemonBehaviour::NewL( CProgramStatus& aMainStatus )
-		{
+{
-		CDaemonBehaviour* self = NewLC( aMainStatus );
+CDaemonBehaviour* self = NewLC( aMainStatus );
-		CleanupStack::Pop(self);
+CleanupStack::Pop(self);
-		return self;
+return self;
-		}
+}
-	CDaemonBehaviour* CDaemonBehaviour::NewLC( CProgramStatus& aMainStatus )
+CDaemonBehaviour* CDaemonBehaviour::NewLC( CProgramStatus& aMainStatus )
-		{
+{
-		CDaemonBehaviour* self = new (ELeave) CDaemonBehaviour;
+CDaemonBehaviour* self = new (ELeave) CDaemonBehaviour;
-		CleanupStack::PushL(self);
+CleanupStack::PushL(self);
-		self->ConstructL( aMainStatus );
+self->ConstructL( aMainStatus );
-		return self;
+return self;
-		}
+}
-	void CDaemonBehaviour::ConstructL( CProgramStatus& aMainStatus )
+void CDaemonBehaviour::ConstructL( CProgramStatus& aMainStatus )
-		{
+{
-		User::LeaveIfError(iFs.Connect());
+User::LeaveIfError(iFs.Connect());
-		User::LeaveIfError(iFs.ShareProtected());
+User::LeaveIfError(iFs.ShareProtected());
-		// For uninstaller
+// For uninstaller
-		iSisInstaller = CSisInstaller::NewL( this, aMainStatus );
+iSisInstaller = CSisInstaller::NewL( this, aMainStatus );
-		// Create plugin
+// Create plugin
-		TRAP_IGNORE( iSwiDaemonPlugin = CSwiDaemonPlugin::NewL() );
+TRAP_IGNORE( iSwiDaemonPlugin = CSwiDaemonPlugin::NewL() );
-		}
+}
-	CDaemonBehaviour::~CDaemonBehaviour()
+CDaemonBehaviour::~CDaemonBehaviour()
-		{
+{
-	    if ( iSwiDaemonPlugin )
+if ( iSwiDaemonPlugin )
-	        {
+{
-	        delete iSwiDaemonPlugin;
+delete iSwiDaemonPlugin;
-	        REComSession::FinalClose();
+REComSession::FinalClose();
-	        }
+}
-		delete iSisInstaller;
+delete iSisInstaller;
-		iSisInstaller = NULL;
+iSisInstaller = NULL;
-		iFs.Close();
+iFs.Close();
+#ifdef RD_MULTIPLE_DRIVE
-#ifdef RD_MULTIPLE_DRIVE
+iDriveArray.Close();
-		iDriveArray.Close();
+#endif
-#endif
+}
-		}
+// from MDaemonBehaviour
-	// from MDaemonBehaviour
+TBool CDaemonBehaviour::StartupL()
-	TBool CDaemonBehaviour::StartupL()
+{
-		{
+// Return state of Startup
-		// Return state of Startup
+return ETrue;
-		return ETrue;
+}
-		}
 void CDaemonBehaviour::MediaChangeL(TInt aDrive, TChangeType aChangeType)
-		{
+{
 FLOG_1( _L("Daemon: Media change %d"), aDrive );
 RSisRegistryWritableSession registrySession;
 User::LeaveIfError(registrySession.Connect());
 CleanupClosePushL(registrySession);
 if (aChangeType==EMediaInserted)
 {
 FLOG( _L("Daemon: Media inserted") );
+FLOG( _L("Daemon: Media change: Update sis registry") );
+// notify IAR
+// Error ou1cimx1#212652
+// Note SWI Daemon needs to notify sis registry from
+// media change. Otherwice registry is not updated
+// and e.g. IsPresentL function will give false results.
+// Note also that this function should be called before
+// ProcessPreinstalledFilesL in SWI Daemon.
+registrySession.AddDriveL(aDrive);
 // Scan directory on the card and run pre-installed through SWIS
-ProcessPreinstalledFilesL(aDrive);
+FLOG( _L("Daemon: Media change: Process preinstalled files") );
+ProcessPreinstalledFilesL(aDrive);
-// notify IAR
-registrySession.AddDriveL(aDrive);
 #ifdef RD_MULTIPLE_DRIVE
 // Add inserted media drive to drive array.
 if ( iDriveArray.Find(aDrive) == KErrNotFound )
 {
 iDriveArray.AppendL(aDrive);
 }
 #endif
 }
 else if (aChangeType==EMediaRemoved)
 {
 FLOG( _L("Daemon: Media removed") );
 #ifdef RD_MULTIPLE_DRIVE
 // Get Installer state.
 TBool installerRunning = iSisInstaller->IsInstalling();
 #endif
 #ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 // notify IAR
+// Note SWI Daemon need to notify sis registry from
+// media change.
 registrySession.RemoveDriveL(aDrive);
 #endif //SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
 // Cancel all requests for install
 iSisInstaller->Cancel();
 #ifdef RD_MULTIPLE_DRIVE
 // Notify plugin
 if(iSwiDaemonPlugin)
 {
 TInt index = iDriveArray.Find(aDrive);
 iSwiDaemonPlugin->MediaRemoved(index);
 }
 #else
 // Notify plugin
 if(iSwiDaemonPlugin)
 {
 iSwiDaemonPlugin->MediaRemoved(aDrive);
 }
 #endif //RD_MULTIPLE_DRIVE
 #ifdef RD_MULTIPLE_DRIVE
 // Get index of removed drive from array
 TInt index = iDriveArray.Find(aDrive);
 if ( index > KErrNotFound )
 {
 iDriveArray.Remove(index);
 iDriveArray.Compress();
 }
 // Continue installing from other drives if needed.
 if ( installerRunning )
 {
 // Get count of inserted drives.
 TInt count = iDriveArray.Count();
 if ( count )
 {
 for(index = 0; index < count; index++ )
 {
 ProcessPreinstalledFilesL(iDriveArray[index]);
 iSisInstaller->StartInstallingL();
 }
 }
 }
 #endif
-			}
+}
-		CleanupStack::PopAndDestroy(&registrySession);
-		}
+CleanupStack::PopAndDestroy(&registrySession);
+}
 void CDaemonBehaviour::ProcessPreinstalledFilesL(TInt aDrive)
-		{
+{
-		_LIT(KDaemonPrivatePath,":\\private\\10202dce\\");
+_LIT(KDaemonPrivatePath,":\\private\\10202dce\\");
 #ifndef RD_MULTIPLE_DRIVE
-		iSisInstaller->Cancel();
+iSisInstaller->Cancel();
 #endif
-		// For uninstaller
+// For uninstaller
 // Set on installing mode.
 iGeneralProcessStatus = EStateInstalling;
 FLOG_1( _L("[CDaemonBehaviour] iGeneralProcessStatus = %d"),
 iGeneralProcessStatus );
-		ProcessPreinstalledFilesL(aDrive, KDaemonPrivatePath);
+ProcessPreinstalledFilesL(aDrive, KDaemonPrivatePath);
 iStartNotified = EFalse;
 iDrive = aDrive;
-		iSisInstaller->StartInstallingL();
+iSisInstaller->StartInstallingL();
-		}
+}
-	void CDaemonBehaviour::ProcessPreinstalledFilesL(TInt aDrive, const TDesC& aDirectory)
+void CDaemonBehaviour::ProcessPreinstalledFilesL(TInt aDrive, const TDesC& aDirectory)
 {
 FLOG( _L("Daemon: ProcessPreInstalledFilesL") );
 TPath preInstalledPath;
 TChar drive;
 RFs::DriveToChar(aDrive, drive);
 preInstalledPath.Append(drive);
 preInstalledPath.Append(aDirectory);
 FLOG_1( _L("Daemon: ProcessPreInstalledFilesL Getting dir %S"), &preInstalledPath );
 CDir* dir = NULL;
 TInt err = iFs.GetDir(preInstalledPath, KEntryAttNormal, ESortNone, dir);
 if (err != KErrNone && err != KErrPathNotFound)
 {
 FLOG_1( _L("Daemon: ProcessPreInstalledFilesL GetDir with error %d"), err );
 User::Leave(err);
 }
 }
 CleanupStack::PopAndDestroy(dir);
 }
 }
-	// For uninstaller
+// For uninstaller
 TInt& CDaemonBehaviour::GetProcessStatus()
 {
 return iGeneralProcessStatus;
 }
 // For uninstaller
 void CDaemonBehaviour::SetProcessStatus( TInt aStatus )
 {
 iGeneralProcessStatus = aStatus;
 }
 // For plugin support
 void CDaemonBehaviour::DoNotifyMediaProcessingComplete()
 {
 if ( iSwiDaemonPlugin && iStartNotified )
 {
 // For plugin support
 void CDaemonBehaviour::NotifyPlugin()
 {
 FLOG( _L("Daemon: NotifyPlugin"));
 if ( !iStartNotified )
 {
 FLOG_1( _L("Daemon: MediaProcessingStart for drive = %d"), iDrive );
 iSwiDaemonPlugin->MediaProcessingStart( iDrive );
 iStartNotified = ETrue;
 }
 }
 // For plugin support
 void CDaemonBehaviour::RequestPluginInstall( TDesC& aSisFile )
 {
 // close file, original SWI Daemon do not leave file open.
 CleanupStack::PopAndDestroy( &file );
 }
-	} // namespace Swi
+} // namespace Swi
 //EOF

changeset 1	c42dffbd5b4f
parent 0	ba25891c3a9e
child 25	7333d7932ef7