MCL/sf/mw/web: comparison widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp

equal deleted inserted replaced

-:a359256acfc6
+:c8a366e56285
 *                for midlet installation.
 *
 *
 */
+// INCLUDE FILES
 #include <f32file.h>
 #include <SWInstDefs.h>
 #include <zipfile.h>
 #include <SWInstTaskManager.h>
 // widget file with no icon.  Why, I'm not sure but probably
 // had to do with this active object blocking display
 // processing.  So here is a good place to put up the displays
 // (before RunL() is invoked) which lets other objects run.
-iUIHandler->DisplayFinalizeDialogL(); // a dialog without a cancel option
+if ( !iSilent )
-iUIHandler->DisplayProgressDialogL(); // progress bar
+{
+iUIHandler->DisplayFinalizeDialogL(); // a dialog without a cancel option
+iUIHandler->DisplayProgressDialogL(); // progress bar
+}
 if ( replaceExisting )
 {
 BackupL(); // nothing need be undone if backup leaves
 // backup will gaurantee that install dir is empty
 }
 }
 else
 {
 userCancel = ETrue;
-iUIHandler->DisplayCancelL();
+if ( !iSilent ) { iUIHandler->DisplayCancelL(); }
 TRequestStatus* status = &aRequestStatus;
 User::RequestComplete( status, KErrNone );
 }
 }
 TBool userCancel = EFalse;
 TRAPD( error, InstallSubfunctionL( aFile, userCancel, aRequestStatus ) );
 if ( KErrNone != error )
 {
-iUIHandler->DisplayErrorL( error );
+if ( !iSilent ) { iUIHandler->DisplayErrorL( error ); }
 User::Leave( error );
 }
 else if ( userCancel )
 {
 return; // can't do return inside trap
 {
 //Runnning widget should be first closed
 RApaLsSession apaLsSession;
 apaLsSession.Connect();
 TApaAppInfo info;
 User::LeaveIfError( apaLsSession.GetAppInfo( info, aUid ) );
 iWidgetName = info.iFullName;
 HBufC *widgetName = iWidgetName.AllocLC();
 HandleWidgetCommandL(apaLsSession, *widgetName, aUid, Deactivate);
 CleanupStack::PopAndDestroy( widgetName );
 apaLsSession.Close();
 }
 // get original install dir from registry in case user
 // decides to "overrite" to another memory location
 User::LeaveIfError( file.Write( *buffer ) );
 }
 CleanupStack::PopAndDestroy( 3 ); // file, buffer, stream
 }
