FCL/sf/mw/appinstall: comparison iaupdate/IAD/ui/src/iaupdateuicontroller.cpp

equal deleted inserted replaced

-:98b66e4fb0be
+:26b6f0522fd8
 */
 // INCLUDES
-#include <avkon.hrh>
-#include <StringLoader.h>
 #include <centralrepository.h>
-#include <AknUtils.h>
 #include <SWInstDefs.h>
-#include <avkon.rsg>
 #include <featurecontrol.h>
 #include <cmmanager.h>
-#include <iaupdate.rsg>
+#include <qapplication.h>
+#include <hbmessagebox.h>
+#include <hbaction.h>
+#include <hbprogressdialog.h>
 #include <iaupdateparameters.h>
 #include "iaupdateuicontroller.h"
 #include "iaupdateuicontrollerobserver.h"
-#include "iaupdateappui.h"
 #include "iaupdate.hrh"
-#include "iaupdatewaitdialog.h"
-#include "iaupdateprogressdialog.h"
 #include "iaupdatenode.h"
 #include "iaupdatefwnode.h"
 #include "iaupdatebasenode.h"
 #include "iaupdatenodefilter.h"
 #include "iaupdatefactory.h"
 #include "iaupdatestarter.h"
 #include "iaupdateprivatecrkeys.h"
 #include "iaupdatecontrollerfile.h"
 #include "iaupdateuiconfigdata.h"
-#include "iaupdatedialogutil.h"
 #include "iaupdateutils.h"
 #include "iaupdateagreement.h"
 #include "iaupdateautomaticcheck.h"
 #include "iaupdateroaminghandler.h"
 #include "iaupdatependingnodesfile.h"
 #include "iaupdaterresultsfile.h"
 #include "iaupdaterresult.h"
 #include "iaupdateridentifier.h"
 #include "iaupdateruids.h"
 #include "iaupdaterdefs.h"
-#include "iaupdatetools.h"
 #include "iaupdateparametersfilemanager.h"
 #include "iaupdateerrorcodes.h"
 #include "iaupdatefileconsts.h"
 #include "iaupdatefirsttimeinfo.h"
 #include "iaupdaterefreshhandler.h"
 #include "iaupdatenodeid.h"
+#include "iaupdatewaitdialog.h"
 #include "iaupdatedebug.h"
 // cenrep in emulator:
 // copy 2000F85A.txt to '\epoc32\release\winscw\udeb\Z\private\10202be9\'
 CIAUpdateUiController::~CIAUpdateUiController()
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::~CIAUpdateUiController() begin");
 CancelOperation();
+delete mWaitDialog;
 delete iController;
 iNodes.Reset();
 iFwNodes.Reset();
 iSelectedNodesArray.Reset();
 iServicePackNodes.Reset();
 // If dialogs have not been released yet, release them now.
 // ProcessFinishedL() should normally be used for dialogs but
 // here just use non-leaving delete. In normal cases, dialogs should
 // already be released in the end of the update flow before coming here.
