FCL/sf/mw/remotemgmt: comparison fotaapplication/fotaserver/src/FotaServer.cpp

equal deleted inserted replaced

-:d2517372cc44
+:ae69c2e8bc34
 *
 * Description:   Fota server update and download functionality
 *
 */
 // INCLUDE FILES
+#include <eikenv.h>
 #include <apgtask.h>
 #include <apgwgnam.h>
 #include <schtime.h>
 #include <csch_cli.h>
 #include <e32property.h>
 FLOG(_L("CFotaServer::StartDownloadDialog >>"));
 //The dialog should not timeout here.
 if (!iFullScreenDialog)
 {
 //ConstructApplicationUI(ETrue);
-iFullScreenDialog = new FotaFullscreenDialog(this);
+iFullScreenDialog = new HbFotaFullscreenDialog(this);
 }
-iFullScreenDialog->SetSoftwareDetails(aSize, aVersion, aName);
+iFullScreenDialog->setSoftwareDetails(aSize, aVersion, aName);
-iFullScreenDialog->SetWarningDetails(EHbFotaDownload);
+iFullScreenDialog->setWarningDetails(EHbFotaDownload);
 TBool postpone = IsUserPostponeAllowed();
 if (!postpone)
 {
 FLOG(_L("Disabling option to resume later!"));
-iFullScreenDialog->DisableRSK(ETrue);
+iFullScreenDialog->disableRSK(ETrue);
 }
 FLOG(_L("CFotaServer::StartDownloadDialog <<"));
 }
 iPackageState.iPkgVersion);
 StartDownloadDialog(name, version, iPackageState.iPkgSize);
 ConstructApplicationUI(ETrue);
 }
-iFullScreenDialog->UpdateProgressBar(aProgress);
+iFullScreenDialog->updateProgressBar(aProgress);
 FLOG(_L("CFotaServer::UpdateDownloadDialog <<"));
 }
 void CFotaServer::ShowDialogL(TFwUpdNoteTypes adialogid)
 {
 FLOG(_L("Deleting the open device dialog!!"));
 iNotifier->Cancel();
 }
 ServerCanShut(EFalse);
-iDialogId = (TInt) adialogid;
 iNotifParams = CHbSymbianVariantMap::NewL();
 HBufC* keyDialog = HBufC::NewL(10);
 CleanupStack::PushL(keyDialog);
 CleanupStack::PushL(keyParam4);
 *keyParam4 = KKeyParam4;
 CHbSymbianVariant* dialogId = CHbSymbianVariant::NewL(&adialogid,
 CHbSymbianVariant::EInt);
-CleanupStack::PushL(dialogId);
+//CleanupStack::PushL(dialogId);
 iNotifParams->Add(*keyDialog, dialogId);
-if (!iNotifier)
-iNotifier = CFotaDownloadNotifHandler::NewL(this);
 switch (adialogid)
 {
 case EFwUpdNotEnoughBattery:
 case EFwUpdDeviceBusy:
 case EFwUpdResumeDownload:
 {
 FLOG(_L("CFotaServer::EFwUpdResumeUpdate / EFwUpdResumeDownload"));
 CHbSymbianVariant* param1Val = CHbSymbianVariant::NewL(
 &iPackageState.iPkgSize, CHbSymbianVariant::EInt);
-CleanupStack::PushL(param1Val);
+//CleanupStack::PushL(param1Val);
 iNotifParams->Add(*keyParam1, param1Val);
 TBuf16<KFotaMaxPkgNameLength>    temp1;
 temp1.Copy(iPackageState.iPkgVersion);
 CHbSymbianVariant* param2Val = CHbSymbianVariant::NewL(
 //&iPackageState.iPkgVersion, CHbSymbianVariant::EDes);
 &temp1, CHbSymbianVariant::EDes);
-CleanupStack::PushL(param2Val);
+//CleanupStack::PushL(param2Val);
 iNotifParams->Add(*keyParam2, param2Val);
 TBuf16<KFotaMaxPkgNameLength>    temp2;
 temp2.Copy(iPackageState.iPkgName);
 CHbSymbianVariant* param3Val = CHbSymbianVariant::NewL(
 &temp2, CHbSymbianVariant::EDes);
-CleanupStack::PushL(param3Val);
+//CleanupStack::PushL(param3Val);
 iNotifParams->Add(*keyParam3, param3Val);
 TBool postpone = IsUserPostponeAllowed();
 CHbSymbianVariant* param4Val = CHbSymbianVariant::NewL(&postpone,
 CHbSymbianVariant::EInt);
-CleanupStack::PushL(param4Val);
+//CleanupStack::PushL(param4Val);
 iNotifParams->Add(*keyParam4, param4Val);
 iNotifier->LaunchNotifierL(iNotifParams, adialogid);
-CleanupStack::PopAndDestroy(4);
+//CleanupStack::PopAndDestroy(4);
 }
 break;
 default:
 FLOG(_L("CFotaServer::default"));
 //Do nothing
 }
 break;
 }
