--- a/applicationmanagement/server/inc/ApplicationManagementServer.h Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/inc/ApplicationManagementServer.h Fri Aug 06 18:56:37 2010 +0530
@@ -28,7 +28,7 @@
#include <swi/sisregistrysession.h>
#include <swi/sisregistrypackage.h>
#include <swi/sisregistryentry.h>
-#include <HbProgressDialog.h>
+#include <hbprogressdialog.h>
#include <hbmainwindow.h>
#include <hbaction.h>
#include <usif/sif/sif.h>
--- a/applicationmanagement/server/inc/appmgmtdownloadmgr.h Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/inc/appmgmtdownloadmgr.h Fri Aug 06 18:56:37 2010 +0530
@@ -76,7 +76,7 @@
appmgmtdownloadmgr(QWidget* parent, MDownloadMgrQTCallback& wrapper, TRequestStatus& aStatus);
~appmgmtdownloadmgr();
- void startDownload(CDeploymentComponent *aComponent);
+ void startDownload(CDeploymentComponent *aComponent, int aIapid);
void showDialog(CDeploymentComponent *aComponent);
void showUninstallDialog(const CDeploymentComponent &aCompo, TRequestStatus &s);
void updateProgress(TInt32 aDownloadedSize, TInt32 aContentSize);
@@ -91,6 +91,7 @@
void sendSrvToBg();
QString convertSize();
int currDwnldStatForGenericAlert(int dwnldstatus);
+ QString GetIapNameWithIdL(TInt aIapId);
public slots:
bool downloadMgrEventRecieved(DownloadManagerEvent *event);
--- a/applicationmanagement/server/server.pro Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/server.pro Fri Aug 06 18:56:37 2010 +0530
@@ -70,7 +70,8 @@
-lapgrfx \
-lws32 \
-lapmime \
- -lsif
+ -lsif \
+ -lcmmanager
}
TEMPLATE = app
TARGET = applicationmanagementserver
@@ -123,10 +124,10 @@
./src/amwaitprogdialog.cpp \
./src/AMAppHideUtil.cpp \
./src/AMDeploymentComponent.cpp \
- ./src/amdeploymentcomponentdata.cpp \
+ ./src/AMDeploymentComponentData.cpp \
./src/AMDownloaddb.cpp \
./src/AMPreInstallApp.cpp \
- ./src/amsmlhelper.cpp \
+ ./src/AMSmlHelper.cpp \
./src/amstorage.cpp \
./src/ApplicationManagementJavaUtility.cpp \
./src/ApplicationManagementServer.cpp \
--- a/applicationmanagement/server/src/AMDeploymentComponent.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/src/AMDeploymentComponent.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -19,9 +19,9 @@
#include <s32mem.h>
#include <featmgr.h>
#include <ssl.h>
-#include <APGCLI.H>
-#include <APMREC.h>
-#include <APMSTD.H>
+#include <apgcli.h>
+#include <apmrec.h>
+#include <apmstd.h>
#ifdef __SERIES60_30__
#include <CMenuClient.h>
#endif
--- a/applicationmanagement/server/src/AMDownloadStore.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/src/AMDownloadStore.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -143,7 +143,7 @@
aComponent->SetCallback(this);
appdwnld = new appmgmtdownloadmgr(0, *this, aStatus);
- appdwnld->startDownload(aComponent);
+ appdwnld->startDownload(aComponent, iap);
RDEBUG( "CAMDwnldQTWrap::StartDownload End" );
--- a/applicationmanagement/server/src/ApplicationManagementServer.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/src/ApplicationManagementServer.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -24,7 +24,7 @@
#include <imcvcodc.h>
#include <uikon.hrh>
#include <e32property.h>
-#include <DriveInfo.h>
+#include <driveinfo.h>
#include <SWInstDefs.h>
#include <PolicyEngineClient.h>
#include <PolicyEngineXACML.h>
--- a/applicationmanagement/server/src/appmgmtdownloadmgr.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/src/appmgmtdownloadmgr.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -18,11 +18,10 @@
#include <nsmldmconst.h>
#include <downloadmanager.h>
#include <download.h>
-#include <e32Property.h>
#include <serviceipc.h>
#include <hbdialog.h>
#include <hblabel.h>
-#include <HbMessageBox.h>
+#include <hbmessagebox.h>
#include <hbapplication.h>
#include <hbdevicenotificationdialog.h>
#include <hbaction.h>
@@ -30,7 +29,7 @@
#include <coemain.h>
#include <e32base.h>
#include <eikenv.h>
-#include <Driveinfo.h>
+#include <driveinfo.h>
#include <e32property.h>
#include "ApplicationManagementUtility.h"
#include "debug.h"
@@ -39,6 +38,9 @@
#include "appmgmtnotifier.h"
#include "appmgmtdownloadmgr.h"
#include "ServicePluginLogger.h"
+
+#include <cmmanager.h>
+#include <cmconnectionmethod.h>
using namespace NApplicationManagement;
// ------------------------------------------------------------------------------------------------
@@ -84,7 +86,7 @@
// ------------------------------------------------------------------------------------------------
// appmgmtdownloadmgr::startDownload
// ------------------------------------------------------------------------------------------------
-void appmgmtdownloadmgr::startDownload(CDeploymentComponent *aComponent)
+void appmgmtdownloadmgr::startDownload(CDeploymentComponent *aComponent, int aIapid)
{
RDEBUG( "appmgmtdownloadmgr::startDownload Start" );
@@ -116,6 +118,10 @@
RProperty::Get(KPSUidNSmlSOSServerKey,KNSmlDMSilentJob,silentsession);
CApplicationManagementUtility::iSilentSession = silentsession;
+
+ QString name = GetIapNameWithIdL(aIapid);
+
+ int ret = iDownloadManager->setAttribute(AccessPoint, name);
iDl = iDownloadManager->createDownload(url, m_type);
@@ -825,7 +831,30 @@
}
}
+// --------------------------------------------------------------------------
+// Gets the access point name for a given access point id.
+// --------------------------------------------------------------------------
+QString appmgmtdownloadmgr::GetIapNameWithIdL(TInt aIapId)
+ {
+ QString name(NULL);
+ RCmManager cmManager;
+ cmManager.OpenL();
+
+ RCmConnectionMethod conn;
+ conn = cmManager.ConnectionMethodL(aIapId);
+
+ HBufC* temp = conn.GetStringAttributeL(CMManager::ECmName);
+ name = QString::fromUtf16(temp->Ptr(), temp->Length());
+ delete temp;
+ temp = NULL;
+
+ conn.Close();
+
+ cmManager.Close();
+
+ return name;
+ }
//---------------------------------------------------------------------------------
// CDialogWait::CDialogWait
--- a/applicationmanagement/server/src/appmgmtnotifier.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/applicationmanagement/server/src/appmgmtnotifier.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -16,17 +16,18 @@
*/
-#include <HbDeviceDialog.h>
+#include <hbdevicedialog.h>
#include <apgtask.h>
#include <eikenv.h>
-#include <Driveinfo.h>
+#include <driveinfo.h>
+#include <hbapplication.h>
+#include <hbmessagebox.h>
#include "amstorage.h"
#include "appmgmtnotifier.h"
#include "appmgmtdownloadmgr.h"
-#include "applicationmanagementutility.h"
+#include "ApplicationManagementUtility.h"
#include "debug.h"
-#include <hbapplication.h>
-#include <hbmessagebox.h>
+
// ------------------------------------------------------------------------------------------------
// AppMgmtNotifier::AppMgmtNotifier
// ------------------------------------------------------------------------------------------------
--- a/clientprovisioning/cpqtsp/inc/CWPBioControl.h Fri Jul 23 16:30:56 2010 +0530
+++ b/clientprovisioning/cpqtsp/inc/CWPBioControl.h Fri Aug 06 18:56:37 2010 +0530
@@ -22,14 +22,14 @@
// INCLUDES
#include <e32cmn.h>
-#include <MSVAPI.H>
+#include <CWPNameValue.h>
#include <hbsymbianvariant.h>
#include <hbdevicedialogsymbian.h>
#include <CWPBootstrap.h>
+#include "ProvisioningUIDs.h"
+#include "CpMessage.h"
#include "CWPSaver.h"
-#include <ProvisioningUIDs.h>
-#include <CpMessage.h>
-#include <CpQtSpView.h>
+#include "CpQtSpView.h"
class CWPEngine;
class CWPNameValue;
--- a/clientprovisioning/cpqtsp/inc/CpQtSpView.h Fri Jul 23 16:30:56 2010 +0530
+++ b/clientprovisioning/cpqtsp/inc/CpQtSpView.h Fri Aug 06 18:56:37 2010 +0530
@@ -23,7 +23,7 @@
#include <xqserviceprovider.h>
#include <QGraphicsLinearLayout>
#include <CWPNameValue.h>
-#include <MSVAPI.H>
+#include <msvapi.h>
#include <hbscrollarea.h>
#include <CpQtSpMainWindow.h>
#include <HbGroupBox>
--- a/clientprovisioning/cpqtsp/src/CWPBioControl.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/clientprovisioning/cpqtsp/src/CWPBioControl.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -40,7 +40,7 @@
#include <hbdevicedialog.h>
#include <QObject>
#include <devicedialogconsts.h>
-#include <PnpUtilLogger.h>
+#include "PnpUtilLogger.h"
// CONSTANTS
_LIT(KNone,"");
--- a/clientprovisioning/cpqtsp/src/CpQtSpView.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/clientprovisioning/cpqtsp/src/CpQtSpView.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -19,7 +19,7 @@
#include <hbapplication.h>
#include <hbtoolbar.h>
#include <hbaction.h>
-#include <HbMenu.h>
+#include <hbmenu.h>
#include <HbTextItem>
#include <HbFontSpec>
#include <HbMessageBox>
@@ -29,22 +29,22 @@
#include <xqserviceutil.h>
#include <e32base.h>
#include <flogger.h>
-#include <CWPNameValue.h>
#include <CWPEngine.h>
-#include <CpQtSpView.h>
-#include <CpQtSpMainWindow.h>
#include <HbGroupBox>
#include <HbListWidget>
#include <HbListWidgetItem>
#include <HbLabel>
-#include <MSVSTD.H>
-#include <SMSCLNT.H>
-#include <MTCLREG.H>
-#include <SMUTHDR.H>
+#include <msvstd.h>
+#include <smsclnt.h>
+#include <mtclreg.h>
+#include <smuthdr.h>
#include <QDateTime>
+#include "CWPNameValue.h"
+#include "CpQtSpView.h"
+#include "CpQtSpMainWindow.h"
#include "ProvisioningDebug.h"
#include "ProvisioningUIDs.h"
-#include <CWPBioControl.h>
+#include "CWPBioControl.h"
const QString DATE_TIME_FORMAT("dd.MM.yy hh:mm");
// ----------------------------------------------------------------------------
--- a/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtdialogsplugin/src/devicemanagementnotifierutils.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -23,7 +23,7 @@
#include <hbaction.h>
#include <e32property.h>
#include <qdebug.h>
-#include "SyncMLNotifierParams.h"
+#include <devicedialogsymbian.h>
#include "pnputillogger.h"
#include "omacppinquerydialog.h"
#include "devicemanagementnotifierwidget_p.h"
--- a/devicemgmtdialogsplugin/src/fotadevicedialogs.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtdialogsplugin/src/fotadevicedialogs.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -15,21 +15,22 @@
*
*/
-#include "devicemanagementnotifierutils.h"
+
#include <hbdocumentloader.h>
#include <hbdialog.h>
#include <hblabel.h>
#include <hbmessagebox.h>
-#include <HbAction.h>
-#include <e32Property.h>
-#include "syncmlnotifierparams.h"
-#include "fotadevicedialogs.h"
-#include "PnpUtilLogger.h"
-#include <QDebug.h>
-#include <HbListView.h>
+#include <hbaction.h>
+#include <e32property.h>
+#include <qdebug.h>
+#include <hblistview.h>
#include <hbpushbutton.h>
#include <e32math.h>
#include <QStandardItemModel>
+#include <devicedialogsymbian.h>
+#include "devicemanagementnotifierutils.h"
+#include "fotadevicedialogs.h"
+#include "pnputillogger.h"
// ---------------------------------------------------------------------------
--- a/devicemgmtdialogsplugin/src/omacppinquerydialog.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtdialogsplugin/src/omacppinquerydialog.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -15,11 +15,11 @@
*
*/
-#include <e32Property.h>
+#include <e32property.h>
#include <qdebug.h>
#include <qtranslator.h>
#include <qcoreapplication.h>
-#include <HbAction.h>
+#include <hbaction.h>
#include <devicedialogconsts.h>
#include "omacppinquerydialog.h"
#include "pnputillogger.h"
--- a/devicemgmtdialogsplugin/src/syncmlnotifierprivate.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtdialogsplugin/src/syncmlnotifierprivate.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -17,14 +17,14 @@
#include <e32property.h>
-#include "syncmlnotifierprivate.h"
#include <SyncMLClientDM.h>
#include <SyncMLClient.h>
#include <centralrepository.h>
#include <DevManInternalCRKeys.h>
+#include <centralrepository.h>
+#include <devicedialogsymbian.h>
+#include "syncmlnotifierprivate.h"
#include "nsmlconstantdefs.h"
-#include "syncmlnotifierparams.h"
-#include <centralrepository.h>
--- a/devicemgmtindicatorsplugin/src/dmindicatorsplugin.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtindicatorsplugin/src/dmindicatorsplugin.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -106,7 +106,7 @@
qDebug("DMIndicatorsPlugin::accessAllowed() SecUID is not secure ");
return false;
}
-#elif
+#else
Q_UNUSED(securityInfo)
qDebug("DMIndicatorsPlugin::accessAllowed() not Symbian ");
return false;
--- a/devicemgmtindicatorsplugin/src/dmpronoteindicators.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/devicemgmtindicatorsplugin/src/dmpronoteindicators.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -14,17 +14,18 @@
* Description: DM Progress and Notification indicators implementation
*
*/
-#include "dmindicator.h"
-#include "dmpronoteindicators.h"
+
#include <QByteArray>
#include <QVariant>
#include <e32base.h>
#include <w32std.h>
#include <apgtask.h>
#include <apgtask.h>
-#include <HbIndicator.h>
+#include <hbindicator.h>
+#include <eikenv.h>
+#include "dmindicator.h"
+#include "dmpronoteindicators.h"
-#include <eikenv.h>
// ----------------------------------------------------------------------------
// DMProNoteIndicator::DMProNoteIndicator
// @see dmpronoteindicators.h
--- a/deviceupdatesui/deviceupdates/inc/dmfotaview.h Fri Jul 23 16:30:56 2010 +0530
+++ b/deviceupdatesui/deviceupdates/inc/dmfotaview.h Fri Aug 06 18:56:37 2010 +0530
@@ -24,7 +24,7 @@
#include <QGraphicsLinearLayout>
#include <hbgroupbox.h>
#include <hbview.h>
-#include <SysUtil.h>
+#include <sysutil.h>
#include <hblabel.h>
#include <hbdocumentloader.h>
#include <hbmenu.h>
@@ -35,8 +35,8 @@
#include <centralrepository.h>
#include <QTranslator>
#include <nsmldmdef.h>
+#include <fotaengine.h>
#include "dminforetrieval.h"
-#include <fotaengine.h>
#include "deviceupdatemoniterobserver.h"
//_LIT( KSmlEOL, "\n" );
--- a/omacpadapters/MbxNbrAdapter/Src/MbxNbrAdapter.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/omacpadapters/MbxNbrAdapter/Src/MbxNbrAdapter.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -21,7 +21,7 @@
#include <CWPCharacteristic.h>
#include <CWPParameter.h>
#include <wpmbxnbradapterresource.rsg>
-#include <CVoiceMailBox.h>
+#include <cvoicemailbox.h>
#include <cvoicemailboxentry.h>
#include <commonphoneparser.h>
#include <voicemailboxdomaincrkeys.h>
--- a/omacpadapters/bld/bld.inf Fri Jul 23 16:30:56 2010 +0530
+++ b/omacpadapters/bld/bld.inf Fri Aug 06 18:56:37 2010 +0530
@@ -18,8 +18,8 @@
PRJ_PLATFORMS
DEFAULT
PRJ_EXPORTS
-../Rom/ProvisioningAdapter.iby CORE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapter.iby)
-../Rom/ProvisioningAdapterResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapterresources.iby)
+../rom/ProvisioningAdapter.iby CORE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapter.iby)
+../rom/ProvisioningAdapterResources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(provisioningAdapterresources.iby)
../MbxNbrAdapter/loc/MailboxAdapter.loc MW_LAYER_LOC_EXPORT_PATH(mailboxadapter.loc)
../accesspointadapter/loc/WPAPAdapter.loc MW_LAYER_LOC_EXPORT_PATH(WPAPAdapter.loc)
--- a/omadcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/omadcmoadapters/extmemctrl/src/extmemctrldcmoadapter.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -20,7 +20,6 @@
#include <driveinfo.h>
#include <barsread.h>
#include <barsc2.h>
-#include <f32file.h>
#include <data_caging_path_literals.hrh>
#include <DevManInternalCRKeys.h>
#include <centralrepository.h>
--- a/omadmadapters/email/tsrc/src/dmatest.cpp Fri Jul 23 16:30:56 2010 +0530
+++ b/omadmadapters/email/tsrc/src/dmatest.cpp Fri Aug 06 18:56:37 2010 +0530
@@ -176,7 +176,10 @@
TRAPD(err, SaveMappingsL() );
if ( err != KErrNone )
{
- iLog->Log( _L8( "Failed to save mappings!: %d"), err );
+ if ( iLog )
+ {
+ iLog->Log( _L8( "Failed to save mappings!: %d"), err );
+ }
}
Delete();