-// more progress!!!
+if ( !iSilent )
-if ( member->UncompressedSize() )
 {
-iUIHandler->UpdateProgressDialogL( member->UncompressedSize() );
+// more progress!!!
+if ( member->UncompressedSize() )
+{
+iUIHandler->UpdateProgressDialogL( member->UncompressedSize() );
+}
 }
 // if this is the icon file, then start icon processing
 if ( EFalse == iIconSearchFinished )
 {
 User::RequestComplete( stat, KErrNone );
 SetActive();
 }
 else // done with zip archive
 {
-iUIHandler->CloseProgressDialogL();
+if ( !iSilent ) { iUIHandler->CloseProgressDialogL(); }
 // and reveal finalize dialog underneath
 // finished unzip
 iUnzipping = EFalse;
 // done
 }
 }
 else // user cancel (not DoCancel)
 {
-iUIHandler->CloseProgressDialogL();
+if ( !iSilent )
-iUIHandler->CloseFinalizeDialogL();
+{
-iUIHandler->DisplayCancelL();
+iUIHandler->CloseProgressDialogL();
+iUIHandler->CloseFinalizeDialogL();
+iUIHandler->DisplayCancelL();
+}
 // stop icon conversion (if there is a converter)
 delete iIconConverter;
 iIconConverter = NULL;
 iProcessingIcon = EFalse;
 {
 if ( iOverwriting )
 {
 TUid uid = TUid::Uid( *(iPropertyValues[EUid]) );
 iRegistry.DeRegisterWidgetL( uid );
+iAppManager->DeregisterWidgetL( uid );
 }
 // TODO if registration steps fail does it leave inconsistent state???
 iRegistry.RegisterWidgetL( iPropertyValues );
 if ( iOverwriting )
 {
 // delete backup
 (void)iFileMgr->RmDir( iBackupDir );
-// if widget was in home screen, add it back to home screen
 if ( iWidgetInHS )
 {
 RApaLsSession apaLsSession;
 apaLsSession.Connect();
 HBufC* widgetName = iWidgetName.AllocLC();
 HandleWidgetCommandL(apaLsSession, *widgetName, TUid::Uid( *(iPropertyValues[EUid]) ), WidgetRestart);
 CleanupStack::PopAndDestroy( widgetName );
 apaLsSession.Close();
 }
 }
+if ( !iSilent )
-iUIHandler->CloseFinalizeDialogL();
+{
-iUIHandler->DisplayCompleteL();
+iUIHandler->CloseFinalizeDialogL();
+iUIHandler->DisplayCompleteL();
+}
 HandleLogsL(*(iPropertyValues[EBundleDisplayName]), TUid::Uid( *(iPropertyValues[EUid]) ), *(iPropertyValues[ENokiaWidget]), SwiUI::ELogTaskActionInstall);
 }
 else // cancelled
 {
 iCancelled = ETrue;
 TRAP_IGNORE(
 {
-iUIHandler->CloseProgressDialogL();
+if ( !iSilent )
-iUIHandler->CloseFinalizeDialogL();
+{
-iUIHandler->DisplayCancelL();
+iUIHandler->CloseProgressDialogL();
+iUIHandler->CloseFinalizeDialogL();
+iUIHandler->DisplayCancelL();
+}
 // stop icon conversion (if there is a converter)
 delete iIconConverter;
 iIconConverter = NULL;
 iProcessingIcon = EFalse;
 iCancelled = ETrue;
 iUnzipping = EFalse;
 TRAP_IGNORE(
 {
-iUIHandler->CloseProgressDialogL();
+if ( !iSilent )
-iUIHandler->CloseFinalizeDialogL();
+{
-iUIHandler->DisplayErrorL( aError );
+iUIHandler->CloseProgressDialogL();
+iUIHandler->CloseFinalizeDialogL();
+iUIHandler->DisplayErrorL( aError );
+}
 // stop icon conversion (if there is a converter)
 delete iIconConverter;
 iIconConverter = NULL;
 iProcessingIcon = EFalse;
 iUIHandler =
 CWidgetUIHandler::NewL( CWidgetUIHandler::EModeUninstall, this );
 // save client status to use in finish uninstall
 iRequestStatus = &aRequestStatus;
 TBuf<KWidgetRegistryVal> bundleName;
 iRegistry.GetWidgetBundleName( aUid, bundleName );
 if( bundleName.Length() <= 0 )
 {
 FinishUninstallL( KErrCorrupt );
 return;
 }
 TBool widgetinHomeScreen(EFalse);
 widgetinHomeScreen = iRegistry.IsWidgetInMiniView( aUid );
+TBool uninstall( ETrue );
+if ( !iSilent )
+{
+uninstall = iUIHandler->DisplayUninstallL( bundleName,widgetinHomeScreen );
+}
 // prompt user to uninstall
-if( iUIHandler->DisplayUninstallL( bundleName,widgetinHomeScreen ) )
+if( uninstall )
 {
 if(iRegistry.IsWidgetRunning( aUid ))
 //Runnning widget should be first closed
 {
 RApaLsSession apaLsSession;
 apaLsSession.Connect();
 TApaAppInfo info;
 User::LeaveIfError( apaLsSession.GetAppInfo( info, aUid ) );
 HBufC* widgetName = info.iFullName.AllocLC();
 HandleWidgetCommandL(apaLsSession,*widgetName,aUid,Deactivate);
 CleanupStack::PopAndDestroy( widgetName );
 apaLsSession.Close();
 }
-iUIHandler->DisplayUninstallInProgressL();
+if ( !iSilent ) { iUIHandler->DisplayUninstallInProgressL(); }
 TBuf<KWidgetRegistryVal> widgetPath;
 iRegistry.GetWidgetPath( aUid, widgetPath );
 TBool aVendor = *(iRegistry.GetWidgetPropertyValueL(aUid, ENokiaWidget));
 // TODO if any of next steps leave does state become inconsistent?
 // remove the dir for the widget
 // TODO why this validation?
 if ( widgetPath.Length() > 0 )
 {
 iFileMgr->RmDir( widgetPath );
 //Widget should delete any cookie it created
 HBufC* fileName = HBufC::NewLC(KMaxFileName);
 TPtr ptr(fileName->Des());
 TBuf<8> buf1;
 ptr = KCookieFile;
 TInt pos = ptr.LocateReverse('.');
 buf1.AppendNum(aUid.iUid,EHex);
 ptr.Insert(pos,_L("_"));
 ptr.Insert(pos+1,buf1);
 iRfs.Delete(ptr);
 CleanupStack::PopAndDestroy(fileName);
 HandleLogsL(bundleName, aUid, aVendor, SwiUI::ELogTaskActionUninstall);
 }
 }
 else
 {
-iUIHandler->DisplayCancelL();
+if ( !iSilent ) { iUIHandler->DisplayCancelL(); }
 // must return cancel because upper-levels will take uninstall
 // actions (remove widget from applications list) if we return KErrNone
 User::RequestComplete( iRequestStatus, KErrCancel );
 return;
 // @since 3.1
 // ============================================================================
 //
 void CWidgetUIOperationsWatcher::FinishUninstallL( TInt aErr )
 {
-iUIHandler->CloseUninstallInProgressDialogL();
+if ( !iSilent ) { iUIHandler->CloseUninstallInProgressDialogL(); }
 if ( aErr )
 {
-iUIHandler->DisplayErrorL( aErr );
+if ( !iSilent ) { iUIHandler->DisplayErrorL( aErr ); }
 User::Leave( aErr );
 }
-iUIHandler->DisplayCompleteL();
+if ( !iSilent ) { iUIHandler->DisplayCompleteL(); }
 User::RequestComplete( iRequestStatus, KErrNone );
 iRequestStatus = NULL;
 }
 // ============================================================================
 // @since 3.1
 // ============================================================================
 //
 TBool CWidgetUIOperationsWatcher::PromptUserForInstallL( TBool aOverwrite )
 {
-TBool userAnswer;
+TBool userAnswer( ETrue );
-if ( aOverwrite )
+if ( !iSilent )
 {
-userAnswer =
+if ( aOverwrite )
-iUIHandler->DisplayOverwriteL( *(iPropertyValues[EBundleDisplayName]) );
+{
+userAnswer =
+iUIHandler->DisplayOverwriteL( *(iPropertyValues[EBundleDisplayName]) );
+}
+else
+{
+userAnswer =
+iUIHandler->DisplayInstallL( *(iPropertyValues[EBundleDisplayName]) );
+}
+if ( userAnswer )
+{
+userAnswer = SelectMemoryL();
+}
 }
 else
 {
-userAnswer =
+TDriveUnit selectedDrive(_L("C"));        // in real should be read from install options which are ignore too at the moment.
-iUIHandler->DisplayInstallL( *(iPropertyValues[EBundleDisplayName]) );
+UpdateWidgetBasePathL( selectedDrive );
-}
+*(iPropertyValues[EDriveName]) = selectedDrive.Name();
-if ( userAnswer )
+}
-{
-userAnswer = SelectMemoryL();
-}
 return userAnswer;
 }
 // ============================================================================
 // CWidgetUIOperationsWatcher::PromptUserForUntrustedWidgetL()
 TLogTaskParam params;
 params.iName.Copy(aWidgetName);
 params.iUid = aUid;
 params.iAction = aAction;
 params.iVendor.Copy((aVender ? _L("Nokia") : _L("Non-Nokia")));
 TTime time;
 time.UniversalTime();
 params.iTime = time;
 TLogTaskParamPckg pckg( params );
 task->SetParameterL( pckg, 0 );
 iTaskManager->AddTaskL( task );
 iTaskManager->CommitL();
 CleanupStack::Pop(task);
 }
 // ============================================================================
 //
 //
 // ============================================================================
 void CWidgetUIOperationsWatcher::HandleWidgetCommandL( RApaLsSession& aSession,const TDesC& aWidget,const TUid& aUid,TUint32 aOperation )
 {
 const TInt size( 2* aWidget.Length() + 3*sizeof( TUint32 ) );
 // Message format is <filenameLength><unicode_filename><someintegervalue>
 CApaCommandLine* cmd( CApaCommandLine::NewLC() );
 HBufC8* opaque( HBufC8::NewLC( size ) );
 RDesWriteStream stream;
 TPtr8 des( opaque->Des() );
 stream.Open( des );
 CleanupClosePushL( stream );
 // Generate the command.
 stream.WriteUint32L( aUid.iUid );
 stream.WriteUint32L( aWidget.Length() );
 stream.WriteL( reinterpret_cast< const TUint8* >( aWidget.Ptr() ),
 aWidget.Size() );
 stream.WriteInt32L( aOperation );
 CleanupStack::PopAndDestroy( &stream );
 // Generate command.
 cmd->SetCommandL( EApaCommandBackgroundAndWithoutViews );
 cmd->SetOpaqueDataL( *opaque );
 CleanupStack::PopAndDestroy( opaque );
 cmd->SetExecutableNameL( KLauncherApp );
 User::LeaveIfError( aSession.StartApp( *cmd ) );
 CleanupStack::PopAndDestroy( cmd );
 }
 //  End of File

changeset 11	c8a366e56285
parent 10	a359256acfc6
child 26	cb62a4f66ebe