diff -r a082c848c9a9 -r 3cdbd92ee07b syncmlfw/dm/provisioningadapter/src/NSmlDmProvisioningAdapter.cpp --- a/syncmlfw/dm/provisioningadapter/src/NSmlDmProvisioningAdapter.cpp Wed Sep 15 13:08:27 2010 +0300 +++ b/syncmlfw/dm/provisioningadapter/src/NSmlDmProvisioningAdapter.cpp Wed Oct 13 15:30:06 2010 +0300 @@ -23,7 +23,7 @@ #include // CommsDB columname defs #include #include -#include +#include #include #include #include @@ -38,9 +38,8 @@ #include #include "NSmlDmProvisioningAdapter.h" #include "NSmlTransportHandler.h" + #include -#include "ProvisioningInternalCRKeys.h" -#include // ============================ MEMBER FUNCTIONS =============================== @@ -133,24 +132,8 @@ // ----------------------------------------------------------------------------- TInt CNSmlDmProvisioningAdapter::ItemCount() const { - - CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV ); - TInt adapterCount( 0 ); - TInt getErr = repository->Get( KOMAProvCriticalAdapterSettingCount, adapterCount); - if(getErr != KErrNone) - { - _DBG_FILE("CWPMessage::ProcessL: get KOMAProvCriticalAdapterSettingCount Failed" ); - } - TInt criticalAdapterSettingCount = adapterCount + iProfiles.Count(); - - TInt setErr = repository->Set(KOMAProvCriticalAdapterSettingCount, criticalAdapterSettingCount); - if(setErr != KErrNone) - { - _DBG_FILE("CNSmlDmProvisioningAdapter::ItemCount(): set KOMAProvCriticalAdapterSettingCount failed"); - } - CleanupStack::PopAndDestroy(); // repository - return iProfiles.Count(); - } + return iProfiles.Count(); + } // ----------------------------------------------------------------------------- // CNSmlDmProvisioningAdapter::SummaryTitle @@ -505,39 +488,7 @@ if(iState!=CNSmlDmProvisioningAdapter::EStateNull) { - - TInt authType( 0 ); - TInt allowCriticalSetting( 0 ); - CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV ); - - TInt error = repository->Get( KOMAProvMessageOpen, authType ); - if(error !=KErrNone) - { - _DBG_FILE("CNSmlDmProvisioningAdapter::VisitL Get KOMAProvMessageOpen Failed"); - } - - error = repository->Get( KOMAProvAllowCriticalAdapterSetting, allowCriticalSetting ); - if(error !=KErrNone) - { - _DBG_FILE("CNSmlDmProvisioningAdapter::VisitL Get KOMAProvMessageOpen Failed"); - } - CleanupStack::PopAndDestroy(); // repository - - if(allowCriticalSetting) - { - if(authType != 1) - { - aCharacteristic.AcceptL( *this ); - } - else - { - iState = CNSmlDmProvisioningAdapter::EStateNull; - } - } - else - { - aCharacteristic.AcceptL( *this ); - } + aCharacteristic.AcceptL( *this ); } _DBG_FILE("CNSmlDmProvisioningAdapter::VisitL(CWPCharacteristic): end"); }