-CleanupStack::PopAndDestroy(6);
+CleanupStack::PopAndDestroy(5);
 FLOG(_L("CFotaServer::ShowDialogL >>"));
 }
 void CFotaServer::HandleDialogResponse(int response, TInt aDialogId)
 {
 //Do nothing
 }
 break;
 }
-/*
-if(iNotifParams)
-{
-delete iNotifParams; iNotifParams = NULL;
-}
-if(iNotifier)
-{
-delete iNotifier; iNotifier = NULL;
-}*/
-iDialogId = 0;
 FLOG(_L("CFotaServer::HandleDialogResponse<<"));
 }
 void CFotaServer::SetServerActive(TBool aValue)
 {
 if (!iFullScreenDialog)
 {
 const QString  ver =   QString::fromUtf8( reinterpret_cast<const char*> (iPackageState.iPkgVersion.Ptr()), iPackageState.iPkgVersion.Length());
 const QString name =   QString::fromUtf8( reinterpret_cast<const char*> (iPackageState.iPkgName.Ptr()), iPackageState.iPkgName.Length());
-iFullScreenDialog = new FotaFullscreenDialog(this);
+iFullScreenDialog = new HbFotaFullscreenDialog(this);
-iFullScreenDialog->SetSoftwareDetails(iPackageState.iPkgSize, ver, name);
+iFullScreenDialog->setSoftwareDetails(iPackageState.iPkgSize, ver, name);
-iFullScreenDialog->SetWarningDetails(EHbFotaDownload);
+iFullScreenDialog->setWarningDetails(EHbFotaDownload);
 ConstructApplicationUI(ETrue);
 }
 if (aType == EHbFotaUpdate)
 {
-iFullScreenDialog->UpdateProgressBar(100);
+iFullScreenDialog->updateProgressBar(100);
 TBool postpone = IsUserPostponeAllowed();
 if (!postpone)
 {
 FLOG(_L("Disabling option to resume later!"));
-iFullScreenDialog->DisableRSK(ETrue);
+iFullScreenDialog->disableRSK(ETrue);
 }
-iFullScreenDialog->ShowUpdateDialog();
+iFullScreenDialog->showUpdateDialog();
 }
 else if (aType == EHbFotaLowBattery)
 {
-iFullScreenDialog->UpdateProgressBar(100);
+iFullScreenDialog->updateProgressBar(100);
-iFullScreenDialog->DisableRSK(EFalse);
+iFullScreenDialog->disableRSK(EFalse);
-iFullScreenDialog->SetWarningDetails(EHbFotaLowBattery);
+iFullScreenDialog->setWarningDetails(EHbFotaLowBattery);
 }
 FLOG(_L("CFotaServer::ShowFullScreenDialog <<"));
 }
 CServer2(EPriorityStandard, EUnsharableSessions) /*CServer2(0)*/,
 iDatabase(0), iInitialized(EFalse), iDownloader(0), iUpdater(0),
 iDownloadFinalizer(0), iUpdateFinalizer(0), iTimedExecuteResultFile(0), iTimedSMLSessionClose(0),
 iAppShutter(0), iMonitor(NULL), iSyncMLAttempts(0), iSyncJobId(-1),iRetryingGASend(EFalse),
 iNetworkAvailable(EFalse),iFullScreenDialog(NULL), iNotifParams(NULL), iNotifier(NULL),
