--- a/applicationmanagement/server/src/ApplicationManagementServer.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/applicationmanagement/server/src/ApplicationManagementServer.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -1547,6 +1547,7 @@
if (err != KErrNone)
{
aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
+ delete wait;
User::Leave(err);
}
wait->StartWait();
@@ -1554,7 +1555,7 @@
m_Dlg->closeAMWaitDialog();
m_Window->lower();
TRequestStatus s1 = wait->iStatus;
- delete wait;
+
RDEBUG_2( "ApplicationManagementSession: JavaInstallL 1 failed with code %d",
s1.Int() );
@@ -1648,6 +1649,7 @@
if (err != KErrNone)
{
aCompo.SetStatusNode(EDelivered_InstalledFailedWithData);
+ delete wait;
User::Leave(err);
}
RDEBUG_2("ApplicationManagementSession: SisInstallL failed with code before startwait %d",
--- a/deviceupdatesui/deviceupdates/deviceupdates.pro Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/deviceupdates.pro Thu Sep 02 20:16:47 2010 +0300
@@ -71,7 +71,8 @@
./inc/nsmldmdbnotifier.h \
./inc/deviceupdatemoniter.h \
./inc/deviceupdatemoniterobserver.h \
-./inc/DeviceUpdateDebug.h
+./inc/DeviceUpdateDebug.h \
+./inc/customviewitem.h
SOURCES += ./src/dmadvancedview.cpp \
./src/main.cpp \
@@ -86,7 +87,8 @@
./src/settingsdataformcustomitem.cpp\
./src/dmfotaview.cpp \
./src/nsmldmdbnotifier.cpp \
- ./src/deviceupdatemoniter.cpp
+ ./src/deviceupdatemoniter.cpp \
+ ./src/customviewitem.cpp
RESOURCES += ./resources/deviceupdates.qrc
CONFIG += hb
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/inc/customviewitem.h Thu Sep 02 20:16:47 2010 +0300
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Custom list item implementation
+ *
+ */
+
+#ifndef CUSTOMVIEWITEM_H
+#define CUSTOMVIEWITEM_H
+
+#include <hblistviewitem.h>
+#include <hbpushbutton.h>
+#include <hbview.h>
+#include <hbmenu.h>
+#include <HbMainWindow.h>
+#include <hbaction.h>
+
+class DmAdvancedView;
+const qreal topAndBottomMargin = 0;
+const qreal leftMargin = 40;
+const qreal rightMargin = 50;
+
+class CustomViewItem : public HbListViewItem
+ {
+Q_OBJECT
+public:
+ enum
+ {
+ ItemType = Hb::ItemType_Last + 1001
+ };
+ CustomViewItem(DmAdvancedView* serversview, QGraphicsItem * parent = 0);
+ ~CustomViewItem();
+ int type() const;
+ bool canSetModelIndex(const QModelIndex &index);
+ HbAbstractViewItem * createItem();
+ void updateChildItems();
+private:
+ HbPushButton *mButton;
+ DmAdvancedView* callBackView;
+ };
+
+#endif
+
--- a/deviceupdatesui/deviceupdates/inc/dmadvancedview.h Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/inc/dmadvancedview.h Thu Sep 02 20:16:47 2010 +0300
@@ -114,7 +114,6 @@
HbAction* exit;
HbWidget* viewwidget;
HbDocumentLoader *docmlLoader;
- HbPushButton* newserverprofile;
int count;
QTranslator *translator;
QStandardItemModel *model;
--- a/deviceupdatesui/deviceupdates/resources/serversview.docml Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/resources/serversview.docml Thu Sep 02 20:16:47 2010 +0300
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<hbdocument version="0.9">
+<hbdocument version="1.1">
<widget name="view" type="HbView">
<widget name="content" role="HbView:widget" type="HbWidget">
<widget name="label" type="HbLabel">
@@ -11,34 +11,29 @@
<widget name="groupBox" type="HbGroupBox">
<widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
<widget name="listView" type="HbListView">
- <widget name="listItemPrototype" role="HbListView:prototype" type="HbListViewItem">
+ <widget name="listItemPrototype" role="HbAbstractView:prototype" type="HbListViewItem">
<string name="state" value="normal"/>
</widget>
<real name="z" value="2"/>
</widget>
- <widget name="pushButton" type="HbPushButton">
- <string name="text" value="Push Button"/>
- <string name="state" value="normal"/>
- </widget>
<real name="z" value="3"/>
<layout orientation="Vertical" type="linear">
<linearitem itemname="listView"/>
- <linearitem itemname="pushButton"/>
</layout>
</widget>
- <string name="titleText" value="Group Box"/>
<bool name="collapsable" value="FALSE"/>
+ <string name="heading" value="Group Box"/>
</widget>
<widget name="groupBox_1" type="HbGroupBox">
<widget name="listView_1" role="HbGroupBox:contentWidget" type="HbListView">
- <widget name="listItemPrototype_1" role="HbListView:prototype" type="HbListViewItem">
+ <widget name="listItemPrototype_1" role="HbAbstractView:prototype" type="HbListViewItem">
<string name="state" value="normal"/>
</widget>
<real name="z" value="1"/>
</widget>
- <string name="titleText" value="Group Box"/>
<real name="z" value="1"/>
<bool name="collapsable" value="FALSE"/>
+ <string name="heading" value="Group Box"/>
</widget>
<real name="z" value="2"/>
<sizehint height="81.9403un" type="PREFERRED" width="53.28358un"/>
@@ -58,6 +53,11 @@
<string name="title" value="View"/>
</widget>
<section name="landscape">
+ <widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
+ <layout orientation="Vertical" type="linear">
+ <linearitem itemname="listView"/>
+ </layout>
+ </widget>
<widget name="content" role="HbView:widget" type="HbWidget">
<layout type="anchor">
<anchoritem dst="label" dstEdge="LEFT" spacing="0un" src="" srcEdge="LEFT"/>
@@ -68,15 +68,15 @@
<anchoritem dst="container" dstEdge="RIGHT" spacing="0un" src="" srcEdge="RIGHT"/>
</layout>
</widget>
+ </section>
+ <section name="portrait">
<widget name="container_1" role="HbGroupBox:contentWidget" type="HbWidget">
<layout orientation="Vertical" type="linear">
<linearitem itemname="listView"/>
- <linearitem itemname="pushButton"/>
</layout>
</widget>
</section>
- <section name="portrait"/>
- <metadata activeUIState="portrait" display="NHD portrait" unit="un">
+ <metadata activeUIState="portrait" display="NHD-3.2-inch_portrait" unit="un">
<uistate name="Common ui state" sections="#common"/>
<uistate name="landscape" sections="#common landscape"/>
<uistate name="portrait" sections="#common portrait"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/deviceupdatesui/deviceupdates/src/customviewitem.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ * All rights reserved.
+ * This component and the accompanying materials are made available
+ * under the terms of "Eclipse Public License v1.0"
+ * which accompanies this distribution, and is available
+ * at the URL "http://www.eclipse.org/legal/epl-v10.html".
+ *
+ * Initial Contributors:
+ * Nokia Corporation - initial contribution.
+ *
+ * Contributors:
+ *
+ * Description: Custom list item implementation.
+ *
+ */
+
+#include <hblistviewitem.h>
+#include <QGraphicsLinearLayout.h>
+#include "customviewitem.h"
+#include "dmadvancedview.h"
+
+CustomViewItem::CustomViewItem(DmAdvancedView* serversview,
+ QGraphicsItem * parent) :
+ HbListViewItem(parent), mButton(0), callBackView(serversview)
+ {
+ }
+
+CustomViewItem::~CustomViewItem()
+ {
+ }
+
+HbAbstractViewItem * CustomViewItem::createItem()
+ {
+ return new CustomViewItem(*this);
+ }
+
+void CustomViewItem::updateChildItems()
+ {
+ int itemType(modelIndex().data(Hb::ItemTypeRole).toInt());
+ if ( itemType == CustomViewItem::ItemType )
+ {
+ if ( mButton == 0 )
+ {
+ QGraphicsLinearLayout * layout = new QGraphicsLinearLayout();
+ mButton = new HbPushButton(this);
+
+ mButton->setText(hbTrId(
+ "txt_device_update_button_new_server_profile"));
+ connect(mButton, SIGNAL(clicked()), callBackView, SLOT(
+ createNewProfile()));
+ layout->addItem(mButton);
+ layout->setContentsMargins(leftMargin, topAndBottomMargin,
+ rightMargin, topAndBottomMargin);
+ setStretchingStyle(HbListViewItem::StretchLandscape);
+ setLayout(layout);
+ }
+ }
+ else
+ {
+ HbListViewItem::updateChildItems();
+ setStretchingStyle(HbListViewItem::StretchLandscape);
+ }
+ }
+
+bool CustomViewItem::canSetModelIndex(const QModelIndex &index)
+ {
+ Q_UNUSED(index);
+ return true;
+ }
+
+int CustomViewItem::type() const
+ {
+ return CustomViewItem::ItemType;
+ }
+
--- a/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/dmadvancedview.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -19,6 +19,7 @@
#include "dmadvancedview.h"
#include "dmfotaview.h"
#include "serversettingsview.h"
+#include "customviewitem.h"
DmAdvancedView::DmAdvancedView(HbMainWindow *mainWindow,DMFotaView *mainView, DmInfo *info, QGraphicsItem *parent):HbView(parent),
bluetooth(":/icons/qgn_prop_sml_bt.svg"),
@@ -62,7 +63,8 @@
{
modelItem = model->itemFromIndex(item->modelIndex());
currentselecteditem = modelItem->row();
-
+ if(currentselecteditem == dminfo->profilescount())//Button item pressed
+ return;
HbMenu *csmenu = new HbMenu();
csmenu->setAttribute( Qt::WA_DeleteOnClose);
HbAction *defaultprofileAction = 0;
@@ -99,12 +101,16 @@
qDebug("omadm DeviceManagerUi::handleClicked >>");
if(connectionRequested)
return;
- //Stop listening DB events for profile addition
- dminfo->DisableDbNotifications(true);
- //If profile is not locked then take to edit server view
- int itemnum = 0;
+ int itemnum = 0;
QStandardItem *selectedItem = model->itemFromIndex(index);
- itemnum = selectedItem->row();
+ itemnum = selectedItem->row();
+ if(itemnum == dminfo->profilescount())//Button item pressed
+ {
+ qDebug("omadm create new server profile button clicked");
+ return;
+ }
+ //Stop listening DB events for profile addition
+ dminfo->DisableDbNotifications(true);
if(itemnum >= 0 && !dminfo->Isprofilelocked(itemnum))
{
//read profile items
@@ -171,14 +177,22 @@
otherDetailsGroup->setCollapsable( true );
otherDetailsGroup->setCollapsed( true );
list = qobject_cast<HbListView *>(docmlLoader->findWidget( LIST_NAME ) );
- HbListViewItem *prototype = list->listItemPrototype();
- prototype->setGraphicsSize(HbListViewItem::LargeIcon);
- prototype->setSecondaryTextRowCount(1,2);
- prototype->setStretchingStyle(HbListViewItem::StretchLandscape);
+
+ list->listItemPrototype()->setGraphicsSize(HbListViewItem::LargeIcon);
+ list->listItemPrototype()->setSecondaryTextRowCount(1,2);
+ list->listItemPrototype()->setStretchingStyle(HbListViewItem::StretchLandscape);
+
dminfo->refreshProfileList();
int IndicatorCount =dminfo->profilescount();
- model = new QStandardItemModel();
- for (int i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {
+ model = new QStandardItemModel();
+ QList<HbAbstractViewItem *> prototypes ;
+ prototypes.append(list->listItemPrototype());
+ CustomViewItem *prototype2 = new CustomViewItem(this,list);
+ prototypes.append(prototype2);
+ list->setItemPrototypes(prototypes);
+ list->setModel(model);
+ int i;
+ for (i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {
QStringList liststr;
bool lock = false;
int icon = 0;
@@ -219,8 +233,10 @@
item->setData(iconlist , Qt::DecorationRole);
model->setItem(i, item);
}
- list->setModel(model,prototype);
- list->setItemRecycling(false);
+ list->setItemRecycling(false);
+ QStandardItem* customitem = new QStandardItem();
+ customitem->setData(Hb::ItemType_Last + 1001,Hb::ItemTypeRole);
+ model->setItem(i, customitem);
connect(list, SIGNAL(longPressed(HbAbstractViewItem*,QPointF)),
this, SLOT(handleLongPress(HbAbstractViewItem*,QPointF)));
@@ -231,13 +247,7 @@
otherdetailslist->listItemPrototype()->setStretchingStyle(HbListViewItem::StretchLandscape);
otherdetailslist->setLongPressEnabled(EFalse);
qDebug("omadm launching other details list done");
- mainCalltoUpdateView();
-
-
- newserverprofile = qobject_cast<HbPushButton *>(docmlLoader->findWidget(NEWSERVERBUTTON));
- newserverprofile->setText(hbTrId("txt_device_update_button_new_server_profile"));
- connect(newserverprofile, SIGNAL(clicked()),this, SLOT(createNewProfile()));
-
+ mainCalltoUpdateView();
label = qobject_cast<HbLabel *>(docmlLoader->findWidget(LABEL));
label->setPlainText(hbTrId("txt_device_update_subhead_advanced_device_updates"));
@@ -322,7 +332,8 @@
qDebug("omadm DeviceManagerUi::updateListview >>");
model->clear();
int IndicatorCount =dminfo->profilescount();
- for (int i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {
+ int i;
+ for ( i = 0; IndicatorCount > 0 && i < IndicatorCount; ++i) {
QStringList liststr;
bool lock = false;
int icon = 0;
@@ -363,8 +374,9 @@
item->setData(iconlist , Qt::DecorationRole);
model->setItem(i, item);
}
- model->sort(0);
- qDebug("omadm DeviceManagerUi::updateListview >>");
+ QStandardItem* item = new QStandardItem();
+ item->setData(Hb::ItemType_Last + 1001,Hb::ItemTypeRole);
+ model->setItem(i, item);
}
void DmAdvancedView::serversListGroupClicked(bool state)
--- a/deviceupdatesui/deviceupdates/src/main.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/deviceupdatesui/deviceupdates/src/main.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -51,9 +51,12 @@
if( argc == 2) // Launch via Control Panel
{
QTranslator *cptranslator = new QTranslator();
- cptranslator->load("control_panel_" + lang, path);
- qApp->installTranslator(cptranslator);
- app.setApplicationName(hbTrId("txt_applib_list_control_panel"));
+ fine = cptranslator->load("control_panel_" + lang, path);
+ if(fine)
+ qApp->installTranslator(cptranslator);
+ else
+ qDebug("control panel translator loading failed");
+ app.setApplicationName(hbTrId("txt_cp_title_control_panel"));
}
else
{
--- a/omacpadapters/MbxNbrAdapter/Group/MbxNbrAdapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/MbxNbrAdapter/Group/MbxNbrAdapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -53,8 +53,8 @@
LIBRARY euser.lib
LIBRARY provisioningengine.lib
-LIBRARY commonengine.lib
-LIBRARY vmbxengine
+LIBRARY CommonEngine.lib
+LIBRARY vmbxengine.lib
LIBRARY centralrepository.lib
DEBUGLIBRARY flogger.lib
--- a/omacpadapters/WAPAdapter/Group/WPWAPAdapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/WAPAdapter/Group/WPWAPAdapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -62,7 +62,7 @@
LIBRARY msgs.lib
LIBRARY cmmanager.lib
LIBRARY commdb.lib
-LIBRARY commonengine.lib
+LIBRARY CommonEngine.lib
LIBRARY centralrepository.lib
DEBUGLIBRARY flogger.lib
--- a/omacpadapters/accesspointadapter/Src/CWPAPAdapter.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/accesspointadapter/Src/CWPAPAdapter.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -23,7 +23,7 @@
#include <CWPCharacteristic.h>
#include <commdb.h>
-#include <WPAPAdapterResource.rsg>
+#include <wpapadapterresource.rsg>
#include <featmgr.h> // Feature manager
#include "WPAPUtil.h"
#include "CWPAPAccesspointItem.h"
--- a/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/accesspointadapter/Src/CWPAPNapdef.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -23,7 +23,7 @@
#include "CWPAPNapdef.h"
#include <CWPCharacteristic.h>
#include <CWPParameter.h>
-#include <WPAPAdapterResource.rsg>
+#include <wpapadapterresource.rsg>
#include <featmgr.h>
#include <WPAdapterUtil.h>
#include "CWPAPAccesspointItem.h"
@@ -600,6 +600,7 @@
aCharacteristic.AcceptL( *this );
}
}
+ break;
default:
{
if ( ( ( ( aCharacteristic.Name().Compare( KWLAN ) ) == 0 ) ||
--- a/omacpadapters/accesspointadapter/Src/CWPAPPhysicalProxy.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/accesspointadapter/Src/CWPAPPhysicalProxy.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -114,22 +114,18 @@
void CWPAPPhysicalProxy::AddDataL( RCmConnectionMethodExt& aCmItem )
{
LOG("--CWPAP CWPAPPhysicalProxy::AddDataL begin--");
- TInt err(KErrNone);
// CMManager
aCmItem.SetStringAttributeL( CMManager::ECmWapIPGatewayAddress, iProxyAddr->Value());
- LOG2("CWPAP EApWapStartPage, value: %S, err: %d",
- &iProxyAddr->Value(), err);
+ LOG1("CWPAP EApWapStartPage, value: %S ", &iProxyAddr->Value());
//CMManager
aCmItem.SetStringAttributeL( CMManager::ECmIPGateway, iProxyAddr->Value());
- LOG2("CWPAP EApIspIPGateway, value: %S, err: %d",
- &iProxyAddr->Value(), err);
+ LOG1("CWPAP EApIspIPGateway, value: %S ", &iProxyAddr->Value());
//CMManager
aCmItem.SetStringAttributeL( CMManager::ECmProxyServerName, iProxyAddr->Value() );
- LOG2("CWPAP EApProxyServerAddress, value: %S, err: %d",
- &iProxyAddr->Value(), err);
+ LOG1("CWPAP EApProxyServerAddress, value: %S ", &iProxyAddr->Value());
// Store port data
@@ -142,8 +138,7 @@
{
iLogicalPort->AddDataL( aCmItem );
}
- if ( err ) err = 0; // prevent compiler warning
-
+
LOG("--CWPAP CWPAPPhysicalProxy::AddDataL end--");
}
--- a/omacpadapters/accesspointadapter/group/WPAPAdapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omacpadapters/accesspointadapter/group/WPAPAdapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -64,13 +64,12 @@
LIBRARY euser.lib
LIBRARY ProvisioningEngine.lib
LIBRARY commdb.lib
-LIBRARY FeatMgr.lib
+LIBRARY featmgr.lib
LIBRARY ecom.lib
-LIBRARY centralrepository.lib
-LIBRARY cmmanager.lib
-LIBRARY eapsymbiantools.lib
-LIBRARY eaptools.lib
-LIBRARY eaptrace.lib
+LIBRARY centralrepository.lib
+LIBRARY cmmanager.lib
+LIBRARY eaptools.lib
+
DEBUGLIBRARY flogger.lib // Only in debug builds
// End of File
--- a/omadcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadcmoadapters/extmemctrl/group/extmemctrldcmoadapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -45,8 +45,8 @@
LIBRARY euser.lib ecom.lib efsrv.lib bafl.lib etul.lib
LIBRARY centralrepository.lib
-LIBRARY platformenv.lib
-LIBRARY commonengine.lib // Series 60 common components library
-LIBRARY hbcore.lib hbwidgets.lib
+LIBRARY PlatformEnv.lib
+LIBRARY CommonEngine.lib // Series 60 common components library
+LIBRARY HbCore.lib HbWidgets.lib
SMPSAFE
--- a/omadcmoadapters/wlanctrl/group/wlanctrldcmoadapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadcmoadapters/wlanctrl/group/wlanctrldcmoadapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -39,9 +39,9 @@
LANGUAGE_IDS
END
-LIBRARY euser.lib ECom.lib featmgr.lib
-LIBRARY commonengine.lib
-LIBRARY hbcore.lib hbwidgets.lib
+LIBRARY euser.lib ecom.lib featmgr.lib
+LIBRARY CommonEngine.lib
+LIBRARY HbCore.lib HbWidgets.lib
SOURCEPATH ../src
SOURCE wlanctrldcmoadapterproxy.cpp wlanctrldcmoadapter.cpp
--- a/omadmadapters/fota/src/nsmldmfotaadapter.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/fota/src/nsmldmfotaadapter.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -287,13 +287,15 @@
CBufBase* acl=CBufFlat::NewL(10);
CleanupStack::PushL( acl );
- session.GetAclL( KNSmlDMFotaNode,*acl,EFalse );
-
- if( acl->Size() == 0 )
+ TInt err = session.GetAclL( KNSmlDMFotaNode,*acl,EFalse );
+ if ( err == KErrNone)
+ {
+ if( acl->Size() == 0 )
{
_LIT8(KACLForAll, "Add=*&Get=*&Delete=*&Exec=*&Replace=*");
session.UpdateAclL( KNSmlDMFotaNode, KACLForAll);
}
+ }
CleanupStack::PopAndDestroy( acl );
CleanupStack::PopAndDestroy( &session );
--- a/omadmadapters/globalwlansettings/group/globalwlanadapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/globalwlansettings/group/globalwlanadapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -40,4 +40,4 @@
LIBRARY charconv.lib commdb.lib efsrv.lib ecom.lib euser.lib
LIBRARY nsmldebug.lib sysutil.lib
LIBRARY inetprotutil.lib
-LIBRARY centralrepository.lib bafl.lib estor.lib edbms.lib FeatMgr.lib
+LIBRARY centralrepository.lib bafl.lib estor.lib edbms.lib featmgr.lib
--- a/omadmadapters/nsmldminternet/group/nsmlinternetadapter.mmp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/nsmldminternet/group/nsmlinternetadapter.mmp Thu Sep 02 20:16:47 2010 +0300
@@ -49,7 +49,7 @@
LIBRARY commsdat.lib
LIBRARY cmmanager.lib
LIBRARY cmmanagerdatabase.lib
-LIBRARY centralrepository.lib FeatMgr.lib
+LIBRARY centralrepository.lib featmgr.lib
LIBRARY policyengine.lib
LIBRARY nsmldmtreedbclient.lib
LIBRARY eaptools.lib
--- a/omadmadapters/nsmldminternet/src/NSmlInternetAdapter.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/nsmldminternet/src/NSmlInternetAdapter.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -1726,13 +1726,17 @@
tableView->PutRecordChanges();
if (serviceReLock)
{
- DoProtectIAPRecordL(iapID4, ETrue);
+ TInt reclockerriap = DoProtectIAPRecordL(iapID4, ETrue);
TInt reclockerr = DoProtectServiceRecordL(iISPId, ETrue);
DBG_ARGS8(
_S8(
+ "CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting IAP returned code = %d"),
+ reclockerriap);
+ DBG_ARGS8(
+ _S8(
"CNSmlInternetAdapter::AddLeafObjectL ,UnProtecting ServiceRecord returned code = %d"),
reclockerr);
- if (reclockerr == KErrNone)
+ if ((reclockerr == KErrNone) && (reclockerriap == KErrNone))
serviceReLock = EFalse;
}
CleanupStack::PopAndDestroy(); // tableView
@@ -3038,17 +3042,28 @@
CCommsDbTableView* networkView =
iDatabase->OpenViewMatchingUintLC(TPtrC(IAP), TPtrC(
COMMDB_ID), iapID);
- networkView->GotoFirstRecord();
- TRAPD(leavecode, networkView->ReadUintL(TPtrC(IAP_NETWORK),
+ errorCode = networkView->GotoFirstRecord();
+ if (errorCode == KErrNone)
+ {
+ TRAPD(leavecode, networkView->ReadUintL(TPtrC(IAP_NETWORK),
iISPId));
- CleanupStack::PopAndDestroy(); // networkView
- if (leavecode != 0)
+ CleanupStack::PopAndDestroy(); // networkView
+ if (leavecode != 0)
{
_DBG_FILE(
"CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
CleanupStack::PopAndDestroy(pushed);
return CSmlDmAdapter::ENotFound;
}
+ }
+ else
+ {
+ CleanupStack::PopAndDestroy(); // networkView
+ _DBG_FILE(
+ "CNSmlInternetAdapter::FetchLeafObjectL(internal)()(): ENotFound end");
+ CleanupStack::PopAndDestroy(pushed);
+ return CSmlDmAdapter::ENotFound;
+ }
CCommsDbTableView* tableView = iDatabase->OpenViewMatchingUintLC(
TPtrC(NETWORK), TPtrC(COMMDB_ID), iISPId);
@@ -3323,13 +3338,14 @@
CCommsDbTableView* nwidView = iDatabase->OpenViewMatchingUintLC(
TPtrC(IAP), TPtrC(COMMDB_ID), iISPId);
- nwidView->GotoFirstRecord();
- nwidView->ReadUintL(TPtrC(IAP_NETWORK), iISPId);
+ if (nwidView->GotoFirstRecord() == KErrNone)
+ {
+ nwidView->ReadUintL(TPtrC(IAP_NETWORK), iISPId);
+ aObject.InsertL(aObject.Size(), SetIntObjectLC(iISPId));
+ pushed++;
+ }
CleanupStack::PopAndDestroy(); // nwidView
-
- aObject.InsertL(aObject.Size(), SetIntObjectLC(iISPId));
- pushed++;
- }
+ }
else if (aURI.Match(_L8("AP/*/Px/*/PortNbr")) != KErrNotFound)
{
_DBG_FILE(
--- a/omadmadapters/nsmldminternet/src/NSmlWLanAdapter.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/nsmldminternet/src/NSmlWLanAdapter.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -1798,7 +1798,7 @@
if (luid == KErrNotFound)
{
- return;
+ return CSmlDmAdapter::ENotFound;;
}
TInt err = iWlanSettings->GetWlanSettings(luid, *iSettings);
--- a/omadmadapters/nsmldminternet/src/NSmlWlanSettings.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/nsmldminternet/src/NSmlWlanSettings.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -1676,7 +1676,7 @@
CleanupStack::PopAndDestroy(iapViews);
CleanupStack::PopAndDestroy(commsDataBase);
- iDatabase.BeginTransaction();
+ err = iDatabase.BeginTransaction();
return err;
}
--- a/omadmadapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/syncmldm12/src/NSmlDmSettingsAdapter12.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -2950,37 +2950,47 @@
break;
case ( ETransportAuthName ):
{
- OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
- TInt mediumType = ENone;
- GetProfileConnectiontypeL( mediumType );
+ TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+ if( retVal != KErrNone )
+ {
+ iCurrentProfile = 0;
+ iProfile.Close();
+ _DBG_FILE( "CNSmlDMSettingsAdapter12::SetDMFieldDataL(): end" );
+ return retVal;
+ }
+
+ TInt mediumType = ENone;
+ GetProfileConnectiontypeL( mediumType );
if( mediumType == EHttp)
{
rValue = SetProfileHttpUserNameL ( aLUID, aObject );
- }
- else if(mediumType == EObex)
- {
- rValue = KErrNone;
-
- }
-
-
- //break;
+ }
+ else if(mediumType == EObex)
+ {
+ rValue = KErrNone;
+ }
}
break;
case ( EProfileTransportPassword ):
{
- TInt mediumType = ENone;
- OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
- GetProfileConnectiontypeL( mediumType );
+ TInt mediumType = ENone;
+ TInt retVal = OpenSyncSessionAndProfileL( aLUID, ESmlOpenReadWrite );
+ if( retVal != KErrNone )
+ {
+ iCurrentProfile = 0;
+ iProfile.Close();
+ _DBG_FILE( "CNSmlDMSettingsAdapter12::SetDMFieldDataL(): end" );
+ return retVal;
+ }
+ GetProfileConnectiontypeL( mediumType );
if( mediumType == EHttp)
{
rValue = SetProfileHttpPasswordL ( aLUID, aObject );
- }
- else if(mediumType == EObex)
- {
- rValue = KErrNone;
-
- }
+ }
+ else if(mediumType == EObex)
+ {
+ rValue = KErrNone;
+ }
}
break;
case (EProfileTransportAuthData) :
--- a/omadmadapters/syncmlds/src/NSmlDsSettingsAdapter.cpp Wed Aug 18 09:39:31 2010 +0300
+++ b/omadmadapters/syncmlds/src/NSmlDsSettingsAdapter.cpp Thu Sep 02 20:16:47 2010 +0300
@@ -420,11 +420,7 @@
}
}
- else if( fieldID == EProfileURL )
- {
- ret = SetProfileServerURIL( iParentLUID, aObject );
- }
- else if( fieldID == EProfileMediumType )//AddrType
+ else if( fieldID == EProfileMediumType )//AddrType
{
if ( iLeafType == EDSDelete )
{