-delete iWaitDialog;
+//delete iWaitDialog;
-delete iProgressDialog;
+//delete iProgressDialog;
 	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::~CIAUpdateUiController() end");
 }
 	    iObserver.UpdateCompleteL( KErrNone );
 	    return;
 	    }
 	else
 	    {
-	    CIAUpdateAppUi* appUi =
+	    qApp->quit();
-	            static_cast< CIAUpdateAppUi* >( iEikEnv->EikAppUi() );
-appUi->Exit();
 	    return;
 	    }
 }
 if ( iRequestType == IAUpdateUiDefines::ECheckUpdates &&
 AllowNetworkRefreshL() &&
 CreateSelectedNodesArrayL();
 if ( !IAUpdateUtils::SpaceAvailableInInternalDrivesL( iSelectedNodesArray ) )
 {
-	    HBufC* noteText = NULL;
+HbMessageBox messageBox(HbMessageBox::MessageTypeInformation);
-noteText = StringLoader::LoadLC( R_IAUPDATE_INSUFFICIENT_MEMORY );
+messageBox.setText(QString("Insufficient memory. Free some memory and try again."));
-IAUpdateDialogUtil::ShowInformationQueryL( *noteText );
+HbAction action("OK");
-CleanupStack::PopAndDestroy( noteText );
+messageBox.setPrimaryAction(&action);
+messageBox.setTimeout(HbPopup::NoTimeout);
+messageBox.exec();
 }
 else
 {
 if ( !IsStartedByLauncher() )
 {
 // it needs to be downloaded before it can be installed.
 IAUPDATE_TRACE("[IAUPDATE] Download");
 selectedNode->DownloadL( *this );
 iState = EDownloading;
 iClosingAllowedByClient = ETrue;
-ShowUpdatingDialogL( R_IAUPDATE_DOWNLOADING_NOTE,
+/*ShowUpdatingDialogL( R_IAUPDATE_DOWNLOADING_NOTE,
 selectedNode->Base().Name(),
 iNodeIndex + 1,
-iSelectedNodesArray.Count() );
+iSelectedNodesArray.Count() );*/
 nextUpdate = EFalse;
 }
 else
 {
 // Because content has been downloaded but not installed yet,
 // it needs to be installed now.
 IAUPDATE_TRACE("[IAUPDATE] Install");
 selectedNode->InstallL( *this );
 iState = EInstalling;
 iClosingAllowedByClient = EFalse;
-CIAUpdateAppUi* appUi =
+/*CIAUpdateAppUi* appUi =
 static_cast< CIAUpdateAppUi* >( iEikEnv->EikAppUi() );
 appUi->StartWGListChangeMonitoring();
 ShowUpdatingDialogL( R_IAUPDATE_INSTALLING_NOTE,
 selectedNode->Base().Name(),
 iNodeIndex + 1,
-iSelectedNodesArray.Count() );
+iSelectedNodesArray.Count() ); */
 nextUpdate = EFalse;
 }
 }
 }
 else
 aNode.GetDependenciesL( iServicePackNodes, ETrue );
 }
 aNode.InstallL( *this );
 iState = EInstalling;
-CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
+/*CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
 appUi->StartWGListChangeMonitoring();
 iClosingAllowedByClient = EFalse;
 ShowUpdatingDialogL( R_IAUPDATE_INSTALLING_NOTE,
 aNode.Base().Name(),
 iNodeIndex + 1,
-iSelectedNodesArray.Count()  );
+iSelectedNodesArray.Count()  ); */
 	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::StartInstallL() end");
 }
 {
 // to avoid flickering IAD is brought to foreground only when wait dialog is really shown
 if ( allowNetworkRefresh )
 {
 iEikEnv->RootWin().SetOrdinalPosition( 0, ECoeWinPriorityNormal );
-HBufC* noteText = StringLoader::LoadLC( R_IAUPDATE_REFRESHING_UPDATE_LIST );
+ShowWaitDialogL( "Refreshing updates list", ETrue );
-ShowWaitDialogL( *noteText, ETrue );
-CleanupStack::PopAndDestroy( noteText );
 }
 }
 }
 else
 {
-HBufC* noteText = StringLoader::LoadLC( R_IAUPDATE_REFRESHING_UPDATE_LIST );
+ShowWaitDialogL( "Refreshing updates list", ETrue );
-ShowWaitDialogL( *noteText, EFalse );
-CleanupStack::PopAndDestroy( noteText );
 }
 }
 	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::StartRefreshL() end");
 }
 }
 if ( aErrorCode == IAUpdaterDefs::KIAUpdaterShutdownRequest )
 {
-CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
+//CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
-	appUi->Exit();
+	//appUi->Exit();
 }
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::SelfUpdaterComplete() end");
 }
 // CIAUpdateUiController::DownloadProgress
 //
 // -----------------------------------------------------------------------------
 //
 void CIAUpdateUiController::DownloadProgress( MIAUpdateNode& /*aNode*/,
-TUint aProgress,
+TUint /*aProgress*/,
-TUint aMaxProgress )
+TUint /*aMaxProgress*/ )
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::DownloadProgress() begin");
 if ( iProgressDialog )
 {
-	TRAP_IGNORE ( iProgressDialog->SetProgressDialogFinalValueL( aMaxProgress ) );
+	//TRAP_IGNORE ( iProgressDialog->SetProgressDialogFinalValueL( aMaxProgress ) );
-TRAP_IGNORE ( iProgressDialog->UpdateProgressDialogValueL( aProgress ) );
+//TRAP_IGNORE ( iProgressDialog->UpdateProgressDialogValueL( aProgress ) );
 }
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::DownloadProgress() end");
 }
 TInt aError )
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::InstallComplete() begin");
 iState = EIdle;
-CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
+//CIAUpdateAppUi* appUi = static_cast<CIAUpdateAppUi*>( iEikEnv->EikAppUi() );
-appUi->StopWGListChangeMonitoring();
+//appUi->StopWGListChangeMonitoring();
 if ( aError == SwiUI::KSWInstErrFileInUse )
 {
 	iFileInUseError = ETrue;
 }
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RoamingHandlerPrepared() end");
 }
 // -----------------------------------------------------------------------------
-// CIAUpdateUiController::HandleDialogExitL
+// CIAUpdateUiController::HandleWaitDialogCancel
-// Called when wait/progress dialog is about to be cancelled.
+// Called when wait dialog is cancelled.
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-TBool CIAUpdateUiController::HandleDialogExitL( TInt aButtonId )
+void CIAUpdateUiController::HandleWaitDialogCancel()
 {
-IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::HandleDialogExitL() begin");
+IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::HandleWaitDialogCancel() begin");
-IAUPDATE_TRACE_1("[IAUPDATE] button id: %d", aButtonId );
+TRAPD ( err, HandleUserCancelL() );
-TInt ret( ETrue );
+if ( err != KErrNone )
-if ( aButtonId == EAknSoftkeyCancel )
+{
-{
+	iObserver.HandleLeaveErrorL( err );
-TRAPD ( err, HandleUserCancelL() );
+}
-if ( err != KErrNone )
-{
+IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::HandleWaitDialogCancel() end");
-	iObserver.HandleLeaveErrorL( err );
-}
-}
-IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::HandleDialogExitL() end");
-return ret;
 }
 // -----------------------------------------------------------------------------
 // CIAUpdateUiController::HandleUiRefreshL
 //
 	    {
 	    iRefreshed = EFalse;
 	    }
 	else if ( iState == EIdle )
 	    {
-	    CIAUpdateAppUi* appUi = static_cast< CIAUpdateAppUi* >( iEikEnv->EikAppUi() );
+	    //CIAUpdateAppUi* appUi = static_cast< CIAUpdateAppUi* >( iEikEnv->EikAppUi() );
-if ( appUi->UiRefreshAllowed() )
+//if ( appUi->UiRefreshAllowed() )
 		    {
 	    	iState = EUiRefreshing;
 	        // store node identification (Id and namespace) of currently selected nodes
 	        // to restore selections after refresh
 	        iPreviousSelections.Reset();
 // ---------------------------------------------------------------------------
 // CIAUpdateUiController::ShowUpdatingDialogL
 //
 // ---------------------------------------------------------------------------
 //
-void CIAUpdateUiController::ShowUpdatingDialogL( TInt aTextResourceId,
+void CIAUpdateUiController::ShowUpdatingDialogL( TInt /*aTextResourceId*/,
 const TDesC& aName,
 TInt aNumber,
 TInt aTotalCount )
 {
 CArrayFix<TInt>* numberArray = new( ELeave ) CArrayFixFlat<TInt>( 2 );
 CleanupStack::PushL( numberArray );
 numberArray->AppendL( aNumber );
 numberArray->AppendL( aTotalCount );
 HBufC* noteText = NULL;
-noteText = StringLoader::LoadLC( aTextResourceId,
+//noteText = StringLoader::LoadLC( aTextResourceId,
-*stringArray,
+//                                 *stringArray,
-*numberArray );
+//                                 *numberArray );
 TPtr ptr = noteText->Des();
-AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr );
+//AknTextUtils::DisplayTextLanguageSpecificNumberConversion( ptr );
 if ( iState == EDownloading )
 {
 	ShowProgressDialogL( *noteText, ETrue );
 }
 else
 {
-ShowWaitDialogL( *noteText, ETrue );
+//ShowWaitDialogL( *noteText, ETrue );
 }
 CleanupStack::PopAndDestroy( noteText );
 CleanupStack::PopAndDestroy( numberArray );
 CleanupStack::PopAndDestroy( stringArray );
 // ---------------------------------------------------------------------------
 // CIAUpdateUiController::ShowWaitDialogL
 //
 // ---------------------------------------------------------------------------
 //
-void CIAUpdateUiController::ShowWaitDialogL( const TDesC& aDisplayString,
+void CIAUpdateUiController::ShowWaitDialogL( const QString& aDisplayString,
-TBool aVisibilityDelayOff )
+TBool /*aVisibilityDelayOff*/ )
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::ShowWaitDialogL() begin");
+if ( !mWaitDialog )
-if ( iWaitDialog )
+{
+mWaitDialog = new IAUpdateWaitDialog();
+mWaitDialog->SetCallback( this );
+mWaitDialog->showDialog( aDisplayString );
+}
+/*if ( iWaitDialog )
 {
 IAUPDATE_TRACE("[IAUPDATE] Wait dialog already existed. Remove it first");
 // in some rare cases previous dialog still exists
 // it's now just deleted (not recommended way) to avoid forwarding problem(s).
-delete iWaitDialog;
+//delete iWaitDialog;
 iWaitDialog = NULL;
-}
+}*/
-iWaitDialog =
+/*   iWaitDialog =
 new( ELeave ) CIAUpdateWaitDialog(
 reinterpret_cast< CEikDialog** >( &iWaitDialog ),
 aVisibilityDelayOff );
 iWaitDialog->SetTextL( aDisplayString );
 iWaitDialog->SetCallback( this );
-iWaitDialog->ExecuteLD( R_IAUPDATE_WAIT_DIALOG );
+iWaitDialog->ExecuteLD( R_IAUPDATE_WAIT_DIALOG ); */
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::ShowWaitDialogL() end");
 }
-// ---------------------------------------------------------------------------
+// --------------------------------------------------------------------------
 // CIAUpdateUiController::ShowProgressDialogL
 //
 // ---------------------------------------------------------------------------
 //
-void CIAUpdateUiController::ShowProgressDialogL( const TDesC& aDisplayString,
+void CIAUpdateUiController::ShowProgressDialogL( const TDesC& /*aDisplayString*/,
-TBool aVisibilityDelayOff )
+TBool /*aVisibilityDelayOff*/ )
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::ShowProgressDialogL() begin");
 if ( iProgressDialog )
 {
 IAUPDATE_TRACE("[IAUPDATE] Progress dialog already existed. Remove it first");
 // in some rare cases previous dialog still exists
 // it's now just deleted (not recommended way) to avoid forwarding problem(s).
-delete iProgressDialog;
+//delete iProgressDialog;
 iProgressDialog = NULL;
 }
-iProgressDialog =
+/*    iProgressDialog =
 new( ELeave ) CIAUpdateProgressDialog(
 reinterpret_cast< CEikDialog** >( &iProgressDialog ),
 aVisibilityDelayOff );
 iProgressDialog->SetTextL( aDisplayString );
 iProgressDialog->SetCallback( this );
-iProgressDialog->ExecuteLD( R_IAUPDATE_PROGRESS_DIALOG );
+iProgressDialog->ExecuteLD( R_IAUPDATE_PROGRESS_DIALOG ); */
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::ShowProgressDialogL() end");
 }
 // ---------------------------------------------------------------------------
 //
 void CIAUpdateUiController::RemoveWaitDialogL()
 {
 IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveWaitDialogL() begin");
+if ( mWaitDialog )
+{
+mWaitDialog->close();
+}
+/*if ( !iCancelling )  //that's needed because AVKON  in 3.2.3 wk12, returning
+//EFalse in TryToExitL() causes a crash
+{
+	if ( iWaitDialog )
+{
+	    iWaitDialog->ProcessFinishedL();
+}
+}*/
+	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveWaitDialogL() end");
+}
+// ---------------------------------------------------------------------------
+// CIAUpdateUiController::RemoveProgressDialogL
+//
+// ---------------------------------------------------------------------------
+//
+void CIAUpdateUiController::RemoveProgressDialogL()
+{
+IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveProgressDialogL() begin");
 if ( !iCancelling )  //that's needed because AVKON  in 3.2.3 wk12, returning
 //EFalse in TryToExitL() causes a crash
 {
-	if ( iWaitDialog )
-{
-	    iWaitDialog->ProcessFinishedL();
-}
-}
-	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveWaitDialogL() end");
-}
-// ---------------------------------------------------------------------------
-// CIAUpdateUiController::RemoveProgressDialogL
-//
-// ---------------------------------------------------------------------------
-//
-void CIAUpdateUiController::RemoveProgressDialogL()
-{
-IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveProgressDialogL() begin");
-if ( !iCancelling )  //that's needed because AVKON  in 3.2.3 wk12, returning
-//EFalse in TryToExitL() causes a crash
-{
 	if ( iProgressDialog )
 {
-	    iProgressDialog->ProcessFinishedL();
+	    //iProgressDialog->ProcessFinishedL();
 }
 }
 	IAUPDATE_TRACE("[IAUPDATE] CIAUpdateUiController::RemoveProgressDialogL() end");
 }

changeset 29	26b6f0522fd8
parent 25	98b66e4fb0be
child 33	8110bf1194d1