-iServerCanShut(EFalse), iAsyncOperation(EFalse),iDialogId (0), iConstructed(EFalse), iMainwindow(mainwindow)
+iServerCanShut(EFalse), iAsyncOperation(EFalse), iConstructed(EFalse), iMainwindow(mainwindow)
 {
 RProcess pr;
 TFullName fn = pr.FullName();
 TUint prid = pr.Id();
 FLOG(_L( "CFotaServer::CFotaServer process(id %d)%S. this 0x%x"), prid,
 TInt err;
 iLastFwUrl.Zero();
 StartL(KFotaServerName);
 __LEAVE_IF_ERROR(iFs.Connect());
+iNotifier = CFotaDownloadNotifHandler::NewL(this);
 err = iFs.CreatePrivatePath(EDriveC);
 if (err != KErrNone && err != KErrAlreadyExists)
 {
 __LEAVE_IF_ERROR(err);
 FLOG(_L("   1 got state id:%d state:%d result:%d"), tmp.iPkgId,
 tmp.iState, tmp.iResult);
 //Download was started earlier and was interrupted.
 if (tmp.iState == RFotaEngineSession::EStartingUpdate || tmp.iState
-== RFotaEngineSession::EDownloadProgressing || tmp.iState
 == RFotaEngineSession::EDownloadProgressing)
 {
 TBool ispkgvalid = ETrue;
 //Software version check from the time download started.
 else if (iPackageState.iState == RFotaEngineSession::EDownloadProgressing)
 {
 FLOG(_L("Download has paused due to an error. Invoking FMS..."));
 if (iFullScreenDialog)
 {
-iFullScreenDialog->Close();
+iFullScreenDialog->close();
 iFullScreenDialog->deleteLater();
 iFullScreenDialog = NULL;
 }
 SetStartupReason(EFotaDownloadInterrupted);
 InvokeFmsL();
 }
 else
 {
 if (iFullScreenDialog)
 {
-iFullScreenDialog->Close();
+iFullScreenDialog->close();
 iFullScreenDialog->deleteLater();
 iFullScreenDialog = NULL;
 }
 ConstructApplicationUI(EFalse);
 ReportFwUpdateStatusL(iPackageState);
 }
 break;
 case RFotaEngineSession::EResLowBattery:
 {
 reason = EUpdMonitorbattery;
+break;
 }
 default:
 {
 break;
 }
 if (iFullScreenDialog)
 {
 iFullScreenDialog->deleteLater();
 }
-		/*
+if (iNotifier)
+{
+delete iNotifier;
+iNotifier = NULL;
+}
 if (iNotifParams)
 {
 delete iNotifParams;
 iNotifParams = NULL;
 }
-if (iNotifier)
-{
-delete iNotifier;
-iNotifier = NULL;
-}*/
 FLOG(_L("CFotaServer::~CFotaServer  <<"));
 }
 // ---------------------------------------------------------------------------
 StopServerWhenPossible();
 FLOG(_L("CFotaServer::FinalizeUpdate <<"));
 }
-FotaFullscreenDialog* CFotaServer::FullScreenDialog()
+HbFotaFullscreenDialog* CFotaServer::FullScreenDialog()
 {
 return iFullScreenDialog;
 }
 void CFotaServer::HandleFullScreenDialogResponse(TInt aResponse)
 FLOG(_L("CONTINUE LATER is pressed on update dialog"));
 ConstructApplicationUI(EFalse);
 iUpdater->CancelMonitor();
-if (iFullScreenDialog->IsLSKEnabled())
+if (iFullScreenDialog->isLSKEnabled())
 {
 DecrementUserPostponeCount();
 }
 iPackageState.iState = RFotaEngineSession::EStartingUpdate;
 void CFotaServer::SetVisible(TBool aVisible)
 {
 FLOG(_L("CFotaServer::SetVisible >>"));
 if(iFullScreenDialog)
-	iFullScreenDialog->SetVisible(aVisible);
+	iFullScreenDialog->setVisible(aVisible);
 FLOG(_L("CFotaServer::SetVisible <<"));
 }
 //End of file

changeset 73	ae69c2e8bc34
parent 54	085438c28042