--- a/dcmofw/dcmoserver/group/dcmoserver.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/dcmoserver/group/dcmoserver.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -18,7 +18,7 @@
#include <platform_paths.hrh>
-CAPABILITY CAP_SERVER TrustedUI NetworkControl DiskAdmin AllFiles
+CAPABILITY CAP_SERVER DiskAdmin AllFiles
TARGET dcmoserver.exe
TARGETTYPE exe
@@ -31,7 +31,6 @@
SOURCE dcmosession.cpp
SOURCE dcmonotifieraob.cpp
SOURCE dcmogenericcontrol.cpp
-SOURCE AMSmlHelper.cpp
MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
@@ -44,24 +43,10 @@
LANGUAGE_IDS
END
-LIBRARY euser.lib CommonEngine.lib efsrv.lib
+LIBRARY euser.lib commonengine.lib efsrv.lib
LIBRARY ecom.lib
LIBRARY centralrepository.lib
LIBRARY aknnotify.lib eiksrv.lib
LIBRARY flogger.lib
-LIBRARY terminalcontrol.lib
-LIBRARY NSmlPrivateAPI.lib
-LIBRARY commdb.lib
-LIBRARY apengine.lib esock.lib
-#ifdef __TARM_SYMBIAN_CONVERGENCY
- LIBRARY dmtreeclient.lib
- LIBRARY SmlClient.lib
-#else
- LIBRARY nsmldmtreedbhandler.lib
- LIBRARY syncmlclientapi.lib
- LIBRARY nsmldmmodule.lib
- LIBRARY nsmldmtreedbclient.lib ConnMon.lib
- LIBRARY nsmltransporthandler.lib
-LIBRARY nsmltransport.lib cone.lib javaregistryclient.lib avkon.lib eikcore.lib apparc.lib
-#endif // __TARM_SYMBIAN_CONVERGENCY
-SMPSAFE
+
+SMPSAFE
\ No newline at end of file
--- a/dcmofw/dcmoserver/inc/amsmlhelper.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#ifndef __ABMSMLHELPER_H__
-#define __ABMSMLHELPER_H__
-
-#include <SyncMLDef.h>
-#include <SyncMLTransportProperties.h>
-#include <SyncMLClient.h>
-#include <SyncMLClientDM.h>
-
-class SmlHelper
- {
-public:
-
- // NOTE: this enum must match with property array described in
- // SyncML_Sync_Agent_Client_API_Specification.doc.
- enum TNSmlSyncTransportProperties
- {
- EPropertyIntenetAccessPoint = 0,
- EPropertyHttpUsed = 5,
- EPropertyHttpUserName = 6,
- EPropertyHttpPassword = 7
- };
-
- /**
- * Fetch the default IAP used by the currently active DM profile
- * @param aDefaultIAP on successfull return contains the default IAP number
- */
-
- static void GetDefaultIAPFromDMProfileL(TInt& aDefaultIAP);
-
- static void GetConnectionPropertyNameL(RSyncMLSession& aSyncSession,
- TDes8& aText, TInt aPropertyPos);
-
- static TInt StrToInt(const TDesC& aText, TInt& aNum);
- };
-
-#endif
-
-// End of File
--- a/dcmofw/dcmoserver/inc/dcmoserver.h Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/dcmoserver/inc/dcmoserver.h Wed Oct 13 15:30:06 2010 +0300
@@ -24,21 +24,20 @@
#include "dcmoclientserver.h"
#include "dcmoconst.h"
#include "dcmonotifieraob.h"
-#include <lawmocallbackinterface.h>
+
// CONSTANTS
const TUid KCRUidDCMOServer={0x2001FE47};
const TInt KDCMOKeyMaxNumber = 16;
// FORWARD DECLARATIONS
// CLASS DECLARATION
-class CLAWMOPluginInterface;
+
/**
* CDCMOServer
* Description.
*/
-class CDCMOServer : public CServer2,
- public MLawmoPluginWipeObserver
+class CDCMOServer : public CServer2
{
friend class CDCMOSession;
friend class CDCMONotifierAob;
@@ -86,11 +85,6 @@
* @return None
*/
void DropSession();
-public:
-
- // Callback from MLawmoPluginWipeObserver
- void HandleWipeCompleted(TInt status);
- //void SendGenericAlert();
private:
/**
@@ -172,17 +166,7 @@
* @return
*/
void SetStarter(TBool aValue);
-
- TLawMoStatus WipeItem(TInt aValue=0);
-
- TLawMoStatus WipeAllItem();
- TLawMoStatus GetListItemL(TDesC& item, TDes& strValue);
-
- TLawMoStatus GetToBeWipedL(TDesC& item, TDes& wipeValue);
-
- TLawMoStatus SetToBeWipedL(TDesC& item, TInt wipeValue);
-
private:
/**
@@ -190,7 +174,7 @@
* @param aCategory
* @return the uid
*/
- TUid GetAdapterUidL(const TDesC& aCategory, TBool aIsLawmo = EFalse);
+ TUid GetAdapterUidL(const TDesC& aCategory);
/**
* Finds whether the plug-in adapter is a generic category
@@ -199,19 +183,11 @@
*/
TInt GetLocalCategoryL(const TDesC& aCategory);
- void GetLawmoPluginUidsL();
-
- void StartDMNetworkMonitorL(TDesC& aServerId, TInt iapid=0);
private:
RArray<dcmoInfoList> idcmoArray;
static TInt iSessionCount;
TBool iStarter;
CDCMONotifierAob* iNotifier;
- RArray<TUid> ilawmoPluginUidToBeWiped;
- RArray<CLAWMOPluginInterface*> ilawmoPlugins;
- TInt iwipeStatus;
- TInt iCount;
- TInt iSessionIap;
};
#endif //__DCMO_SERVER_H__
--- a/dcmofw/dcmoserver/src/AMSmlHelper.cpp Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/*
- * Copyright (c) 2000 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: Implementation of applicationmanagement components
- *
- */
-
-#include "amsmlhelper.h"
-#include <SyncMLClientDM.h>
-#include <rconnmon.h>
-#include <es_sock.h>
-#include <es_enum_internal.h>
-#include <es_sock_partner.h>
-#include <es_enum.h>
-#include "lawmodebug.h"
-
-const TUid KUidNSmlMediumTypeInternet =
- {
- 0x101F99F0
- };
-const TUid KSosServerUid =
- {
- 0x101F99FB
- };
-
-const TInt KBufSize32 = 32;
-
-void SmlHelper::GetDefaultIAPFromDMProfileL(TInt& aDefaultIAP)
- {
- RLDEBUG("ApplicationManagementServer::GetDefaultIAPFromDMProfileL() - start");
-
- // first try to obtain the current profile id
- RSyncMLSession ses;
- ses.OpenL();
- RLDEBUG(" 1/8");
- CleanupClosePushL(ses);
-
- TSmlJobId jid;
- TSmlUsageType jtype;
- ses.CurrentJobL(jid, jtype);
- RLDEBUG(" 2/8");
- RSyncMLDevManJob job;
- job.OpenL(ses, jid);
- RLDEBUG(" 3/8");
- CleanupClosePushL(job);
- // get profile id
- TSmlProfileId pid(job.Profile() );
- CleanupStack::PopAndDestroy( &job);
-
- TBuf8<KBufSize32> key;
- TBuf<KBufSize32> value;
- TInt num = KErrNotFound;
-
- // get connection property name first
- GetConnectionPropertyNameL(ses, key, EPropertyIntenetAccessPoint);
- RLDEBUG(" 4/8");
- // we need to open sync profile in ordere to open the RSyncMLConnection
- RSyncMLDevManProfile syncProfile;
- syncProfile.OpenL(ses, pid);
- RLDEBUG(" 5/8");
- CleanupClosePushL(syncProfile);
-
- TSmlTransportId transport;
- RArray<TSmlTransportId> connections;
- _LIT8( KNSmlIAPId, "NSmlIapId" );
-
- // now open the syncML connection
- RSyncMLConnection syncConnection;
- syncProfile.ListConnectionsL(connections);
-
- transport = connections[0];
- syncConnection.OpenL(syncProfile, transport);
- RLDEBUG(" 6/8");
- CleanupClosePushL(syncConnection);
-
- const TDesC8& source(syncConnection.GetPropertyL(KNSmlIAPId) );
- RLDEBUG(" 7/8");
- value.Copy(source.Left(value.MaxLength() ) );
- User::LeaveIfError(StrToInt(value, num) );
- RLDEBUG(" 8/8");
-
- aDefaultIAP = num;
-
- // If there is no default Access point in DM profile then use
- // currently used access point by DM session
-
- if (aDefaultIAP == -1)
- {
- RLDEBUG("adefault iap -1");
- TInt sockIapid = -1;
-
- RSocketServ serv;
- CleanupClosePushL(serv);
- User::LeaveIfError(serv.Connect() );
-
- RConnection conn;
- CleanupClosePushL(conn);
- User::LeaveIfError(conn.Open(serv) );
- RLDEBUG("RConnection opened");
-
- TUint count( 0);
- User::LeaveIfError(conn.EnumerateConnections(count) );
- RLDEBUG_2("RConnection count %d",count);
- // enumerate connections
- for (TUint idx=1; idx<=count; ++idx)
- {
- TConnectionInfo connectionInfo;
- TConnectionInfoBuf connInfo(connectionInfo);
- RLDEBUG("RConnection loop");
- TInt err = conn.GetConnectionInfo(idx, connInfo); // iapid
- RLDEBUG("RConnection get conn info");
- if (err != KErrNone)
- {
- CleanupStack::PopAndDestroy( 2); // conn, serv
- User::Leave(err);
- }
- // enumerate connectionclients
- TConnectionEnumArg conArg;
- conArg.iIndex = idx;
- TConnEnumArgBuf conArgBuf(conArg);
- RLDEBUG("RConnection control");
- err=conn.Control(KCOLConnection, KCoEnumerateConnectionClients,
- conArgBuf);
- if (err != KErrNone)
- {
- CleanupStack::PopAndDestroy( 2); // conn, serv
- User::Leave(err);
- }
- TInt cliCount = conArgBuf().iCount;
- RLDEBUG("RConnection second loop");
- for (TUint j=1; j<=cliCount; ++j)
- {
- TConnectionGetClientInfoArg conCliInfo;
- conCliInfo.iIndex = j;
- TConnGetClientInfoArgBuf conCliInfoBuf(conCliInfo);
- RLDEBUG("RConnection another control");
- err=conn.Control(KCOLConnection, KCoGetConnectionClientInfo,
- conCliInfoBuf);
-
- if (err != KErrNone)
- {
- CleanupStack::PopAndDestroy( 2); // conn, serv
- User::Leave(err);
- }
- TConnectionClientInfo conCliInf = conCliInfoBuf().iClientInfo;
- TUid uid = conCliInf.iUid;
- RLDEBUG_2("RConnection check uid %d", uid.iUid);
- if (uid == KSosServerUid)
- {
- sockIapid = connInfo().iIapId;
- RLDEBUG("RConnection uid matched");
- }
-
- }
- }
- CleanupStack::PopAndDestroy( 2); // conn, serv
-
- aDefaultIAP = sockIapid;
- RLDEBUG("RConnection out");
- }
- // get profile's server id
- //aServerId = syncProfile.ServerId().AllocL();
- RLDEBUG("RConnection total out");
-
- CleanupStack::PopAndDestroy( &syncConnection);
- CleanupStack::PopAndDestroy( &syncProfile);
-
- CleanupStack::PopAndDestroy( &ses);
- connections.Close();
- RLDEBUG("ApplicationManagementServer::GetDefaultIAPFromDMProfileL() - end");
- }
-
-void SmlHelper::GetConnectionPropertyNameL(RSyncMLSession& aSyncSession,
- TDes8& aText, TInt aPropertyPos)
- {
- RLDEBUG("ApplicationManagementServer::GetConnectionPropertyNameL() - start");
-
- // at the moment RSyncMLTransport is only needed
- // for internet connection settings
- RSyncMLTransport transport;
- CleanupClosePushL(transport);
- transport.OpenL(aSyncSession, KUidNSmlMediumTypeInternet.iUid);
-
- const CSyncMLTransportPropertiesArray& arr = transport.Properties();
- RLDEBUG("GetConnectionPropertyNameL interior");
- __ASSERT_DEBUG( arr.Count()> aPropertyPos, User::Panic(_L("invalid count"), KErrGeneral) );
-
- const TSyncMLTransportPropertyInfo& info = arr.At(aPropertyPos);
- aText = info.iName;
- CleanupStack::PopAndDestroy( &transport);
-
- RLDEBUG("ApplicationManagementServer::GetConnectionPropertyNameL() - end");
- }
-
-TInt SmlHelper::StrToInt(const TDesC& aText, TInt& aNum)
- {
- TLex lex(aText);
- TInt err = lex.Val(aNum);
- return err;
- }
-
-// End of File
--- a/dcmofw/dcmoserver/src/dcmoserver.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/dcmoserver/src/dcmoserver.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -32,18 +32,9 @@
#include "dcmosession.h"
#include "dcmogenericcontrol.h"
#include "dcmodebug.h"
-#include "lawmodebug.h"
-#include "amsmlhelper.h"
-#include <lawmoadaptercrkeys.h>
-#include <DevManInternalCRKeys.h>
-#include <e32property.h>
-#include <PSVariables.h> // Property values
-#include <lawmointerface.h>
_LIT( KdcmoResourceFileName, "z:dcmo.rsc" );
const TInt KBufferSize = 256;
-const TInt KWipeSuccess = 1201;
-const TInt KWipeFailure = 1405;
TInt CDCMOServer::iSessionCount = 0;
// Standard server startup code
@@ -112,9 +103,6 @@
void CDCMOServer::ConstructL()
{
RDEBUG("CDCMOServer::ConstructL- begin");
- iwipeStatus = 0;
- iSessionIap = KErrNotFound;
- iCount = -1;
StartL(KDCMOServerName);
RDEBUG("CDCMOServer::ConstructL- end");
}
@@ -136,7 +124,7 @@
{
RDEBUG("CDCMOServer::~CDCMOServer- begin");
TInt count = idcmoArray.Count();
- RDEBUG_2("~~CDCMOServer::~CDCMOServer; %d", count );
+ RDEBUG_2("CDCMOServer::~CDCMOServer; %d", count );
if(count)
{
for(TInt i=0; i< count; i++)
@@ -145,25 +133,15 @@
delete iNotifier;
iNotifier = NULL;
}
-
- RLDEBUG("CDCMOServer::wipe done delete pluginuid()");
- TInt pluginObjectCount = ilawmoPlugins.Count();
- while(pluginObjectCount>0)
+ else
{
- RLDEBUG("plugin to be deleted");
- delete ilawmoPlugins[pluginObjectCount-1];
- RLDEBUG("plugin deleted");
- pluginObjectCount--;
+ //Kill the server
+ if( iSessionCount == 0)
+ CActiveScheduler::Stop();
}
- RLDEBUG("CDCMOServer::close all RArrays()");
- ilawmoPluginUidToBeWiped.Close();
- RLDEBUG("CDCMOServer::closeD all RArrays()");
- ilawmoPlugins.Close();
-
- RDEBUG("CDCMOServer::call FinalClose");
REComSession::FinalClose();
- RDEBUG("~~~CDCMOServer::~CDCMOServer- end");
+ RDEBUG("CDCMOServer::~CDCMOServer- end");
}
// -----------------------------------------------------------------------------
@@ -183,20 +161,12 @@
if( idcmoArray.Count() && ( iSessionCount == 0 ))
{
// A session is being destroyed
- RDEBUG("CDCMOServer::DropSession- dofinalise ?");
TRAPD( err, DoFinalizeL());
- iCount = 0;
if ( !err )
{
RDEBUG_2("CDCMOServer::DropSession err = %d", err );
}
}
- if((iSessionCount == 0)&&(iCount== -1))
- {
- RDEBUG("DropSession kill server, only when no session and no wipe pending");
- CActiveScheduler::Stop();
- RDEBUG("DropSession kill server");
- }
RDEBUG("CDCMOServer::DropSession- end");
}
@@ -237,28 +207,21 @@
// CDCMOServer::GetAdapterUidL
// Gets the plug-in adapter implementation uid if it present.
// ----------------------------------------------------------------------------------------
-TUid CDCMOServer::GetAdapterUidL(const TDesC& aCategory, TBool aIsLawmo)
+TUid CDCMOServer::GetAdapterUidL(const TDesC& aCategory)
{
RDEBUG("CDCMOServer::GetDCMOAdapterUidL(): begin");
- RLDEBUG("CDCMOServer::GetAdapterUidL(): begin");
+
TUid retUid = {0x0};
- TEComResolverParams resolverParams;
+
RImplInfoPtrArray infoArray;
// Note that a special cleanup function is required to reset and destroy
// all items in the array, and then close it.
TCleanupItem cleanup(CleanupEComArray, &infoArray);
CleanupStack::PushL(cleanup);
- if(aIsLawmo)
- {
- REComSession::ListImplementationsL(KLAWMOPluginInterfaceUid, resolverParams, KRomOnlyResolverUid, infoArray);
- RLDEBUG("CDCMOServer::GetAdapterUidL(): listImpl");
- }
- else
REComSession::ListImplementationsL(KDCMOInterfaceUid, infoArray);
// Loop through each info for each implementation
TBuf8<KBufferSize> buf;
- RLDEBUG("CDCMOServer::GetAdapterUidL(): for loop");
for (TInt i=0; i< infoArray.Count(); i++)
{
buf = infoArray[i]->OpaqueData();
@@ -267,13 +230,12 @@
if(category.Find(infoArray[i]->OpaqueData())!= KErrNotFound)
{
retUid = infoArray[i]->ImplementationUid();
- RLDEBUG("CDCMOServer::GetAdapterUidL(): matched");
break;
}
buf.Zero();
}
CleanupStack::PopAndDestroy(); //cleanup
- RLDEBUG("CDCMOServer::GetAdapterUidL():end");
+
RDEBUG("CDCMOServer::GetDCMOAdapterUidL(): end");
return retUid;
}
@@ -647,170 +609,6 @@
}
// ----------------------------------------------------------------------------------------
-// CDCMOServer::GetPluginUids
-// Gets the plug-in adapter implementation uid if it present.
-// ----------------------------------------------------------------------------------------
-void CDCMOServer::GetLawmoPluginUidsL()
-{
- RDEBUG("CDCMOServer::GetPluginUids(): begin");
- ilawmoPluginUidToBeWiped.Reset();
- RImplInfoPtrArray infoArray;
- TEComResolverParams resolverParams;
- // Note that a special cleanup function is required to reset and destroy
- // all items in the array, and then close it.
- TCleanupItem cleanup(CleanupEComArray, &infoArray);
- CleanupStack::PushL(cleanup);
- REComSession::ListImplementationsL(KLAWMOPluginInterfaceUid, resolverParams, KRomOnlyResolverUid, infoArray);
- RLDEBUG("CDCMOServer::GetPluginUids(): listImpl");
- // Loop through each info for each implementation
- for (TInt i=0; i< infoArray.Count(); i++)
- {
- ilawmoPluginUidToBeWiped.Append(infoArray[i]->ImplementationUid());
- RLDEBUG("CDCMOServer::GetPluginUids(): for loop");
- }
- CleanupStack::PopAndDestroy(); //cleanup
- RLDEBUG("CDCMOServer::GetPluginUids():end");
- return;
-}
-
-TLawMoStatus CDCMOServer::WipeAllItem()
- {
- //Update ilawmopluginUid, so that all Node items are wiped.
- //WipeItem doesn only on Uid's in the RArray.
- TRAPD(error,GetLawmoPluginUidsL());
- if(error == KErrNone)
- return WipeItem();
- else
- return ELawMoWipeNotPerformed;
- }
-
-TLawMoStatus CDCMOServer::WipeItem(TInt aValue)
- {
- RLDEBUG("CDCMOServer::WipeItem(): begin");
- TLawMoStatus lawmostat(ELawMoAccepted);
- iCount = 0;
- if(ilawmoPluginUidToBeWiped.Count() > 0)
- {
- RLDEBUG_2("CDCMOServer::WipeItem got uid(): %d",ilawmoPluginUidToBeWiped[iCount]);
- CLAWMOPluginInterface* obj;
- RLDEBUG("CDCMOServer::WipeItem(): NewL");
- TRAPD(err,obj = CLAWMOPluginInterface::NewL(ilawmoPluginUidToBeWiped[iCount], this));
- if(err == KErrNone)
- {
- RLDEBUG("CDCMOServer::WipeItem(): obj created");
- RLDEBUG_2("CDCMOServer::WipeItem plugin count: %d",ilawmoPlugins.Count());
- TRAP(err,obj->WipeL());
- RLDEBUG_2("CDCMOServer::WipeItem(): wipe called %d",err);
- ilawmoPlugins.Append(obj);
- // Get the IAP being used in the current session
- TRAP( err, SmlHelper::GetDefaultIAPFromDMProfileL( iSessionIap ) );
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted(): get iap %d",iSessionIap);
- }
- if(err!=KErrNone)
- HandleWipeCompleted(KErrGeneral);
- }
- else
- {
- lawmostat = ELawMoWipeNotPerformed;
- }
-
- RLDEBUG("CDCMOServer::WipeItem(): End");
- return lawmostat;
- }
-
-TLawMoStatus CDCMOServer::GetListItemL(TDesC& item, TDes& strValue)
-{
- RLDEBUG("CDCMOServer::GetListItem(): begin");
- TEComResolverParams resolverParams;
- TLawMoStatus lawmostat(ELawMoSuccess);
- TBuf<KBufferSize> itemName;
- RImplInfoPtrArray infoArray;
- TCleanupItem cleanup(CleanupEComArray, &infoArray);
- CleanupStack::PushL(cleanup);
- REComSession::ListImplementationsL(KLAWMOPluginInterfaceUid, resolverParams, KRomOnlyResolverUid, infoArray);
- RLDEBUG("CDCMOServer::GetListItem(): listImpl");
-
- for (TInt i=0; i< infoArray.Count(); i++)
- {
- RLDEBUG("CDCMOServer::GetListItem(): for loop");
- TBuf<KBufferSize> temp;
- temp.Copy(infoArray[i]->OpaqueData());
- RLDEBUG_2("CDCMOServer::GetListItem opaque data to compare is %s", temp.PtrZ());
- if(item == temp)
- {
- itemName.Copy(infoArray[i]->DisplayName());
- RLDEBUG("CDCMOServer::GetListItem(): matched");
- break;
- }
- }
- CleanupStack::PopAndDestroy(); //cleanup
- RLDEBUG_2("CDCMOServer::GetListItem display name is %s", itemName.PtrZ());
- strValue.Zero();
- strValue.Append(itemName);
- RLDEBUG("CDCMOServer::GetListItem(): End");
- return lawmostat;
-}
-
-
-TLawMoStatus CDCMOServer::GetToBeWipedL(TDesC& item, TDes& wipeValue)
-{
- RLDEBUG("CDCMOServer::GetToBeWiped(): begin");
- TLawMoStatus lawmostat(ELawMoSuccess);
- TInt wipeVal(0);
- TUid impluid = GetAdapterUidL(item, ETrue);
- RLDEBUG_2("CDCMOServer::GetToBeWiped for uid(): %d", impluid);
- TInt afind = ilawmoPluginUidToBeWiped.Find(impluid);
- if(afind!=KErrNotFound)
- {
- wipeVal = 1;
- RLDEBUG("CDCMOServer::GetToBeWiped(): uid in Rarray");
- }
- wipeValue.Zero();
- wipeValue.Num(wipeVal);
- RLDEBUG("CDCMOServer::GetToBeWiped(): End");
- return lawmostat;
-}
-
-TLawMoStatus CDCMOServer::SetToBeWipedL(TDesC& item, TInt wipeValue)
-{
- RLDEBUG("CDCMOServer::SetToBeWiped(): begin");
- TLawMoStatus lawmostat(ELawMoSuccess);
- TUid impluid = GetAdapterUidL(item, ETrue);
- RLDEBUG_2("CDCMOServer::SetToBeWiped for uid(): %d", impluid);
- TInt afind = ilawmoPluginUidToBeWiped.Find(impluid);
- // Add Node's corresponding plugin uid to list so that it can be wiped
- if(impluid.iUid)
- {
- if(wipeValue)
- {
- RLDEBUG("CDCMOServer::SetToBeWiped(): wipeVal true");
- if(afind==KErrNotFound)
- ilawmoPluginUidToBeWiped.Append(impluid);
- else
- RLDEBUG("CDCMOServer::SetToBeWiped() tobewiped already set");
- }
- else
- {
- RLDEBUG("CDCMOServer::SetToBeWiped(): wipeVal false");
- if(afind!=KErrNotFound)
- {
- ilawmoPluginUidToBeWiped.Remove(afind);
- RLDEBUG("CDCMOServer::SetToBeWiped() tobewiped unset");
- }
- else
- RLDEBUG("CDCMOServer::SetToBeWiped() tobewiped notset atall");
- }
- }
- else
- {
- RLDEBUG("CDCMOServer::SetToBeWiped(): no such plugin found");
- lawmostat = ELawMoFail;
- }
- RLDEBUG("CDCMOServer::SetToBeWiped(): End");
- return lawmostat;
-}
-
-// ----------------------------------------------------------------------------------------
// CDCMOServer::SetStarter
// Sets the iStarter value
// ----------------------------------------------------------------------------------------
@@ -820,138 +618,3 @@
iStarter = aValue;
RDEBUG("CDCMOServer::SetStarter(): end");
}
-
-void CDCMOServer::HandleWipeCompleted(TInt status)
-{
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): begin");
- // whether wipe is performed or failed
- iwipeStatus = (iwipeStatus && status);
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted wipestate: %d",iwipeStatus);
- iCount++;
- if(ilawmoPluginUidToBeWiped.Count()>iCount)
- {
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): create obj");
- CLAWMOPluginInterface* obj;
- TRAPD(err, obj = CLAWMOPluginInterface::NewL(ilawmoPluginUidToBeWiped[iCount], this));
- if(err == KErrNone)
- {
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): obj created");
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted plugin count: %d",ilawmoPlugins.Count());
- TRAP(err,obj->WipeL());
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted(): wipe called %d",err);
- ilawmoPlugins.Append(obj);
- }
- if(err!=KErrNone)
- HandleWipeCompleted(KErrGeneral);
- }
- else
- {
- // start DM session using the Monitor for generic alert
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): done");
- TInt err;
- TBuf<KBufferSize> srvrid;
- CRepository* crep;
- TRAP(err, crep = CRepository::NewLC( KCRUidDeviceManagementInternalKeys );
- CleanupStack::Pop(crep));
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): get srvrid");
- if(err == KErrNone)
- err = crep->Get( KLAWMOfactoryDmServerID, srvrid );
- RDEBUG_2("CDCMOServer::GetCurrentServerId() %d",err);
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted(): srvrid %s",srvrid.PtrZ());
- if (err == KErrNone)
- {
- RLDEBUG("CDCMOServer::startNwMonitor()");
- TRAP(err,StartDMNetworkMonitorL(srvrid, iSessionIap));
- }
-
- if(crep)
- {
- delete crep; //crep
- crep = NULL;
- }
-
- // Only when session is started successfully, Set wipestatus
- if(err==KErrNone)
- {
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): writing wipestatus to cenrep");
- CRepository* repository;
- TRAP(err, repository = CRepository::NewLC ( KCRUidLawmoAdapter );
- CleanupStack::Pop(crep));
-
- if(iwipeStatus==KErrNone)
- iwipeStatus = KWipeSuccess;
- else
- iwipeStatus = KWipeFailure;
-
- repository->Set(KLawmoWipeStatus,iwipeStatus);
- RLDEBUG_2("CDCMOServer::HandleWipeCompleted wipestate: %d",iwipeStatus);
- if (repository)
- {
- delete repository;
- repository = NULL;
- }
- }
-
- RLDEBUG_2("printing ilawmoPluginUidToBeWiped %d", ilawmoPluginUidToBeWiped.Count());
- RLDEBUG_2("printing ilawmoPlugins %d", ilawmoPlugins.Count());
- RLDEBUG_2("printing ilawmoPlugins %d", iCount);
- iCount = -1; // To indicate all wipe is done
- if( iSessionCount == 0)
- {
- CActiveScheduler::Stop();
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): kill server");
- }
- }
-
- RLDEBUG("CDCMOServer::HandleWipeCompleted(): end");
-}
-
-// ------------------------------------------------------------------------------------------------
-// CDCMOServer::StartDMNetworkMonitorL()
-// ------------------------------------------------------------------------------------------------
-void CDCMOServer::StartDMNetworkMonitorL(TDesC& aServerId, TInt iapid)
-{
- TInt retryenabled = 1;
- _LIT( KNetMon,"\\dmnetworkmon.exe" );
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL(): start");
- TBuf8<KBufferSize> serverid;
- serverid.Copy(aServerId);
- // Enable DM Network Monitoring for retry of Generic alert in case of N/W loss
-
- CRepository *repository= CRepository::NewLC ( KCRUidDeviceManagementInternalKeys );
- repository->Set(KDevManEnableDMNetworkMon, retryenabled);
- repository->Set(KDevManServerIdKey, serverid);
- repository->Set(KDevManIapIdKey, iapid);
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL(): set rep keys");
- CleanupStack::PopAndDestroy();
-
- // create NetMon EXE
- RProcess rp;
- TInt err = rp.Create(KNetMon,KNullDesC);
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL():create rprocess");
- User::LeaveIfError(err);
- TRequestStatus stat;
- rp.Rendezvous(stat);
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL():rendezvous");
-
- if (stat!=KRequestPending)
- {
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL():abort srvr");
- rp.Kill(0); // abort startup
- }
- else
- {
- RLDEBUG("CDCMOServer::StartDMNetworkMonitorL(): start server");
- rp.Resume(); // logon OK - start the server
- }
- User::WaitForRequest(stat); // wait for start or death
- TInt r= rp.ExitType();
- TInt reqstat = stat.Int();
- //TExitType a;
- RLDEBUG_2("CDCMOServer::StartDMNetworkMonitorL() exittype %d",r);
- RLDEBUG_2("CDCMOServer::StartDMNetworkMonitorL() reqstatus %d",reqstat);
-
- rp.Close();
-}
-
-
--- a/dcmofw/dcmoserver/src/dcmosession.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/dcmoserver/src/dcmosession.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -20,7 +20,7 @@
#include "dcmosession.h"
#include "dcmoclientserver.h"
#include "dcmodebug.h"
-#include "lawmodebug.h"
+
// ----------------------------------------------------------------------------------------
// CDCMOSession::CDCMOSession
@@ -68,10 +68,8 @@
RDEBUG_2("CDCMOSession::DispatchMessageL; %d", aMessage.Function() );
TInt value;
TDCMOStatus statusValue;
- TLawMoStatus lstatusValue;
TDCMONode nodeValue;
TPckg<TDCMOStatus> status(statusValue);
- TPckg<TLawMoStatus> lstatus(lstatusValue);
TPckg<TDCMONode> node(nodeValue);
TPckg<TInt> intvalue(value);
@@ -154,88 +152,6 @@
RDEBUG("CDCMOSession::DispatchMessageL - EDcmoSearchAdapter status " );
}
break;
- case EWipe:
- {
- //HBufC* item = HBufC::NewLC(KDCMOMaxStringSize);
- //TPtr itemPtr = category->Des();
- //aMessage.Read (0, itemPtr);
- //aMessage.Complete(KErrNone);
- //RDEBUG("CDCMOSession::EWipe force complete the request");
- lstatusValue = Server().WipeItem();
- aMessage.Write (0, lstatus);
- //CleanupStack::PopAndDestroy();
- RLDEBUG_2("CDCMOSession::DispatchMessageL EWipe %d", lstatusValue );
- }
- break;
-
- case EWipeAll:
- {
- //TInt aForce(1);
- lstatusValue = Server().WipeAllItem();
- aMessage.Write (0, lstatus);
- RLDEBUG_2("CDCMOSession::DispatchMessageL EWipeAll %d", lstatusValue );
- }
- break;
-
- case EListItemName_Get:
- {
- HBufC* buf1 = HBufC::NewLC(KDCMOMaxStringSize);
- TPtr bufPtr1 = buf1->Des();
- HBufC* item = HBufC::NewLC(KDCMOMaxStringSize);
- TPtr itemPtr = item->Des();
- aMessage.Read (0, itemPtr);
- lstatusValue = Server().GetListItemL(itemPtr, bufPtr1);
- aMessage.Write (1, bufPtr1);
- aMessage.Write (2, lstatus);
- CleanupStack::PopAndDestroy(2);
- RLDEBUG_2("CDCMOSession::DispatchMessageL EListItemName_Get %d", lstatusValue );
- }
- break;
-
- case EToBeWiped_Get:
- {
- HBufC* item = HBufC::NewLC(KDCMOMaxStringSize);
- TPtr itemPtr = item->Des();
- HBufC* buf1 = HBufC::NewLC(KDCMOMaxStringSize);
- TPtr bufPtr1 = buf1->Des();
- aMessage.Read (0, itemPtr);
- lstatusValue = Server().GetToBeWipedL(itemPtr, bufPtr1);
- aMessage.Write (1, bufPtr1);
- aMessage.Write (2, lstatus);
- CleanupStack::PopAndDestroy(2);
- RLDEBUG_2("CDCMOSession::DispatchMessageL EToBeWiped_Get %d", lstatusValue );
- }
- break;
-
- case EToBeWiped_Set:
- {
- //TLex lex;
- //TInt val;
- //TBuf<255> wipeValue;
- HBufC* item = HBufC::NewLC(KDCMOMaxStringSize);
- TPtr itemPtr = item->Des();
- aMessage.Read (0, itemPtr);
- TInt val = aMessage.Int1();
- //aMessage.Read (1, wipeValue);
- RLDEBUG_2("Tobewiped category %s",itemPtr.PtrZ());
- //lex.Assign( wipeValue );
- //TInt err = lex.Val( val );
- RLDEBUG_2("Tobewiped value,int %d", val );
- //if(err==KErrNone)
- // {
- // RLDEBUG("SetToBeWiped call" );
- lstatusValue = Server().SetToBeWipedL(itemPtr, val);
- // }
- //else
- // {
- // RLDEBUG("SetToBeWiped not" );
- // lstatusValue = ELawMoFail;
- // }
- aMessage.Write (2, lstatus);
- CleanupStack::PopAndDestroy();
- RLDEBUG_2("CDCMOSession::DispatchMessageL EToBeWiped_Set %d", lstatusValue );
- }
- break;
default :
RDEBUG("CDCMOSession::DispatchMessageL- Case Not Found" );
}
--- a/dcmofw/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/group/bld.inf Wed Oct 13 15:30:06 2010 +0300
@@ -24,4 +24,3 @@
#include "../dcmoclient/group/bld.inf"
#include "../dcmoserver/group/bld.inf"
#include "../dcmocustcmd/group/bld.inf"
-#include "../lawmoclient/group/bld.inf"
\ No newline at end of file
--- a/dcmofw/inc/dcmoclientserver.h Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/inc/dcmoclientserver.h Wed Oct 13 15:30:06 2010 +0300
@@ -39,15 +39,4 @@
EDcmoSearchAdapter
};
-enum TLawmoControlMessages
- {
- ECreateSubSession = 10,
- ECloseSubSession,
- EListItemName_Get,
- EToBeWiped_Get,
- EToBeWiped_Set,
- EWipe,
- EWipeAll,
- ENotUsed
- };
#endif// __DCMOCLIENTSERVER_H__
--- a/dcmofw/inc/lawmodebug.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2000 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: Implementation of terminalsecurity components
-*
-*/
-
-
-#ifndef _LAW_DEBUG_HEADER_
-#define _LAW_DEBUG_HEADER_
-
-#include <f32file.h>
-#include <flogger.h>
-// CONSTANTS
-_LIT( KLawLogFolderName, "law" );
-_LIT( KLawLogFileName, "law.log" );
-// MACROS
-#ifdef _DEBUG
-#define _LAW_FILE_DEBUG
-#endif
-
-#ifdef _LAW_FILE_DEBUG
- #define RLDEBUG(X) RFileLogger::Write( KLawLogFolderName, KLawLogFileName, EFileLoggingModeAppend, _L(X) )
- #define RLDEBUG_2(X,Y) RFileLogger::WriteFormat( KLawLogFolderName, KLawLogFileName, EFileLoggingModeAppend, _L(X),Y )
- #define RLDEBUG_3(X,Y,Z) RFileLogger::WriteFormat( KLawLogFolderName, KLawLogFileName, EFileLoggingModeAppend, _L(X),Y,Z )
-#else
-
- #if defined (_DEBUG)
- #define RLDEBUG(X) RDebug::Print(_L(X))
- #define RLDEBUG_2(X,Y) RDebug::Print(_L(X),Y)
- #define RLDEBUG_3(X,Y,Z) RDebug::Print(_L(X),Y,Z)
- #else
- #define RLDEBUG(X)
- #define RLDEBUG_2(X,Y)
- #define RLDEBUG_3(X,Y,Z)
- #endif // _DEBUG
-
-#endif // _LAW_FILE_DEBUG
-
-
-
-
-#endif // _LAW_DEBUG_HEADER_
-
-
-
--- a/dcmofw/lawmoclient/bwins/lawmoclientu.def Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-EXPORTS
- ?SetToBeWipedValue@RLawmoClient@@QAEHAAVTDes16@@H@Z @ 1 NONAME ; int RLawmoClient::SetToBeWipedValue(class TDes16 &, int)
- ?GetListItemName@RLawmoClient@@QAEHAAVTDes16@@0@Z @ 2 NONAME ; int RLawmoClient::GetListItemName(class TDes16 &, class TDes16 &)
- ?GetToBeWipedValue@RLawmoClient@@QAEHAAVTDes16@@AAH@Z @ 3 NONAME ; int RLawmoClient::GetToBeWipedValue(class TDes16 &, int &)
- ?DeviceWipe@RLawmoClient@@QAE?AW4TLawMoStatus@@XZ @ 4 NONAME ; enum TLawMoStatus RLawmoClient::DeviceWipe(void)
- ?Connect@RLawmoClient@@QAEHXZ @ 5 NONAME ; int RLawmoClient::Connect(void)
- ?DeviceWipeAll@RLawmoClient@@QAE?AW4TLawMoStatus@@XZ @ 6 NONAME ; enum TLawMoStatus RLawmoClient::DeviceWipeAll(void)
- ?Close@RLawmoClient@@QAEXXZ @ 7 NONAME ; void RLawmoClient::Close(void)
-
--- a/dcmofw/lawmoclient/eabi/lawmoclientu.def Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
- _ZN12RLawmoClient10DeviceWipeEv @ 1 NONAME
- _ZN12RLawmoClient13DeviceWipeAllEv @ 2 NONAME
- _ZN12RLawmoClient15GetListItemNameER6TDes16S1_ @ 3 NONAME
- _ZN12RLawmoClient17GetToBeWipedValueER6TDes16Ri @ 4 NONAME
- _ZN12RLawmoClient17SetToBeWipedValueER6TDes16i @ 5 NONAME
- _ZN12RLawmoClient5CloseEv @ 6 NONAME
- _ZN12RLawmoClient7ConnectEv @ 7 NONAME
--- a/dcmofw/lawmoclient/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-/*
-* Copyright (c) 2005 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: This file provides building information for DCMO Client.
-*
-*/
-
-
-PRJ_MMPFILES
-lawmoclient.mmp
--- a/dcmofw/lawmoclient/group/lawmoclient.mmp Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2005 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: DCMO Client for DCMO framework
-*
-*/
-
-#include <platform_paths.hrh>
-#include "defaultcaps.hrh"
-
-CAPABILITY CAP_CLIENT_DLL
-TARGET lawmoclient.dll
-TARGETTYPE dll
-UID 0x1000008D 0x2002EA20
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-SOURCE lawmoclient.cpp
-
-MW_LAYER_SYSTEMINCLUDE
-USERINCLUDE .
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-
-LIBRARY euser.lib
-LIBRARY featmgr.lib
-LIBRARY flogger.lib
-
-SMPSAFE
\ No newline at end of file
--- a/dcmofw/lawmoclient/src/lawmoclient.cpp Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
-* Copyright (c) 2009 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: LAWMO Client implementation
-*
-*/
-
-#include <e32svr.h>
-#include <featmgr.h>
-#include "dcmoclientserver.h"
-#include "lawmoclient.h"
-#include "lawmodebug.h"
-// Standard server startup code
-//
-static TInt StartServer()
- {
- RLDEBUG("from lawmoclient ->starting dcmo server...");
-
- // EPOC and EKA 2 is easy, we just create a new server process. Simultaneous
- // launching of two such processes should be detected when the second one
- // attempts to create the server object, failing with KErrAlreadyExists.
- RProcess server;
- TInt r=server.Create(KDCMOServerName,KNullDesC);
-
- if (r!=KErrNone)
- {
- RLDEBUG_2("lawmoclient -> server start failed %d",r);
- return r;
- }
- TRequestStatus stat;
- server.Rendezvous(stat);
- if (stat!=KRequestPending)
- server.Kill(0); // abort startup
- else
- server.Resume(); // logon OK - start the server
- RLDEBUG("lawmoclient -> dcmoserver Started");
- User::WaitForRequest(stat); // wait for start or death
- // we can't use the 'exit reason' if the server panicked as this
- // is the panic 'reason' and may be '0' which cannot be distinguished
- // from KErrNone
- r=(server.ExitType()==EExitPanic) ? KErrGeneral : stat.Int();
- server.Close();
- return r;
- }
-
-
-// This is the standard retry pattern for server connection
-EXPORT_C TInt RLawmoClient::Connect()
- {
- RLDEBUG("RLawmoClient: connect...");
- TInt retry=2;
- for (;;)
- {
- TInt r=CreateSession(KDCMOServerName,TVersion(0,0,0),1);
- if (r!=KErrNotFound && r!=KErrServerTerminated)
- return r;
- if (--retry==0)
- return r;
- RLDEBUG("RLawmoClient: to start server...");
- r=StartServer();
- if (r!=KErrNone && r!=KErrAlreadyExists)
- return r;
- }
- }
-
-// ---------------------------------------------------------------------------
-// RLawmoClient::Close()
-// ---------------------------------------------------------------------------
-EXPORT_C void RLawmoClient::Close()
- {
- RLDEBUG(" RLawmoClient::Close");
- RSessionBase::Close(); //basecall
- RLDEBUG(" RLawmoClient::close done");
- }
-
-// ----------------------------------------------------------------------------------------
-// RLawmoClient::DeviceWipeL
-// ----------------------------------------------------------------------------------------
-EXPORT_C TLawMoStatus RLawmoClient::DeviceWipe()
- {
- RLDEBUG("RLawmoClient::DeviceWipe Begin");
- TLawMoStatus status(ELawMoAccepted);
- TPckg<TLawMoStatus> statusValue(status);
- TInt err = SendReceive(EWipe,TIpcArgs(&statusValue));
- //TInt err = SendReceive(EWipe);
- if(err != KErrNone)
- status = ELawMoWipeNotPerformed;
- RLDEBUG("RLawmoClient::DeviceWipe End");
- return status;
- }
-
-// ----------------------------------------------------------------------------------------
-// RLawmoClient::DeviceWipeAll
-// ----------------------------------------------------------------------------------------
-EXPORT_C TLawMoStatus RLawmoClient::DeviceWipeAll( )
- {
- RLDEBUG("RLawmoClient::DeviceWipeAll Begin");
- TLawMoStatus status(ELawMoSuccess);
- TPckg<TLawMoStatus> statusValue(status);
- TInt err = SendReceive( EWipeAll,TIpcArgs(&statusValue) );
- if(err != KErrNone)//if sendreceive itself failed
- status = ELawMoWipeFailed;
- RLDEBUG("RLawmoClient::DeviceWipeAll End");
- return status;
- }
-
-// ----------------------------------------------------------------------------------------
-// RLawmoClient::SetPasscodeMaxAttempts
-// ----------------------------------------------------------------------------------------
-EXPORT_C TInt RLawmoClient::GetListItemName( TDes& aItemName, TDes& aNodeValue )
- {
- RLDEBUG("RLawmoClient::GetListItemName Begin");
-
- TIpcArgs args1;
- TLawMoStatus status(ELawMoOk);
-
- args1.Set( 0, &aItemName );
- args1.Set( 1, &aNodeValue );
- args1.Set( 2, status);
- TInt err = SendReceive( EListItemName_Get, args1 );
- if(err != KErrNone)
- status = ELawMoInvalid;
- RLDEBUG("RLawmoClient::GetListItemName End");
- return status;
- }
-
-EXPORT_C TInt RLawmoClient::GetToBeWipedValue( TDes& aItemName, TBool& aWipeVal )
- {
- RLDEBUG("RLawmoClient::GetToBeWipedValue Begin");
-
- TIpcArgs args1;
- TBuf<255> wipeValue;
- TLex lex;
-
- TLawMoStatus status(ELawMoOk);
-
- args1.Set( 0, &aItemName );
- args1.Set( 1, &wipeValue );
- args1.Set( 2, status);
-
- TInt err = SendReceive( EToBeWiped_Get, args1 );
-
- if( err == KErrNone )
- {
- lex.Assign( wipeValue );
- err = lex.Val( aWipeVal );
- }
- if(err != KErrNone)
- status = ELawMoInvalid;
-
- RLDEBUG("RLawmoClient::GetToBeWipedValue End");
- return status;
- }
-
-EXPORT_C TInt RLawmoClient::SetToBeWipedValue( TDes& aItemName, TInt aWipeVal )
- {
- RLDEBUG("RLawmoClient::SetToBeWipedValue Begin");
- TIpcArgs args1;
- TLawMoStatus status(ELawMoOk);
-
- args1.Set( 0, &aItemName );
- args1.Set( 1, aWipeVal );
- args1.Set( 2, status);
-
- TInt err = SendReceive( EToBeWiped_Set, args1 );
-
- if(err != KErrNone)
- status = ELawMoInvalid;
-
- RLDEBUG("RLawmoClient::SetToBeWipedValue End");
- return status;
- }
-// ----------------------------------------------------------------------------------------
-// RLawmoClient::SetPasscodeMaxAttempts
-// ----------------------------------------------------------------------------------------
-/*EXPORT_C TInt RLawmoClient::GetLawMoState( TDes& aState )
- {
- RLDEBUG("RLawmoClient::GetLawMoState Begin");
-
- TLawMoStatus status(ELawMoSuccess);
- TIpcArgs args1;
- args1.Set( 0, &aState );
- args1.Set( 1, status);
- TInt err = SendReceive( EState, args1 );
-
- if(err != KErrNone)
- status = ELawMoFail;
-
- RLDEBUG("RLawmoClient::GetLawMoState End");
- return status;
- }*/
--- a/dcmofw/rom/dcmofw.iby Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/rom/dcmofw.iby Wed Oct 13 15:30:06 2010 +0300
@@ -20,17 +20,13 @@
#define _DCMOFW_IBY_
file=ABI_DIR\BUILD_DIR\dcmoclient.dll SHARED_LIB_DIR\dcmoclient.dll
-#ifdef FF_OMA_LAWMO
-file=ABI_DIR\BUILD_DIR\lawmoclient.dll SHARED_LIB_DIR\lawmoclient.dll
-#endif
-#if defined(FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION) || defined(FF_OMA_LAWMO)
+#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc RESOURCE_FILES_DIR\dcmo.rsc
file=ABI_DIR\BUILD_DIR\dcmoserver.exe PROGRAMS_DIR\dcmoserver.exe
data=\epoc32\data\Z\private\10202BE9\2001FE47.txt private\10202BE9\2001FE47.txt
data=\epoc32\data\Z\private\10202BE9\2000253D.txt private\10202BE9\2000253D.txt
#endif
-
#endif
--- a/dcmofw/rom/dcmofwresources.iby Wed Sep 15 13:08:27 2010 +0300
+++ b/dcmofw/rom/dcmofwresources.iby Wed Oct 13 15:30:06 2010 +0300
@@ -20,9 +20,8 @@
#define _DCMOFWRESOURCES_IBY_
-#if defined(FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION) || defined(FF_OMA_LAWMO)
+#ifdef FF_RUNTIME_DEVICE_CAPABILITY_CONFIGURATION
data=DATAZ_\RESOURCE_FILES_DIR\dcmo.rsc RESOURCE_FILES_DIR\dcmo.rsc
#endif
-
#endif
--- a/devicediagnosticsfw/diagpluginbase/group/diagpluginbase.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/devicediagnosticsfw/diagpluginbase/group/diagpluginbase.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -47,7 +47,7 @@
LIBRARY efsrv.lib
LIBRARY bafl.lib
LIBRARY cone.lib // CCoeEnv
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY estor.lib // RBufReadStream
LIBRARY flogger.lib // logging
LIBRARY eikdlg.lib // CEikDialog
--- a/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/group/fotaserver.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -83,7 +83,7 @@
LIBRARY bafl.lib
LIBRARY cone.lib
LIBRARY commdb.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY edbms.lib
LIBRARY efsrv.lib
LIBRARY eikctl.lib
@@ -112,12 +112,11 @@
LIBRARY nsmldmtreedbclient.lib
LIBRARY akncapserverclient.lib // AknUiServer
LIBRARY starterclient.lib
-LIBRARY ConnMon.lib
+LIBRARY connmon.lib
LIBRARY featmgr.lib
LIBRARY fmsclient.lib //FMS Client
LIBRARY cmmanager.lib //Connection Manager
-LIBRARY inetprotutil.lib
-LIBRARY featdiscovery.lib
+LIBRARY inetprotutil.lib
LIBRARY aknnotify.lib
// #ifdef _FOTA_DEBUG
--- a/fotaapplication/fotaserver/FotaServer/inc/DevEncController.h Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/inc/DevEncController.h Wed Oct 13 15:30:06 2010 +0300
@@ -52,7 +52,6 @@
void ReportDevEncOpnCompleteL(TInt aResult);
TInt GetDEOperation();
- void CheckIfDeviceMemoryBusyL();
private:
// Functions
--- a/fotaapplication/fotaserver/FotaServer/inc/FotaServer.h Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/inc/FotaServer.h Wed Oct 13 15:30:06 2010 +0300
@@ -739,15 +739,6 @@
* @return None
*/
void StartNetworkMonitorL();
-
- /**
- * Checks whether FOTA needs to decrypt the memory before updating by examing the Feature Flag
- *
- * @since SF 3
- * @param None
- * @return TBool
- */
- TBool IsFOTANeedToDecryptL();
private: // Data
--- a/fotaapplication/fotaserver/FotaServer/src/DevEncController.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/DevEncController.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -200,8 +200,16 @@
TInt err (KErrNone);
TInt status (KErrNone);
- CheckIfDeviceMemoryBusyL();
-
+ TInt deoperation (EOpIdle);
+
+ RProperty::Get(KDevEncProtectedUid, KDevEncOperationKey, deoperation );
+
+ if (deoperation != EOpIdle)
+ {
+ FLOG(_L("Some disk operation is ongoing. Hence Fota is not possible."));
+ User::Leave(KErrNotReady);
+ }
+
iEncMemorySession->SetDrive( aDrive);
err = iEncMemorySession->Connect();
@@ -517,19 +525,5 @@
return iDevEncOperation;
}
-void CDevEncController::CheckIfDeviceMemoryBusyL()
- {
- TInt deoperation (EOpIdle);
-
- RProperty::Get(KDevEncProtectedUid, KDevEncOperationKey, deoperation );
-
- if (deoperation != EOpIdle)
- {
- FLOG(_L("Some disk operation is ongoing. Hence Fota is not possible."));
- User::Leave(KErrNotReady);
- }
-
- }
-
// End of file
--- a/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/FotaServer.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -31,7 +31,6 @@
#include <nsmlconstants.h>
#include <centralrepository.h>
#include <sysversioninfo.h>
-#include <featdiscovery.h>
#include "FotaSrvApp.h"
#include "FotaServer.h"
#include "FotaSrvDebug.h"
@@ -2416,14 +2415,6 @@
__LEAVE_IF_ERROR(err);
}
}
-
- if(!IsFOTANeedToDecryptL())
- {
- iDEController->CheckIfDeviceMemoryBusyL();
- return EFalse;
- }
-
-
TRAPD(err, ret = iDEController->NeedToDecryptL(drive));
delete iDEController; iDEController = NULL;
@@ -2599,21 +2590,3 @@
return ret;
}
-// --------------------------------------------------------------------------
-// CFotaServer::IsFOTANeedToDecryptL
-// This method returns the device encryption operation.
-//
-// --------------------------------------------------------------------------
-//
-TBool CFotaServer::IsFOTANeedToDecryptL()
- {
- FLOG(_L("CFotaServer::IsFOTANeedToDecryptL >>"));
-
- TBool ret(EFalse);
- ret = CFeatureDiscovery::IsFeatureSupportedL(TUid::Uid(KFeatureIdFfFotaDecryptMemBeforeUpdate));
-
- FLOG(_L("CFotaServer::IsFOTANeedToDecryptL, ret = %d <<"), ret);
- return ret;
- }
-
-
--- a/fotaapplication/fotaserver/FotaServer/src/fotaSrvSession.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/fotaSrvSession.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -163,7 +163,7 @@
TInt err(KErrNone);
TInt pkgid = 0;
TPackageState state;
- RThread clt; aMessage.ClientL(clt);
+ RThread clt; aMessage.ClientL(clt);
TFullName cltnm = clt.FullName();
FLOG(_L( "CFotaSrvSession::ServiceL %d serving for %S?" )
,aMessage.Function(), &cltnm );
--- a/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/FotaServer/src/fotadownload.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -36,7 +36,7 @@
#include <es_sock_partner.h>
#endif
#include <es_enum.h>
-#include <nsmldmsync.rsg> //OMA DM UI for reading resource
+#include <NSmlDMSync.rsg> //OMA DM UI for reading resource
#include <bautils.h>
#include <StringLoader.h>
#include <DevManInternalCRKeys.h> //for reading san feature
--- a/fotaapplication/fotaserver/fmserver/group/fmsserver.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/fotaapplication/fotaserver/fmserver/group/fmsserver.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -42,7 +42,7 @@
MW_LAYER_SYSTEMINCLUDE
LIBRARY euser.lib
-LIBRARY ConnMon.lib // for connection monitoring
+LIBRARY connmon.lib // for connection monitoring
LIBRARY sysutil.lib
LIBRARY efsrv.lib
LIBRARY flogger.lib
--- a/omaprovisioning/provisioning/AuthTypePlugin/Group/Authtypeplugin.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/AuthTypePlugin/Group/Authtypeplugin.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -65,7 +65,7 @@
LIBRARY avkon.lib
LIBRARY bafl.lib
LIBRARY commdb.lib
-LIBRARY CommonEngine.lib // RConeResourceLoader
+LIBRARY commonengine.lib // RConeResourceLoader
LIBRARY cone.lib
LIBRARY ecom.lib
LIBRARY efsrv.lib
--- a/omaprovisioning/provisioning/AuthTypePlugin/src/Authtypeplugin.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/AuthTypePlugin/src/Authtypeplugin.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -21,7 +21,7 @@
#include <gsparentplugin.h>
#include <gscommon.hrh>
-#include <authtypepluginrsc.rsg> // GUI Resource
+#include <AuthtypepluginRsc.rsg> // GUI Resource
#include <Authtypeplugin.mbg>
#include <gsprivatepluginproviderids.h>
#include <gsfwviewuids.h>
--- a/omaprovisioning/provisioning/IMAdapter/Group/IMAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/IMAdapter/Group/IMAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -56,7 +56,7 @@
LIBRARY euser.lib
LIBRARY provisioningengine.lib
LIBRARY wvsapsettingsstore.lib
-LIBRARY MsgEditorUtils.lib
+LIBRARY msgeditorutils.lib
LIBRARY apengine.lib
LIBRARY commdb.lib
LIBRARY inetprotutil.lib
--- a/omaprovisioning/provisioning/MbxNbrAdapter/Group/MbxNbrAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/MbxNbrAdapter/Group/MbxNbrAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -54,7 +54,7 @@
LIBRARY euser.lib
LIBRARY provisioningengine.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY vmbx.lib
LIBRARY centralrepository.lib
--- a/omaprovisioning/provisioning/ProvisioningBC/Group/ProvisioningBC.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningBC/Group/ProvisioningBC.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -60,10 +60,10 @@
LIBRARY bafl.lib
LIBRARY eikcore.lib
LIBRARY eikcoctl.lib // bordered control
-LIBRARY MsgEditorUtils.lib
+LIBRARY msgeditorutils.lib
LIBRARY cone.lib
LIBRARY msgs.lib // Messaging Centre interface
-LIBRARY CommonEngine.lib // StringLoader
+LIBRARY commonengine.lib // StringLoader
LIBRARY richbio.lib
LIBRARY provisioningengine.lib
LIBRARY avkon.lib
--- a/omaprovisioning/provisioning/ProvisioningBC/Src/CWPBioControl.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningBC/Src/CWPBioControl.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -361,20 +361,6 @@
TBool preAuthenticated( iMessage->Authenticated() );
// If the message was not authenticated, give a warning
AuthenticateL( *iMessage );
-
- // Identify the authentication type
- TInt type = (entry->Entry()).MtmData2();
- if(type == 1)
- {
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Set(KOMAProvMessageOpen, type);
- if(err != KErrNone)
- {
- FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL Set KOMAProvMessageOpen failed" ) );
- }
- CleanupStack::PopAndDestroy(); // repository
- }
-
FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 3 " ) );
if( !tentry.ReadOnly() && preAuthenticated != iMessage->Authenticated() )
{
@@ -389,16 +375,6 @@
FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 5 " ) );
iEngine->PopulateL();
FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL 6 " ) );
-
- //Reset the cenrep so it can used for next message.
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Set(KOMAProvMessageOpen, 0);
- if(err != KErrNone)
- {
- FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL Set KOMAProvMessageOpen failed" ) );
- }
- CleanupStack::PopAndDestroy();
-
// Empty messages are not supported
if( iEngine->ItemCount() == 0 )
{
@@ -420,7 +396,7 @@
{
iEngine->SetCurrentContextL( KWPMgrUidNoContext );
}
-
+
CleanupStack::PopAndDestroy(2); // orig16, entry
FLOG( _L( "[ProvisioningBC] CWPBioControl::RestoreMsgL done" ) );
}
--- a/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningBC/Src/CWPSaver.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -19,7 +19,7 @@
// INCLUDE FILES
#include <AknQueryDialog.h>
#include <eikprogi.h>
-#include <provisioningbc.rsg>
+#include <ProvisioningBC.rsg>
#include <commdb.h>
#include <CWPEngine.h>
#include <CWPAdapter.h>
--- a/omaprovisioning/provisioning/ProvisioningCx/group/ProvisioningCx.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningCx/group/ProvisioningCx.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -65,7 +65,7 @@
LIBRARY avkon.lib
LIBRARY provisioningengine.lib
LIBRARY bafl.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY featmgr.lib
LIBRARY hlplch.lib
LIBRARY apengine.lib
--- a/omaprovisioning/provisioning/ProvisioningEngine/Group/ProvisioningEngine.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Group/ProvisioningEngine.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -70,7 +70,7 @@
LIBRARY etelmm.lib
LIBRARY inetprotutil.lib
LIBRARY sysutil.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY edbms.lib
LIBRARY centralrepository.lib
LIBRARY cmmanager.lib
--- a/omaprovisioning/provisioning/ProvisioningEngine/Inc/ProvisioningInternalCRKeys.h Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Inc/ProvisioningInternalCRKeys.h Wed Oct 13 15:30:06 2010 +0300
@@ -35,10 +35,6 @@
const TUint32 KOMAProvAuthenticationLVFlag = 0x00000001;
const TUint32 KOMAProvAuthFailMsgHandling = 0x00000002;
const TUint32 KOMAProvOriginatorContent = 0x00000003;
-const TUint32 KOMAProvIsUserPin = 0x00000004;
-const TUint32 KOMAProvCriticalAdapterSettingCount = 0x00000005;
-const TUint32 KOMAProvMessageOpen = 0x00000006;
-const TUint32 KOMAProvAllowCriticalAdapterSetting = 0x00000007;
#endif // PROVISIONINGINTERNALCRKEYS_H
--- a/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPPushMessage.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningEngine/Src/CWPPushMessage.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -1047,14 +1047,6 @@
{
if( aPIN.Length() == 0 )
{
- TInt aSetAuthValue = 1;
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Set(KOMAProvIsUserPin, aSetAuthValue);
- if(err != KErrNone)
- {
- FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: set KOMAProvIsUserPin Failed" ) );
- }
- CleanupStack::PopAndDestroy(); // repository
result = KWPAuthResultPinRequired;
FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: KWPAuthResultPinRequired" ) );
}
@@ -1097,14 +1089,6 @@
{
if( aPIN.Length() == 0 )
{
- TInt aSetAuthValue = 1;
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Set(KOMAProvIsUserPin, aSetAuthValue);
- if(err != KErrNone)
- {
- FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: set KOMAProvIsUserPin Failed" ) );
- }
- CleanupStack::PopAndDestroy(); // repository
result = KWPAuthResultPinRequired;
FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: KWPAuthResultPinRequired" ) );
}
@@ -1128,14 +1112,6 @@
}
else
{
- TInt aSetAuthValue = 1;
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Set(KOMAProvIsUserPin, aSetAuthValue);
- if(err != KErrNone)
- {
- FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: set KOMAProvIsUserPin Failed" ) );
- }
- CleanupStack::PopAndDestroy(); // repository
result = KWPAuthResultNoAuthentication;
FLOG( _L( "[Provisioning] CWPPushMessage::AuthenticateL: KWPAuthResultNoAuthentication" ) );
}
--- a/omaprovisioning/provisioning/ProvisioningHandler/Src/CWPMessage.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningHandler/Src/CWPMessage.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -154,25 +154,7 @@
}
FLOG( _L( "CWPMessage::ProcessL: Creating engine" ) );
-
-
- TInt value( 0 );
- CRepository* rep = CRepository::NewLC( KOMAProvAuthenticationLV );
-
- TInt error = rep->Set(KOMAProvIsUserPin, value);
- if(error != KErrNone)
- {
- FLOG( _L( "CWPMessage::ProcessL: set KOMAProvIsUserPin Failed" ) );
- }
-
- error = rep->Set(KOMAProvCriticalAdapterSettingCount, value);
- if(error != KErrNone)
- {
- FLOG( _L( "CWPMessage::ProcessL: set KOMAProvCriticalAdapterSettingCount Failed" ) );
- }
-
- CleanupStack::PopAndDestroy(); // rep
-
+
// Read the message into the engine
CWPEngine* engine = CWPEngine::NewLC(); // on CS
@@ -180,7 +162,6 @@
engine->ImportDocumentL( iMessage->Body() );
FLOG( _L( "CWPMessage::ProcessL: Populating adapters" ) );
-
engine->PopulateL();
FTRACE(RDebug::Print(_L(" WPMessage::ProcessL: Number of settings: (%d)"), engine->ItemCount()));
@@ -199,41 +180,13 @@
FLOG( _L( "CWPMessage::ProcessL: Bootstrapping" ) );
CWPBootstrap* bootstrap = CWPBootstrap::NewL( iPhone->SubscriberId() );
CleanupStack::PushL( bootstrap );
-
+
CWPBootstrap::TBootstrapResult result(
bootstrap->BootstrapL( *iMessage, *engine, KNullDesC ) );
CleanupStack::PopAndDestroy(); // bootstrap
FTRACE(RDebug::Print(_L(" WPMessage::ProcessL: Bootstrap result: (%d)"), result));
// See UI specs figure 1
-
- TInt adapterCount( 0 );
- TInt userPin(0);
- TInt allowCriticalSetting(0);
-
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt getErr = repository->Get( KOMAProvCriticalAdapterSettingCount, adapterCount);
- if(getErr != KErrNone)
- {
- FLOG( _L( "CWPMessage::ProcessL: set KOMAProvCriticalAdapterSettingCount Failed" ) );
- }
-
- getErr = repository->Get( KOMAProvIsUserPin, userPin );
- if(getErr != KErrNone)
- {
- FLOG( _L( "CWPMessage::PrepareEntryLC: set KOMAProvIsUserPin Failed" ) );
- }
-
- getErr = repository->Get( KOMAProvAllowCriticalAdapterSetting, allowCriticalSetting );
- if(getErr != KErrNone)
- {
- FLOG( _L( "CWPMessage::PrepareEntryLC: set KOMAProvIsUserPin Failed" ) );
- }
-
- CleanupStack::PopAndDestroy(); // repository
-
-
-
TBool haveSettings( engine->ItemCount() > 0 );
switch( result )
{
@@ -241,24 +194,9 @@
{
FLOG( _L( "CWPMessage::ProcessL: Bootstrapping ENoBootstrap" ) );
// If there's no bootstrap, just save the message
-
- if( haveSettings)
+ if( haveSettings )
{
- if(allowCriticalSetting)
- {
- if(!userPin)
- {
- StoreMsgL();
- }
- else if(adapterCount != engine->ItemCount())
- {
- StoreMsgL();
- }
- }
- else
- {
- StoreMsgL();
- }
+ StoreMsgL();
}
else
{
@@ -270,75 +208,36 @@
case CWPBootstrap::ENotAuthenticated:
{
FLOG( _L( "CWPMessage::ProcessL: Bootstrapping ENotAuthenticated" ) );
-
- if(haveSettings)
- {
- if(allowCriticalSetting)
- {
- if(adapterCount != engine->ItemCount())
- {
- StoreMsgL();
- }
- }
- else
- {
- StoreMsgL();
- }
- }
+ if( haveSettings )
+ {
+ StoreMsgL();
+ }
else
{
+
// Message is ignored and an information SMs is put to Inbox.
//Information SMs can be Class0, based on operator requirement.
- if(allowCriticalSetting)
- {
- if(adapterCount != engine->ItemCount())
- {
- TInt auth_value;
- CRepository * rep = 0;
- TRAPD( err, rep = CRepository::NewL( KCRUidOMAProvisioningLV ));
- if(err == KErrNone)
- {
- rep->Get( KOMAProvAuthFailMsgHandling, auth_value );
- delete rep;
-
- if(auth_value == 1)
- StoreMsgclass0L(R_TEXT_AUTHENTICATION_FAILED);
- else
- StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
+ TInt auth_value;
+ CRepository * rep = 0;
+ TRAPD( err, rep = CRepository::NewL( KCRUidOMAProvisioningLV ));
+ if(err == KErrNone)
+ {
+ rep->Get( KOMAProvAuthFailMsgHandling, auth_value );
+ delete rep;
- User::Leave( KErrAccessDenied );
- }
- else
- {
- StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
- User::Leave( KErrAccessDenied );
- }
- }
- }
+ if(auth_value == 1)
+ StoreMsgclass0L(R_TEXT_AUTHENTICATION_FAILED);
else
- {
- TInt auth_value;
- CRepository * rep = 0;
- TRAPD( err, rep = CRepository::NewL( KCRUidOMAProvisioningLV ));
- if(err == KErrNone)
- {
- rep->Get( KOMAProvAuthFailMsgHandling, auth_value );
- delete rep;
+ StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
- if(auth_value == 1)
- StoreMsgclass0L(R_TEXT_AUTHENTICATION_FAILED);
- else
- StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
-
- User::Leave( KErrAccessDenied );
- }
- else
- {
- StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
- User::Leave( KErrAccessDenied );
- }
+ User::Leave( KErrAccessDenied );
}
- }
+ else
+ {
+ StoreMsgL(R_TEXT_AUTHENTICATION_FAILED);
+ User::Leave( KErrAccessDenied );
+ }
+ }
break;
}
@@ -347,26 +246,12 @@
FLOG( _L( "CWPMessage::ProcessL: Bootstrapping EPinRequired" ) );
// If PIN is required, defer authentication to ProvisioningBC
- if(haveSettings)
+ if( haveSettings )
{
- if(allowCriticalSetting)
- {
- if(!userPin)
- {
- StoreMsgL();
- }
- else if(adapterCount != engine->ItemCount())
- {
- StoreMsgL();
- }
- }
- else
- {
- StoreMsgL();
- }
+ StoreMsgL();
}
else
- {
+ {
User::Leave( KErrCorrupt );
}
break;
@@ -686,22 +571,6 @@
aEntry.iError = KErrNone;
// iMtmData1 is been used/reserved for count, please don't use for any other purpose.
aEntry.SetMtmData1(3);
- aEntry.SetMtmData2(0);
-
- TInt userPin = 0;
- CRepository* repository = CRepository::NewLC( KOMAProvAuthenticationLV );
- TInt err = repository->Get( KOMAProvIsUserPin, userPin );
- if(err != KErrNone)
- {
- FLOG( _L( "CWPMessage::PrepareEntryLC: set KOMAProvIsUserPin Failed" ) );
- }
- CleanupStack::PopAndDestroy(); // repository
-
- if(userPin == 1)
- {
- aEntry.SetMtmData2(1);
- }
-
FLOG( _L( "CWPMessage::PrepareEntryLC create an invisible blank entry done" ) );
// Look up the details
HBufC* details = NULL;
--- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPBioMsgHandler.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPBioMsgHandler.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -32,7 +32,7 @@
#include <smsclnt.h>
#include <smuthdr.h>
#include <smutset.h>
-#include <provisioningsc.rsg>
+#include <ProvisioningSC.rsg>
#include <pushmessage.h>
#include <e32std.h>
#include <sysutil.h>
--- a/omaprovisioning/provisioning/ProvisioningSC/Src/CWPProvisioningSC.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/ProvisioningSC/Src/CWPProvisioningSC.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -25,7 +25,7 @@
#include <e32base.h>
#include <CWPEngine.h>
#include <AknGlobalNote.h>
-#include <provisioningsc.rsg>
+#include <ProvisioningSC.rsg>
#include <WPAdapterUtil.h>
#include "MWPPhone.h"
#include "CWPPushMessage.h"
--- a/omaprovisioning/provisioning/WAPAdapter/Group/WPWAPAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/WAPAdapter/Group/WPWAPAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -64,7 +64,7 @@
LIBRARY msgs.lib
LIBRARY apengine.lib
LIBRARY commdb.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY favouritesengine.lib
LIBRARY centralrepository.lib
--- a/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPAdapter.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPAdapter.cpp Wed Oct 13 15:30:06 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/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/accesspointadapter/Src/CWPAPNapdef.cpp Wed Oct 13 15:30:06 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"
--- a/omaprovisioning/provisioning/accesspointadapter/group/WPAPAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/accesspointadapter/group/WPAPAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -61,14 +61,13 @@
SYSTEMINCLUDE /epoc32/include/ecom
LIBRARY euser.lib
-LIBRARY provisioningengine.lib
+LIBRARY ProvisioningEngine.lib
LIBRARY apengine.lib
LIBRARY commdb.lib
-LIBRARY featmgr.lib
+LIBRARY FeatMgr.lib
LIBRARY ecom.lib
LIBRARY centralrepository.lib
LIBRARY cmmanager.lib
-LIBRARY policyengine.lib
DEBUGLIBRARY flogger.lib // Only in debug builds
// End of File
--- a/omaprovisioning/provisioning/alwaysonadapter/Group/alwaysonadapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/omaprovisioning/provisioning/alwaysonadapter/Group/alwaysonadapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -46,7 +46,7 @@
LIBRARY euser.lib
LIBRARY provisioningengine.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY centralrepository.lib
DEBUGLIBRARY flogger.lib
Binary file omaprovisioning/provisioning/conf/s60provisioning.confml has changed
Binary file omaprovisioning/provisioning/conf/s60provisioning_101F87AA.crml has changed
Binary file omaprovisioning/provisioning/help/data/xhtml.zip has changed
--- a/policymanagement/dmutilserver/group/DMUtilServer.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/policymanagement/dmutilserver/group/DMUtilServer.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -75,7 +75,7 @@
// S60
LIBRARY rfs.lib
LIBRARY sysutil.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
// TARM
LIBRARY policyengine.lib
LIBRARY centreptool.lib
--- a/policymanagement/policyengine/group/PolicyEngineServer.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/policymanagement/policyengine/group/PolicyEngineServer.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -77,5 +77,6 @@
LIBRARY flogger.lib
LIBRARY featmgr.lib
LIBRARY inetprotutil.lib
+LIBRARY cmmanager.lib
SMPSAFE
--- a/policymanagement/policyengine/group/PolicyEngineUI.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/policymanagement/policyengine/group/PolicyEngineUI.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -56,7 +56,7 @@
LIBRARY bafl.lib
LIBRARY avkon.lib
LIBRARY cone.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY eikcoctl.lib
LIBRARY eikdlg.lib
LIBRARY eikctl.lib
--- a/policymanagement/policyengine/policyengineserver/inc/CommsDatEnforcement.h Wed Sep 15 13:08:27 2010 +0300
+++ b/policymanagement/policyengine/policyengineserver/inc/CommsDatEnforcement.h Wed Oct 13 15:30:06 2010 +0300
@@ -20,7 +20,7 @@
#define _COMMSDAT_ENFORCEMENT_HEADER__
// INCLUDES
-
+#include <cmmanagerdef.h>
#include "SettingEnforcementManager.h"
#include "CentRepToolClient.h"
@@ -29,62 +29,61 @@
#include <SettingEnforcementInfo.h>
#include <commdb.h>
-
+using namespace CMManager;
+class RCmDestinationExt;
class CCommsDatEnforcement : public CEnforcementBase
-{
- public:
- //construction
- CCommsDatEnforcement();
- virtual ~CCommsDatEnforcement();
- static CCommsDatEnforcement* NewL( const TDesC8& aEnforcementId );
- void ConstructL();
-
- //from MEnforcementBase
- void InitEnforcementL( TRequestStatus& aRequestStatus);
- void DoEnforcementL( TRequestStatus& aRequestStatus);
- TBool InitReady();
- TBool EnforcementReady();
- void FinishEnforcementL( TBool aFlushSettings);
- void ResetEnforcementL();
+ {
+public:
+ //construction
+ CCommsDatEnforcement();
+ virtual ~CCommsDatEnforcement();
+ static CCommsDatEnforcement* NewL(const TDesC8& aEnforcementId);
+ void ConstructL();
+
+ //from MEnforcementBase
+ void InitEnforcementL(TRequestStatus& aRequestStatus);
+ void DoEnforcementL(TRequestStatus& aRequestStatus);
+ TBool InitReady();
+ TBool EnforcementReady();
+ void FinishEnforcementL(TBool aFlushSettings);
+ void ResetEnforcementL();
+
+ void AccessRightList(RAccessControlList& aAccessControlList);
+
+ static TBool ValidEnforcementElement(const TDesC8& aEnforcementId);
+ TInt CheckTableL(const TDesC& aTableName);
-
- void AccessRightList( RAccessControlList& aAccessControlList);
-
- static TBool ValidEnforcementElement( const TDesC8& aEnforcementId);
-
- void LockWLANAccessPointsL( TBool aLockValue );
-
- TInt CheckTableL( const TDesC& aTableName );
-
-
- TUint32 CCommsDatEnforcement::GetRecordIdL( const TDesC& aTableName );
-
- private:
- //active state
- TInt iInitState;
- TInt iEnforcementState;
- TBool iRestore;
-
- //mask value for setting
- RArray<TUint32> iMaskList;
- RArray<TPtrC> iTableList;
-
- //editor list
- RAccessControlList* iAccessControlList;
-
- //CentRep tool
- RCentRepTool iCentRepServer;
-
- RSettingManagement iCommsDatEnforcement;
- //ACL editing
- RDMUtil iDMUtil;
-
- KSettingEnforcements iSettingType;
-
- //@var session - Owned
- CMDBSession* iSession;
-};
+ /**Sets Protection level to all the destinations
+ * @param aProtLevel Protection level to be set on the destinations
+ */
+ void SetProtectionL(TProtectionLevel aProtLevel);
+
+ /**Sets Protection level to all the Connection Methods in the destination
+ * @param destination Destination in which the Protection is set on the Connection Methods
+ * @param aProtLevel Protection level to be set on the Connection Methods
+ */
+ void SetCMProtectionL(RCmDestinationExt& aDestination,
+ TProtectionLevel aProtLevel);
+
+private:
+ //active state
+ TInt iInitState;
+ TInt iEnforcementState;
+ TBool iRestore;
+
+ //editor list
+ RAccessControlList* iAccessControlList;
+
+ //CentRep tool
+ RCentRepTool iCentRepServer;
+
+ //ACL editing
+ RDMUtil iDMUtil;
+
+ KSettingEnforcements iSettingType;
+
+ };
#endif
\ No newline at end of file
--- a/policymanagement/policyengine/policyengineserver/src/CommsDatEnforcement.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/policymanagement/policyengine/policyengineserver/src/CommsDatEnforcement.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -20,7 +20,10 @@
#include <commdb.h>
-
+#include <cmmanagerext.h>
+#include <cmdestinationext.h>
+#include <cmconnectionmethoddef.h>
+#include <cmconnectionmethodext.h>
#include "CommsDatEnforcement.h"
#include "XACMLconstants.h"
#include "debug.h"
@@ -39,24 +42,10 @@
// CONSTANTS
_LIT( KCommsDatEnformentPanic, "CommsDat enforcement panic");
-
-
-//Repository UIDs
-
-const TUid TCommsDatRepository = { 0xCCCCCC00 };
-const TUint32 KCDMaskRecordType = 0x7f800000;
-
-const TUint32 KWLANServiceExtRecord = 0x05000000;
-
-const TPtrC KWLANServiceExtTable( _S("WLANServiceExtensionTable"));
-const TPtrC KWLANServiceTable( _S("WLANServiceTable"));
-const TPtrC KWLANDeviceTable( _S("WLANDeviceTable"));
-const TPtrC KWLANSecondarySSID( _S("SecondarySSID"));
-const TPtrC KDestinationNetwork( _S("DestinationNetwork"));
-
-
_LIT8( KAPURI, "AP");
+const TInt KDelayBeforeProtection = 1000000; // 1 Sec
+const TInt KMaxProtectionRetries = 10;
// -----------------------------------------------------------------------------
// CCommsDatEnforcement::CCommsDatEnforcement()
@@ -73,21 +62,12 @@
// -----------------------------------------------------------------------------
//
CCommsDatEnforcement::~CCommsDatEnforcement()
- {
- RDEBUG("CCommsDatEnforcement::~CCommsDatEnforcement()");
-
- if( iSession )
- {
- iSession->Close();
- delete iSession;
- }
-
- iMaskList.Close();
- iTableList.Close();
- iCommsDatEnforcement.Close();
- iCentRepServer.Close();
- iDMUtil.Close();
- }
+ {
+ RDEBUG("CCommsDatEnforcement::~CCommsDatEnforcement()");
+
+ iCentRepServer.Close();
+ iDMUtil.Close();
+ }
// -----------------------------------------------------------------------------
@@ -95,66 +75,37 @@
// -----------------------------------------------------------------------------
//
void CCommsDatEnforcement::ConstructL()
- {
- RDEBUG("CCommsDatEnforcement::ConstructL()");
- //no implementation needed
- iSession = CMDBSession::NewL( CMDBSession::LatestVersion() );
- }
+ {
+ RDEBUG("CCommsDatEnforcement::ConstructL()");
+ //no implementation needed
+ }
// -----------------------------------------------------------------------------
// CCommsDatEnforcement::NewL()
// -----------------------------------------------------------------------------
//
-CCommsDatEnforcement* CCommsDatEnforcement::NewL( const TDesC8& aEnforcementId )
- {
- RDEBUG("CCommsDatEnforcement::NewL()");
+CCommsDatEnforcement* CCommsDatEnforcement::NewL(const TDesC8& aEnforcementId)
+ {
+ RDEBUG("CCommsDatEnforcement::NewL()");
CCommsDatEnforcement* self = 0;
+
- if( aEnforcementId == PolicyLanguage::Constants::EAPEnforcementPolicy )
- {
- RDEBUG(" -> EAPEnforcementPolicy");
+ if (aEnforcementId == PolicyLanguage::Constants::EAPEnforcementPolicy)
+ {
+ RDEBUG(" -> EAPEnforcementPolicy");
self = new ( ELeave ) CCommsDatEnforcement();
self->ConstructL();
- CleanupStack::PushL( self );
- self->iMaskList.AppendL( KCDTIdWAPAccessPointRecord );
- self->iTableList.AppendL( TPtrC(KCDTypeNameWAPAccessPoint ));
- self->iMaskList.AppendL( KCDTIdWAPSMSBearerRecord );
- self->iTableList.AppendL( TPtrC(KCDTypeNameWAPSMSBearer) );
- self->iMaskList.AppendL( KCDTIdWAPIPBearerRecord );
- self->iTableList.AppendL( TPtrC(KCDTypeNameWAPIPBearer) );
- self->iMaskList.AppendL( KCDTIdIAPRecord );
- self->iTableList.AppendL( TPtrC(KCDTypeNameIAP) );
- self->iSettingType = EAPEnforcement;
- CleanupStack::Pop( self );
- }
- else if( aEnforcementId == PolicyLanguage::Constants::EWLANEnforcementPolicy )
- {
- RDEBUG(" -> EWLANEnforcementPolicy");
+ self->iSettingType = EAPEnforcement;
+ }
+
+ else if (aEnforcementId
+ == PolicyLanguage::Constants::EWLANEnforcementPolicy)
+ {
+ RDEBUG(" -> EWLANEnforcementPolicy");
self = new ( ELeave ) CCommsDatEnforcement();
self->ConstructL();
- CleanupStack::PushL( self );
- self->iMaskList.AppendL( KWLANServiceExtRecord );
- self->iTableList.AppendL( KWLANServiceExtTable );
-
- TUint32 wlanServiceTableId = self->GetRecordIdL( KWLANServiceTable );
- self->iMaskList.AppendL( wlanServiceTableId );
- self->iTableList.AppendL( KWLANServiceTable );
-
- TUint32 wlanDeviceTableId = self->GetRecordIdL( KWLANDeviceTable );
- self->iMaskList.AppendL( wlanDeviceTableId );
- self->iTableList.AppendL( KWLANDeviceTable );
-
- TUint32 wlanSSIDTableId = self->GetRecordIdL( KWLANSecondarySSID );
- self->iMaskList.AppendL( wlanSSIDTableId );
- self->iTableList.AppendL( KWLANSecondarySSID );
-
- TUint32 wlanDestinationNetworkTableId = self->GetRecordIdL( KDestinationNetwork );
- self->iMaskList.AppendL( wlanDestinationNetworkTableId );
- self->iTableList.AppendL( KDestinationNetwork );
-
- self->iSettingType = EWLANEnforcement;
- CleanupStack::Pop( self );
- }
+ self->iSettingType = EWLANEnforcement;
+ }
return self;
}
@@ -164,97 +115,83 @@
// CCommsDatEnforcement::ValidEnforcementElement()
// -----------------------------------------------------------------------------
//
-TBool CCommsDatEnforcement::ValidEnforcementElement( const TDesC8& aEnforcementId )
- {
- RDEBUG("CCommsDatEnforcement::ValidEnforcementElement()");
- if ( aEnforcementId == PolicyLanguage::Constants::EAPEnforcementPolicy )
- {
- RDEBUG(" -> valid EAPEnforcementPolicy");
- return ETrue;
- }
- else if ( aEnforcementId == PolicyLanguage::Constants::EWLANEnforcementPolicy )
- {
- RDEBUG(" -> valid EWLANEnforcementPolicy");
- return ETrue;
- }
-
- return EFalse;
- }
+TBool CCommsDatEnforcement::ValidEnforcementElement(
+ const TDesC8& aEnforcementId)
+ {
+ RDEBUG("CCommsDatEnforcement::ValidEnforcementElement()");
+ if (aEnforcementId == PolicyLanguage::Constants::EAPEnforcementPolicy
+ || aEnforcementId
+ == PolicyLanguage::Constants::EWLANEnforcementPolicy)
+ {
+ RDEBUG(" -> valid EnforcementPolicy");
+ return ETrue;
+ }
+
+ return EFalse;
+ }
// -----------------------------------------------------------------------------
// CCommsDatEnforcement::InitEnforcement()
// -----------------------------------------------------------------------------
//
-void CCommsDatEnforcement::InitEnforcementL( TRequestStatus& aRequestStatus )
- {
- RDEBUG("CCommsDatEnforcement::InitEnforcementL()");
- //set restore flag
- if ( iAccessControlList->Count() )
- {
- iRestore = EFalse;
- }
- else
- {
- iRestore = ETrue;
- iInitState++;
- }
+void CCommsDatEnforcement::InitEnforcementL(TRequestStatus& aRequestStatus)
+ {
+ RDEBUG("CCommsDatEnforcement::InitEnforcementL()");
+
+ RDEBUG_2("CCommsDatEnforcement@@iInitState %d )", iInitState );
+ //set restore flag
+ if (iAccessControlList->Count())
+ {
+ iRestore = EFalse;
+ }
+ else
+ {
+ iRestore = ETrue;
+ iInitState++;
+ }
+
+ //in first phase open connections to centreptool
+ if (iInitState == 0 || iRestore)
+ {
+ RDEBUG(" -> Opening connections ... ");
+ User::LeaveIfError(iCentRepServer.Connect());
+ User::LeaveIfError(iDMUtil.Connect());
+ RDEBUG(" -> Opening connections ... DONE!");
+ }
- //in first phase open connections to centreptool
- if ( iInitState == 0 || iRestore )
- {
- RDEBUG(" -> Opening connections ... ");
- User::LeaveIfError( iCentRepServer.Connect() );
- User::LeaveIfError( iCommsDatEnforcement.Open( TCommsDatRepository , iCentRepServer ) );
- User::LeaveIfError( iDMUtil.Connect());
- RDEBUG(" -> Opening connections ... DONE!");
- }
-
- //init each session in own cycle....
- switch ( iInitState )
- {
- case 0:
- {
- RDEBUG("CCommsDatEnforcement: Protect AP tables ... ");
- CCommsDatabaseProtect* dbprotect = CCommsDatabaseProtect::NewL();
-
- //add protection for GS
- for ( TInt i( 0 ); i < iTableList.Count(); i++ )
- {
- TInt err = dbprotect->ProtectTable( iTableList[ i ] );
- RDEBUG_2("CCommsDatEnforcement: Protection status %d", err );
- }
-
- delete dbprotect;
- dbprotect = NULL;
-
- // enable all WLAN AP locks
- if(iSettingType == EWLANEnforcement)
- {
- LockWLANAccessPointsL( ETrue );
- }
-
- //compelete request
- TRequestStatus * status = &aRequestStatus;
- User::RequestComplete( status, KErrNone );
- }
- break;
- case 1:
- {
- RDEBUG("CCommsDatEnforcement: Init commsDat enforcement session");
- iCommsDatEnforcement.InitSession( aRequestStatus );
- }
- break;
- default:
- {
- RDEBUG("**** CCommsDatEnforcement PANIC, invalid switch-case!");
- User::Panic( KCommsDatEnformentPanic, KErrAbort );
- }
- break;
- }
-
- iInitState++;
- }
+ //init each session in own cycle....
+ switch (iInitState)
+ {
+ case 0:
+ {
+ //Protect the destinations
+ SetProtectionL(EProtLevel1);
+
+
+ //compelete request
+ TRequestStatus * status = &aRequestStatus;
+ User::RequestComplete(status, KErrNone);
+ }
+ break;
+ case 1:
+ {
+ RDEBUG("CCommsDatEnforcement:InitEnforcementL Case 1");
+
+ TRequestStatus * status = &aRequestStatus;
+ User::RequestComplete(status, KErrNone);
+ }
+ break;
+ default:
+ {
+ RDEBUG("**** CCommsDatEnforcement PANIC, invalid switch-case!");
+ User::Panic(KCommsDatEnformentPanic, KErrAbort);
+ }
+ break;
+ }
+
+ iInitState++;
+ }
// -----------------------------------------------------------------------------
@@ -272,38 +209,32 @@
// CCommsDatEnforcement::InitReady()
// -----------------------------------------------------------------------------
//
-void CCommsDatEnforcement::DoEnforcementL( TRequestStatus& aRequestStatus )
- {
- RDEBUG("CCommsDatEnforcement::DoEnforcementL()");
- if( !iRestore )
- {
- //if there any number subject which have exclusively right for setting, give access only for DM client
- for ( TInt i( 0 ); i < iMaskList.Count(); i++ )
- {
- RDEBUG_3(" making enforcement: %d/%d", i, iMaskList.Count() );
- User::LeaveIfError( iCommsDatEnforcement.SetSIDWRForMask( iMaskList[ i ], KCDMaskRecordType, KDMClientUiD));
- User::LeaveIfError( iCommsDatEnforcement.RemoveBackupFlagForMask( iMaskList[ i ], KCDMaskRecordType));
- CPolicyStorage::PolicyStorage()->ActivateEnforcementFlagL( iSettingType );
- }
-
- //ACL...
- RDEBUG(" making ACL modifications for enforcement ... ");
- User::LeaveIfError( iDMUtil.SetMngSessionCertificate( SessionCertificate() ) );
- User::LeaveIfError( iDMUtil.AddACLForNode( KAPURI, EForChildrens, EACLDelete ) );
- User::LeaveIfError( iDMUtil.AddACLForNode( KAPURI, EForNode, EACLGet ) );
- User::LeaveIfError( iDMUtil.SetACLForNode( KAPURI, EForNode, EACLAdd ) );
- RDEBUG(" making ACL modifications for enforcement ... DONE!");
- }
- else
- {
- //Clear default settings
- for ( TInt i( 0 ); i < iMaskList.Count(); i++ )
- {
- RDEBUG_3(" clearing default settings: %d/%d", i, iMaskList.Count() );
- User::LeaveIfError( iCommsDatEnforcement.RestoreMask( iMaskList[ i ], KCDMaskRecordType ));
- User::LeaveIfError( iCommsDatEnforcement.RestoreBackupFlagForMask( iMaskList[ i ], KCDMaskRecordType));
- CPolicyStorage::PolicyStorage()->DeactivateEnforcementFlagL( iSettingType );
- }
+void CCommsDatEnforcement::DoEnforcementL(TRequestStatus& aRequestStatus)
+ {
+ RDEBUG("CCommsDatEnforcement::DoEnforcementL()");
+ if (!iRestore)
+ {
+ CPolicyStorage::PolicyStorage()->ActivateEnforcementFlagL(
+ iSettingType);
+
+ //ACL...
+ RDEBUG(" making ACL modifications for enforcement ... ");
+ User::LeaveIfError(iDMUtil.SetMngSessionCertificate(
+ SessionCertificate()));
+ User::LeaveIfError(iDMUtil.AddACLForNode(KAPURI, EForChildrens,
+ EACLDelete));
+ User::LeaveIfError(iDMUtil.AddACLForNode(KAPURI, EForNode, EACLGet));
+ User::LeaveIfError(iDMUtil.SetACLForNode(KAPURI, EForNode, EACLAdd));
+ RDEBUG(" making ACL modifications for enforcement ... DONE!");
+ }
+ else
+ {
+ //Unprotect the destinations
+ SetProtectionL(EProtLevel0);
+
+
+ CPolicyStorage::PolicyStorage()->DeactivateEnforcementFlagL(
+ iSettingType);
//ACL...
RDEBUG(" removing ACL modifications for enforcement ... ");
@@ -331,61 +262,31 @@
// CCommsDatEnforcement::FinishEnforcementL()
// -----------------------------------------------------------------------------
//
-void CCommsDatEnforcement::FinishEnforcementL( TBool aFlushSettings)
- {
- RDEBUG("CCommsDatEnforcement::FinishEnforcementL()");
- //Close sessions
- if( aFlushSettings )
- {
- iCommsDatEnforcement.Flush();
- iDMUtil.Flush();
- }
-
- iCommsDatEnforcement.Close();
-
- //Close centrep server...
- iCentRepServer.Close();
-
- iDMUtil.Close();
+void CCommsDatEnforcement::FinishEnforcementL(TBool aFlushSettings)
+ {
+ RDEBUG("CCommsDatEnforcement::FinishEnforcementL()");
+ //Close sessions
+ if (aFlushSettings)
+ {
+ iDMUtil.Flush();
+ }
-
- if( iRestore && aFlushSettings )
- {
- RDEBUG("PolicyEngineServer: Remove AP table Protection");
-
- CCommsDatabaseProtect* dbprotect = CCommsDatabaseProtect::NewL();
- CleanupStack::PushL( dbprotect );
-
- TRAP_IGNORE( LockWLANAccessPointsL( EFalse ) );
- //remove protection for GS
- for ( TInt i( 0 ); i < iTableList.Count(); i++ )
- {
- TInt err = dbprotect->UnProtectTable( iTableList[ i ] );
- RDEBUG_2("PolicyEngineServer: Protection status %d", err );
- }
- //Condition when AP + WLAN are enforced and AP is being removed
- //GS should still show lock icons for WLANs
- RDbRowSet::TAccess checkAccessType = RDbRowSet::EReadOnly ;
- TRAP_IGNORE( checkAccessType = dbprotect->GetTableAccessL(TPtrC(WLAN_SERVICE)));
- switch(checkAccessType)
- {
- case RDbRowSet::EReadOnly :
- TRAP_IGNORE(LockWLANAccessPointsL( ETrue ));
- default : break;
- }
- CleanupStack::PopAndDestroy( dbprotect );
- }
- }
-
+ //Close centrep server...
+ iCentRepServer.Close();
+
+ iDMUtil.Close();
+ }
+
// -----------------------------------------------------------------------------
// CCommsDatEnforcement::AccessRightList()
// -----------------------------------------------------------------------------
//
-void CCommsDatEnforcement::AccessRightList( RAccessControlList& aAccessControlList)
- {
- RDEBUG("CCommsDatEnforcement::AccessRightList()");
- iAccessControlList = &aAccessControlList;
- }
+void CCommsDatEnforcement::AccessRightList(
+ RAccessControlList& aAccessControlList)
+ {
+ RDEBUG("CCommsDatEnforcement::AccessRightList()");
+ iAccessControlList = &aAccessControlList;
+ }
// -----------------------------------------------------------------------------
@@ -393,113 +294,154 @@
// -----------------------------------------------------------------------------
//
void CCommsDatEnforcement::ResetEnforcementL()
- {
- RDEBUG("CCommsDatEnforcement::ResetEnforcementL()");
-
- User::LeaveIfError( iCentRepServer.Connect() );
- User::LeaveIfError( iCommsDatEnforcement.Open( TCommsDatRepository , iCentRepServer ) );
- User::LeaveIfError( iDMUtil.Connect());
+ {
+ RDEBUG("CCommsDatEnforcement::ResetEnforcementL()");
+
+ User::LeaveIfError(iCentRepServer.Connect());
+ User::LeaveIfError(iDMUtil.Connect());
- TRequestStatus request;
- iCommsDatEnforcement.InitSession( request );
- User::WaitForRequest( request);
-
- for ( TInt i( 0 ); i < iMaskList.Count(); i++ )
- {
- User::LeaveIfError( iCommsDatEnforcement.RestoreMask( iMaskList[ i ], KCDMaskRecordType ));
- User::LeaveIfError( iCommsDatEnforcement.RestoreBackupFlagForMask( iMaskList[ i ], KCDMaskRecordType));
- }
+ //ACL...
+ User::LeaveIfError(iDMUtil.RemoveACL(KAPURI, ETrue));
- //ACL...
- User::LeaveIfError( iDMUtil.RemoveACL( KAPURI, ETrue ) );
-
+ iCentRepServer.Close();
+ iDMUtil.Close();
+ }
- iCommsDatEnforcement.Flush();
- iCommsDatEnforcement.Close();
- iCentRepServer.Close();
- iDMUtil.Close();
- }
// -----------------------------------------------------------------------------
-// CCommsDatEnforcement::LockWLANAccessPointsL()
+// CCommsDatEnforcement::SetProtectionL()
+// Sets Protection level to all the destinations
// -----------------------------------------------------------------------------
//
-void CCommsDatEnforcement::LockWLANAccessPointsL( TBool aLockValue )
- {
- RDEBUG_2("CCommsDatEnforcement::LockAccessPoint( %d )", aLockValue );
-
- //Get WLAN service table and get ServiceID--> which is nothing but IAP ID and lock that record
+void CCommsDatEnforcement::SetProtectionL(TProtectionLevel aProtLevel)
+ {
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() Start");
+
+ RCmManagerExt cmm;
+ cmm.OpenL();
+ CleanupClosePushL(cmm);
+
+ RArray<TUint32> destinations;
+ cmm.AllDestinationsL(destinations);
+ CleanupClosePushL(destinations);
+ TInt destcount = destinations.Count();
+
+ RCmDestinationExt destination;
- //TBool ret = EFalse;
- TUint32 apIAPID = 0;
-
- CCommsDbTableView* checkView;
- CCommsDatabase* commsDataBase = CCommsDatabase::NewL();
- CleanupStack::PushL( commsDataBase );
- checkView = commsDataBase->OpenTableLC(TPtrC(IAP));
- RDEBUG(" -> After opening IAP table ");
- TBuf<KCommsDbSvrMaxFieldLength> serviceType;
- TInt error = checkView->GotoFirstRecord();
- RDEBUG(" -> After going to first record ");
- while (error == KErrNone)
+ //Set the Protection level for all the destinations
+ for (TInt i = 0; i < destcount; i++)
{
- RDEBUG(" -> KERRNONE ");
- // Get the ID and check for service type
- checkView->ReadTextL(TPtrC(IAP_SERVICE_TYPE), serviceType);
- if(serviceType == TPtrC(LAN_SERVICE))
+ TInt err = KErrNone;
+ TInt retries = 1;
+ // Retry, at the max, 10 times, if transaction fails due to KErrLocked
+ // This is not an optimal solution for this problem, but, due to limitations
+ // from CMManager, after a lot of Development and testing effort, below code
+ // is found out to be a working one for most of the cases
+ do
+ {
+ if (retries > 1)
+ {
+ User::After( KDelayBeforeProtection);
+ }
+
+ RDEBUG_2(
+ "CCommsDatEnforcement::SetProtectionL() DestinationL Retry No. %d",
+ retries);
+ TRAP(err, destination = cmm.DestinationL(destinations[i]));
+ retries++;
+ }
+ while (err == KErrLocked && retries <= KMaxProtectionRetries);
+ RDEBUG_2(
+ "CCommsDatEnforcement::SetProtectionL() DestinationL error is %d",
+ err);
+
+ if ((err != KErrNone && err != KErrLocked) || (err == KErrLocked
+ && retries > KMaxProtectionRetries))
{
- checkView->ReadUintL(TPtrC(COMMDB_ID), apIAPID);
- RDEBUG_2(" ->found %d WLAN AP. being protected or unprotected", apIAPID );
- if(aLockValue)
- {
- ((CCommsDbProtectTableView*)checkView)->ProtectRecord();
- RDEBUG(" -> WLAN AP protected successfully!");
- }
- else
- {
- ((CCommsDbProtectTableView*)checkView)->UnprotectRecord();
- RDEBUG(" -> WLAN AP UN protected successfully!");
- }
-
+ User::Leave(err);
+ }
+
+ CleanupClosePushL(destination);
+
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() SetProtectionL Start");
+ destination.SetProtectionL(aProtLevel);
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() SetProtectionL End");
+ //Connection Methods are not getting unlocked, eventhough the destinations are unlocked
+ // Unlocking the Connecting Methods in the destination
+ if (aProtLevel == EProtLevel0)
+ {
+ SetCMProtectionL(destination, EProtLevel0);
}
- error = checkView->GotoNextRecord();
-
- }
- CleanupStack::PopAndDestroy(); // checkView
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() UpdateL Start");
- CleanupStack::PopAndDestroy( commsDataBase );
+ err = KErrNone;
+ retries = 1;
+ do
+ {
+ if (retries > 1)
+ {
+ User::After( KDelayBeforeProtection);
+ }
+ RDEBUG_2(
+ "CCommsDatEnforcement::SetProtectionL() UpdateL Retry No. %d",
+ retries);
+ TRAP(err, destination.UpdateL());
+ retries++;
+ }
+ while (err == KErrLocked && retries <= KMaxProtectionRetries);
+ RDEBUG_2(
+ "CCommsDatEnforcement::SetProtectionL() UpdateL error is %d",
+ err);
+ if ((err != KErrNone && err != KErrLocked) || (err == KErrLocked
+ && retries > KMaxProtectionRetries))
+ {
+ User::Leave(err);
+ }
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() UpdateL End");
+ CleanupStack::PopAndDestroy();
+ }
- }
+ CleanupStack::PopAndDestroy(2);
+ RDEBUG("CCommsDatEnforcement::SetProtectionL() End");
+
+ }
+
// -----------------------------------------------------------------------------
-// CCommsDatEnforcement::GetRecordId()
+// CCommsDatEnforcement::SetCMProtectionL()
+// Sets Protection level to all the Connection Methods in the destination
// -----------------------------------------------------------------------------
-//
-TUint32 CCommsDatEnforcement::GetRecordIdL( const TDesC& aTableName )
- {
- RDEBUG_2("looking rentrep record id for table: %S", &aTableName );
- TMDBElementId tableRecordId = 0;
- CMDBGenericRecord* tempUserDefinedRecord = static_cast<CMDBGenericRecord*>(CCDRecordBase::RecordFactoryL(0));
- CleanupStack::PushL(tempUserDefinedRecord);
+//
+void CCommsDatEnforcement::SetCMProtectionL(RCmDestinationExt& aDestination,
+ TProtectionLevel aProtLevel)
+ {
+ RDEBUG("CCommsDatEnforcement::SetCMProtectionL() Start");
+ TInt APSNAPCount = aDestination.ConnectionMethodCount();
+
+ RCmConnectionMethodExt connection;
+
+ if (APSNAPCount)
+ {
+ for (TInt j = 0; j < APSNAPCount; j++)
+ {
+ connection = aDestination.ConnectionMethodL(j);
+ CleanupClosePushL(connection);
+ if (aProtLevel == EProtLevel0)
+ {
+ connection.SetBoolAttributeL(ECmProtected, EFalse);
+ }
+ else if (aProtLevel == EProtLevel1 || aProtLevel == EProtLevel3)
+ {
+ connection.SetBoolAttributeL(ECmProtected, ETrue);
+ }
+ CleanupStack::PopAndDestroy();
+ }
+
+ }
+ RDEBUG("CCommsDatEnforcement::SetCMProtectionL() End");
+ }
- tempUserDefinedRecord->InitializeL(aTableName, NULL);
- tempUserDefinedRecord->LoadL(*iSession);
-
- // Get the Id that we're interested in...
- tableRecordId = tempUserDefinedRecord->TableId();
- RDEBUG_2(" found tableRecordId: %08x", tableRecordId );
- CleanupStack::PopAndDestroy(tempUserDefinedRecord);
-
- // ..and validate it.
- if ((tableRecordId & KCDMaskShowRecordType) < KCDInitialUDefRecordType)
- {
- RDEBUG("Error validating tableRecordId");
- User::Leave(KErrNotFound);
- }
-
- return tableRecordId;
- }
-
+
--- a/remotemgmt_plat/adaptive_history_list_api/adaptive_history_list_api.metaxml Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="8d53812d56803ad2bef7ddd15c91413e" dataversion="1.0">
- <name>Adaptive History List API</name>
- <description>API providing basic list data structure. Order of items in the list is based on access frequency.</description>
- <type>c++</type>
- <subsystem>ahle</subsystem>
- <libs>
- <lib name="ahle2client.lib" />
- </libs>
- <release category="domain"/>
- <attributes>
- <!-- This indicates wether the api provedes separate html documentation -->
- <!-- or is the additional documentation generated from headers. -->
- <!-- If you are unsuere then the value is "no" -->
- <htmldocprovided>yes</htmldocprovided>
- <adaptation>no</adaptation>
- </attributes>
-</api>
--- a/remotemgmt_plat/adaptive_history_list_api/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2006 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: File that exports the files belonging to
-: Adaptive History List API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/ahlegenericapi.h MW_LAYER_PLATFORM_EXPORT_PATH(ahlegenericapi.h)
-../inc/ahleobserver.h MW_LAYER_PLATFORM_EXPORT_PATH(ahleobserver.h)
-../inc/ahlededicatedapi.h MW_LAYER_PLATFORM_EXPORT_PATH(ahlededicatedapi.h)
-../inc/ahlegenericapi.inl MW_LAYER_PLATFORM_EXPORT_PATH(ahlegenericapi.inl)
-../inc/ahlededicatedapi.inl MW_LAYER_PLATFORM_EXPORT_PATH(ahlededicatedapi.inl)
--- a/remotemgmt_plat/adaptive_history_list_api/inc/ahlededicatedapi.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,493 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: API definition for dedicated clients.
-*
-*/
-
-#ifndef MAHLEDEDICATEDAPI_H
-#define MAHLEDEDICATEDAPI_H
-
-#include <badesca.h>
-#include <ahlededicated.h>
-
-class MAHLEObserver;
-
-/**
-* AHLE API for dedicated clients.
-* Provides API interface for dedicated clients
-*
-* @lib AHLE2CLIENT.lib
-* @since Series 60 3.1
-*/
-class MAHLEDedicatedAPI
- {
- public:
-
- /**
- * Destructor.
- */
- inline virtual ~MAHLEDedicatedAPI();
-
- /**
- * Check if the client has been connected to the server
- *
- * @return ETrue if connected, otherwise EFalse
- */
- virtual TBool IsConnected() = 0;
-
- /**
- * Set client observer
- *
- * @param aObserver client observer
- */
- virtual void SetObserverL(const MAHLEObserver* aObserver) = 0;
-
- /**
- * Cancel client observer
- */
- virtual void CancelObserver() = 0;
-
- /**
- * Engine reconfiguration.
- * New storage sizes have to be explicitly specified.
- *
- * @param aPrimarySize New primary storage size.
- * @param aSecondarySize New secondary storage size.
- * @param aAdaptationSpeed New adaptation speed.
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if one of parameters is out of range.
- */
- virtual TInt Reconfigure(
- TUint aPrimarySize,
- TUint aSecondarySize,
- TReal32 aAdaptationSpeed) = 0;
-
- /**
- * Current engine configuration.
- *
- * @param aPrimarySize Current primary storage size.
- * @param aSecondarySize Current secondary storage size.
- * @param aAdaptationSpeed Current adaptation speed.
- */
- virtual TInt GetConfiguration(
- TUint& aPrimarySize,
- TUint& aSecondarySize,
- TReal32& aAdaptationSpeed) = 0;
-
- /**
- * Logging new access synchronously.
- * Used by Browser, Emails, Logs, Messaging, Phonebook
- *
- * @param aItem Access descriptor, key value in adaptive list
- * Browser - url. URLs should follow URI Generic Syntax
- * described in RFC 2396
- * Emails - email address
- * Logs - telephone number
- * Messaging - linkID
- * Phonebook - linkID
- * @param aDescription specific information about aItem
- * Browser - name (e.g. Content of WML/HTML title tag)
- * (defaults to empty string)
- * Emails - defaults to empty string
- * Logs - defaults to empty string
- * Messaging - telephone number or e-mail address
- * (second part of key value)
- * Phonebook - telephone number (second part of key value)
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is in use (e.g. reading or writing file) and
- * KErrArgument if size of one of parameters is out of range.
- */
- virtual TInt NewAccess(
- const TDesC& aItem,
- const TDesC& aDescription = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Logging new access asynchronously.
- * Used by Browser, Emails, Logs, Messaging, Phonebook
- *
- * @param aStatus Asychronous request status.
- * @param aItem Access descriptor, key value in adaptive list
- * Browser - url. URLs should follow URI Generic Syntax
- * described in RFC 2396
- * Emails - email address
- * Logs - telephone number
- * Messaging - linkID
- * Phonebook - linkID
- * @param aDescription Name or telephone number
- * Browser - name (e.g. Content of WML/HTML title tag)
- * (defaults to empty string)
- * Emails - defaults to empty string
- * Logs - defaults to empty string
- * Messaging - telephone number or e-mail address
- * (second part of key value)
- * Phonebook - telephone number (second key value)
- */
- virtual void NewAccessL(
- TRequestStatus& aStatus,
- const TDesC& aItem,
- const TDesC& aDescription = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Get adaptive list synchronously. Used by Emails and Logs.
- *
- * @param aItems Descriptor array containing items in ranked order.
- * Emails - email addresses
- * Logs - telephone numbers
- * @param aSize Maximum length of returned list
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file).
- */
- virtual TInt AdaptiveListL(
- CDesCArray& aItems,
- const TUint aSize) = 0;
-
- /**
- * Get adaptive list asynchronously. Used by Emails and Logs.
- *
- * @param aStatus Asynchronous request status.
- * @param aItems Descriptor array containing items in ranked order.
- * Emails - email addresses
- * Logs - telephone numbers
- * @param aSize Maximum length of returned list
- */
- virtual void AdaptiveListL(
- TRequestStatus& aStatus,
- CDesCArray& aItems,
- const TUint aSize) = 0;
-
- /**
- * Get adaptive list synchronously.
- * Used by Browser, Messaging and Phonebook.
- * For Browser there is an option of selecting sites/groups or details
- * (e.g. All the urls within a site or members of a group) for a
- * site/group. In case of auto-complete, parameter
- * EAHLEAdaptiveAutoComplete as aState should be used.
- *
- * @param aItems Descriptor array containing key items in ranked order
- * Browser - array of URLs
- * Messaging - array of linkIDs
- * Phonebook - array of linkIDs
- * @param aDescription Descriptor array containing names or telephone
- * numbers in ranked order
- * Browser - array of URL names
- * Messaging - array of telephone numbers or
- * e-mail addresses (indirectly thrue phonebook)
- * Phonebook - array of telephone numbers
- * @param aSize Maximum length of returned list
- * @param aMatch
- * Browser - Substring to match beginnings of adaptive list
- * items. Matching is case insensitive.
- * Messaging - default value
- * Phonebook - default value
- * @param aState
- * Browser - Details of adaptive list items - possible
- * values:
- * EAHLEAdaptiveSiteList,
- * EAHLEAdaptiveSiteDetails and
- * EAHLEAdaptiveAutoComplete.
- * Messaging - default value
- * Phonebook - default value
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if size of one of parameters is incorrect.
- */
- virtual TInt AdaptiveListL(
- CDesCArray& aItems,
- CDesCArray& aDescription,
- const TUint aSize,
- const TDesC& aMatch = KAHLENoMatch,
- const TAHLEState aState = EAHLEAdaptiveSiteList) = 0;
-
- /**
- * Get adaptive list asynchronously.
- * Used by Browser, Messaging and Phonebook.
- * For Browser there is an option of selecting sites/groups or details
- * (e.g. All the urls within a site or members of a group) for a
- * site/group. In case of auto-complete, parameter
- * EAHLEAdaptiveAutoComplete as aState should be used.
- *
- * @param aStatus Asynchronous request status.
- * @param aItems Descriptor array containing key items in ranked order
- * Browser - array of URLs
- * Messaging - array of linkIDs
- * Phonebook - array of linkIDs
- * @param aDescription Descriptor array containing names or telephone
- * numbers in ranked order
- * Browser - array of URL names
- * Messaging - array of telephone numbers or
- * e-mail addresses (indirectly thrue phonebook)
- * Phonebook - array of telephone numbers
- * @param aSize Maximum length of returned list
- * @param aMatch
- * Browser - Substring to match beginnings of adaptive list
- * items. Matching is case insensitive.
- * Messaging - default value
- * Phonebook - default value
- * @param aState
- * Browser - Details of adaptive list items - possible
- * values:
- * EAHLEAdaptiveSiteList,
- * EAHLEAdaptiveSiteDetails and
- * EAHLEAdaptiveAutoComplete.
- * Messaging - default value
- * Phonebook - default value
- */
- virtual void AdaptiveListL(
- TRequestStatus& aStatus,
- CDesCArray& aItems,
- CDesCArray& aDescription,
- const TUint aSize,
- const TDesC& aMatch = KAHLENoMatch,
- const TAHLEState aState = EAHLEAdaptiveSiteList) = 0;
-
- /**
- * Remove item synchronously.
- * Used by Browser, Emails, Logs, Messaging, Phonebook
- *
- * @param aItem Item to be removed
- * Browser - a url
- * Emails - an email
- * Logs - a telephone number
- * Messaging - linkID
- * Phonebook - linkID
- * @param aPhoneNumber telephone number to be removed from a contact
- * Browser - defaults to empty string
- * Emails - defaults to empty string
- * Logs - defaults to empty string
- * Messaging - telephone number or e-mail address
- * Phonebook - telephone number
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if size of one of parameters is to long.
- */
- virtual TInt Remove(
- const TDesC& aItem,
- const TDesC& aPhoneNumber = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Remove item asynchronously.
- * Used by Browser, Emails, Logs, Messaging, Phonebook
- *
- * @param aStatus Request status (in asynchronous versions)
- * @param aItem Item to be removed
- * Browser - a url
- * Emails - an email
- * Logs - a telephone number
- * Messaging - linkID
- * Phonebook - linkID
- * @param aPhoneNumber telephone number to be removed from a contact
- * Browser - defaults to empty string
- * Emails - defaults to empty string
- * Logs - defaults to empty string
- * Messaging - telephone number or e-mail address
- * Phonebook - telephone number
- */
- virtual void RemoveL(
- TRequestStatus& aStatus,
- const TDesC& aItem,
- const TDesC& aPhoneNumber = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Remove items synchronously.
- * Used by Browser, Emails, Logs
- *
- * @param aItems Items to be removed
- * Browser - array of urls
- * Emails - array of emails
- * Logs - array of telephone numbers
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if table is empty or one of items in table is
- * empty.
- */
- virtual TInt RemoveL(const CDesCArray& aItems) = 0;
-
- /**
- * Remove items asynchronously.
- * Used by Browser, Emails, Logs
- *
- * @param aStatus Request status
- * @param aItems Items to be removed
- * Browser - array of urls
- * Emails - array of emails
- * Logs - array of telephone numbers
- */
- virtual void RemoveL(
- TRequestStatus& aStatus,
- const CDesCArray& aItems) = 0;
-
-
- /**
- * Remove items synchronously.
- * Used by Messaging, Phonebook
- *
- * @param aItems Array of linkIDs to be removed
- * @param aPhoneNumbers Array of telephone numbers or/and
- * e-mail addresses to be removed
- * from a contact.
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if table is empty or one of items in table is
- * empty.
- */
- virtual TInt RemoveL(
- const CDesCArray& aItems,
- const CDesCArray& aPhoneNumbers) = 0;
-
- /**
- * Remove items asynchronously.
- * Used by Messaging, Phonebook
- *
- * @param aStatus Request status
- * @param aItems Array of linkIDs to be removed
- * @param aPhoneNumbers Array of telephone numbers or/and
- * e-mail addresses to be removed
- */
- virtual void RemoveL(
- TRequestStatus& aStatus,
- const CDesCArray& aItems,
- const CDesCArray& aPhoneNumbers) = 0;
-
- /**
- * Remove matching items synchronously.
- * Used by Browser, Messaging, Phonebook
- *
- * @param aMatch Match for items to be removed.
- * Browser - matching string. Removes all items that match
- * the given string. Matching is case sensitive.
- * Messaging - linkID. Removes all items corresponding to
- * the linkID
- * Phonebook - linkID. Removes all items corresponding to
- * the linkID
- * @returns The number of removed items, or otherwise an error code.
- * Returns KErrInUse if AHLE server is busy (e.g. reading or
- * writing file) and KErrArgument if match is to long.
- */
- virtual TInt RemoveMatching(const TDesC& aMatch) = 0;
-
- /**
- * Remove matching items asynchronously.
- * Used by Browser, Messaging, Phonebook
- *
- * @param aStatus Request status
- * @param aMatch Match for items to be removed.
- * Browser - matching string. Removes all items that match
- * the given string. Matching is case sensitive.
- * Messaging - linkID. Removes all items corresponding to
- * the linkID
- * Phonebook - linkID. Removes all items corresponding to
- * the linkID
- */
- virtual void RemoveMatchingL(
- TRequestStatus& aStatus,
- const TDesC& aMatch) = 0;
-
- /**
- * Rename item synchronously
- * Used by Browser, Messaging, Phonebook
- *
- * @param aItem Item to be renamed
- * Browser - a url
- * Messaging - linkID
- * Phonebook - linkID
- * @param aNewDescription New description.
- * Browser - new name of url
- * Messaging - new telephone number or e-mail address
- * Phonebook - new telephone number
- * @param aDescription Description to be renamed.
- * Browser - defaults to empty string
- * Messaging - old telephone number or e-mail address
- * Phonebook - old telephone number
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if size of one of parameters is to long.
- */
- virtual TInt RenameL(
- const TDesC& aItem,
- const TDesC& aNewDescription,
- const TDesC& aDescription = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Rename item asynchronously
- * Used by Browser, Messaging, Phonebook
- *
- * @param aStatus Request status
- * @param aItem Item to be renamed
- * Browser - a url
- * Messaging - linkID
- * Phonebook - linkID
- * @param aNewDescription New description.
- * Browser - new name of url
- * Messaging - new telephone number or e-mail address
- * Phonebook - new telephone number
- * @param aDescription Description to be renamed.
- * Browser - defaults to empty string
- * Messaging - old telephone number or e-mail address
- * Phonebook - old telephone number
- */
- virtual void RenameL(
- TRequestStatus& aStatus,
- const TDesC& aItem,
- const TDesC& aNewDescription,
- const TDesC& aDescription = KAHLEItemDefaultDescription) = 0;
-
- /**
- * Clear all adaptive list items synchronously
- *
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual TInt Clear() = 0;
-
- /**
- * Clear all adaptive list items asynchronously
- *
- * @param aStatus Request status
- */
- virtual void Clear(TRequestStatus& aStatus) = 0;
-
- /**
- * Flush cached items to persistent storage synchronously
- *
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual TInt Flush() = 0;
-
- /**
- * Flush cached items to persistent storage asynchronously
- *
- * @param aStatus Request status
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual void Flush(TRequestStatus& aStatus) = 0;
- };
-
-#include "ahlededicatedapi.inl"
-
-/**
-* AHLE Client API constructor
-* @param aClientType AHLE client type
-* @return MAHLEDedicatedAPI pointer to AHLE Client API
-*/
-IMPORT_C MAHLEDedicatedAPI* NewAHLEClientL(TAHLEClientType aClientType);
-
-#endif // MAHLEDEDICATEDAPI_H
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_api/inc/ahlededicatedapi.inl Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: AHLE dedicated API inline destructor
-*
-*/
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// MAHLEDedicatedAPI::~MAHLEDedicatedAPI
-// Virtual destructor.
-// -----------------------------------------------------------------------------
-//
-inline MAHLEDedicatedAPI::~MAHLEDedicatedAPI()
- {
- }
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_api/inc/ahlegenericapi.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: API ddefinition for generic clients and SDK.
-*
-*/
-
-#ifndef MAHLEGENERICAPI_H
-#define MAHLEGENERICAPI_H
-
-#include <badesca.h>
-#include <ahlegeneric.h>
-
-class MAHLEObserver;
-
-class MAHLEGenericAPI
- {
- public:
-
- /**
- * Destructor.
- */
- inline virtual ~MAHLEGenericAPI();
-
- /**
- * Check if the client has been connected to the server
- *
- * @return ETrue if connected, otherwise EFalse
- */
- virtual TBool IsConnected() = 0;
-
- /**
- * Set client observer
- *
- * @param aObserver client observer
- */
- virtual void SetObserverL(const MAHLEObserver* aObserver) = 0;
-
- /**
- * Cancel client observer
- */
- virtual void CancelObserver() = 0;
-
- /**
- * Engine reconfiguration.
- * New storage sizes have to be explicitly specified.
- *
- * @param aPrimarySize New primary storage size.
- * @param aSecondarySize New secondary storage size.
- * @param aAdaptationSpeed New adaptation speed.
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if one of parameters is out of range.
- */
- virtual TInt Reconfigure(
- TUint aPrimarySize,
- TUint aSecondarySize,
- TReal32 aAdaptationSpeed) = 0;
-
- /**
- * Current engine configuration.
- *
- * @param aPrimarySize Current primary storage size.
- * @param aSecondarySize Current secondary storage size.
- * @param aAdaptationSpeed Current adaptation speed.
- */
- virtual TInt GetConfiguration(
- TUint& aPrimarySize,
- TUint& aSecondarySize,
- TReal32& aAdaptationSpeed) = 0;
-
- /**
- * Logging new access synchronously.
- *
- * @param aItem Access descriptor, key value in adaptive list
- * @param aName Name descriptor (defaults to empty string).
- * @param aWeight Weight of an item (defaults to 1).
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is in use (e.g. reading or writing file) and
- * KErrArgument if size of one of parameters is out of range.
- */
- virtual TInt NewAccess(
- const TDesC& aItem,
- const TDesC& aName = KAHLEItemDefaultName,
- TReal32 aWeight = KAHLEDefaultWeight) = 0;
-
- /**
- * Logging new access asynchronously.
- *
- * @param aStatus Asychronous request status.
- * @param aItem Access descriptor, key value in adaptive list
- * @param aName Name descriptor (defaults to empty string).
- * @param aWeight Weight of an item (defaults to 1).
- */
- virtual void NewAccessL(
- TRequestStatus& aStatus,
- const TDesC& aItem,
- const TDesC& aName = KAHLEItemDefaultName,
- TReal32 aWeight = KAHLEDefaultWeight) = 0;
-
- /**
- * Get adaptive list synchronously.
- *
- * @param aItems Descriptor array containing items in ranked order.
- * @param aNames Descriptor array containing aItems names
- * @param aSize Maximum length of returned list
- * @param aMatch Substring to match beginnings of adaptive list items
- * (optional, default is to match everything). Matching is case
- * sensitive.
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if aMatch is to long.
- */
- virtual TInt AdaptiveListL(
- CDesCArray& aItems,
- CDesCArray& aNames,
- const TUint aSize,
- const TDesC& aMatch = KAHLENoMatch) = 0;
-
- /**
- * Get adaptive list asynchronously.
- *
- * @param aStatus Asynchronous request status.
- * @param aItems Descriptor array containing items in ranked order.
- * @param aNames Descriptor array containing aItems names
- * @param aSize Maximum length of returned list
- * @param aMatch Substring to match beginnings of adaptive list items
- * (optional, default is to match everything). Matching is case
- * sensitive.
- */
- virtual void AdaptiveListL(
- TRequestStatus& aStatus,
- CDesCArray& aItems,
- CDesCArray& aNames,
- const TUint aSize,
- const TDesC& aMatch = KAHLENoMatch) = 0;
-
- /**
- * Remove item synchronously.
- *
- * @param aItem Item to be removed
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file)
- * and KErrArgument if size of parameter is out of range.
- */
- virtual TInt Remove(const TDesC& aItem) = 0;
-
- /**
- * Remove item asynchronously.
- *
- * @param aStatus Request status (in asynchronous versions)
- * @param aItem Item to be removed
- */
- virtual void RemoveL(TRequestStatus& aStatus, const TDesC& aItem) = 0;
-
- /**
- * Remove items synchronously.
- *
- * @param aItems Items to be removed
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file) and
- * KErrArgument if table is empty or one of items in table is
- * empty.
- */
- virtual TInt RemoveL(const CDesCArray& aItems) = 0;
-
- /**
- * Remove items asynchronously.
- *
- * @param aStatus Request status
- * @param aItems Items to be removed
- */
- virtual void RemoveL(
- TRequestStatus& aStatus,
- const CDesCArray& aItems) = 0;
-
- /**
- * Remove matching items synchronously.
- *
- * @param aMatch Match for items to be removed. Matching is case
- * sensitive.
- * @returns The number of removed items, or otherwise an error code.
- * Returns KErrInUse if AHLE server is busy (e.g. reading or
- * writing file) and KErrArgument if match is to long.
- */
- virtual TInt RemoveMatching(const TDesC& aMatch) = 0;
-
- /**
- * Remove matching items asynchronously.
- *
- * @param aStatus Request status
- * @param aMatch Match for items to be removed. Matching is case
- * sensitive.
- */
- virtual void RemoveMatchingL(
- TRequestStatus& aStatus,
- const TDesC& aMatch) = 0;
-
- /**
- * Rename item synchronously
- *
- * @param aItem Item to be renamed
- * @param aNewName New name for the item.
- * @returns KErrNone if ok, otherwise an error code. Returns KErrInUse
- * if AHLE server is busy (e.g. reading or writing file)
- * and KErrArgument if size of one of parameters is to long.
- */
- virtual TInt RenameL(const TDesC& aItem, const TDesC& aNewName) = 0;
-
- /**
- * Rename item asynchronously
- *
- * @param aItem Item to be renamed
- * @param aNewName New name for the item.
- */
- virtual void RenameL(
- TRequestStatus& aStatus,
- const TDesC& aItem,
- const TDesC& aNewName) = 0;
-
- /**
- * Clear all adaptive list items synchronously
- *
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual TInt Clear() = 0;
-
- /**
- * Clear all adaptive list items asynchronously
- *
- * @param aStatus Request status
- */
- virtual void Clear(TRequestStatus& aStatus) = 0;
-
- /**
- * Flush cached items to persistent storage synchronously
- *
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual TInt Flush() = 0;
-
- /**
- * Flush cached items to persistent storage asynchronously
- *
- * @param aStatus Request status
- * @returns KErrNone if ok, otherwise an error code.
- * Returns KErrInUse if AHLE server is busy
- * (e.g. reading or writing file).
- */
- virtual void Flush(TRequestStatus& aStatus) = 0;
-
- /**
- * Sorts items by their weights.
- * @param aItems Descriptor array containing items to be sorted.
- * @param aItemsSorted Array containing those indexes of items from
- * aItems array that are also found from Adaptive History List
- * Engine ordered by their weight
- * (in Adaptive History List Engine).
- * @param aSortOrder Sorting items order (ascending or descending)
- * @return KErrNone if ok, otherwise an error code.
- */
- virtual TInt OrderByWeightL(
- const CDesCArray& aItems,
- RArray<TInt>& aItemsSorted,
- TAHLESortOrder aSortOrder = EAHLEAscending) = 0;
- };
-
-#include <ahlegenericapi.inl>
-
-/**
-* AHLE Client API constructor
-* @param aDatabaseName Name of the database.
-* @return MAHLEGenericAPI pointer to AHLE Client API
-*/
-IMPORT_C MAHLEGenericAPI* NewAHLEClientL(const TDesC& aDatabaseName);
-
-#endif // MAHLEGENERICAPI_H
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_api/inc/ahlegenericapi.inl Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: AHLE generic API inline destructor
-*
-*/
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// MAHLEGenericAPI::~MAHLEGenericAPI
-// Virtual destructor.
-// -----------------------------------------------------------------------------
-//
-inline MAHLEGenericAPI::~MAHLEGenericAPI()
- {
- }
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_api/inc/ahleobserver.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Interface for AHLE engine observer class.
-*
-*/
-
-#ifndef MAHLEOBSERVER_H
-#define MAHLEOBSERVER_H
-
-#include "e32def.h"
-
-/**
-* Interface for AHLE engine observer class.
-*
-* @lib AHLE2CLIENT.dll
-* @since Series 60 3.1
-*/
-class MAHLEObserver
- {
- public:
-
- /**
- * Observer method invoked when primary storage is changed.
- *
- * @param anError KErrNone if ok, otherwise an other error code.
- */
- virtual void AdaptiveListChanged(const TInt aError) = 0;
- };
-
-#endif // MAHLEOBSERVER_H
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_session_api/adaptive_history_list_session_api.metaxml Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="9a9b610faafbea8dbb06dfd3dd620c02" dataversion="1.0">
- <name>Adaptive History List Session API</name>
- <description></description>
- <type>c++</type>
- <subsystem>ahle</subsystem>
- <libs>
- </libs>
- <release category="domain"/>
- <attributes>
- <!-- This indicates wether the api provedes separate html documentation -->
- <!-- or is the additional documentation generated from headers. -->
- <!-- If you are unsuere then the value is "no" -->
- <htmldocprovided>yes</htmldocprovided>
- <adaptation>no</adaptation>
- </attributes>
-</api>
--- a/remotemgmt_plat/adaptive_history_list_session_api/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2006 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: File that exports the files belonging to
-: Adaptive History List Session API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/ahlegeneric.h MW_LAYER_PLATFORM_EXPORT_PATH(ahlegeneric.h)
-../inc/ahlededicated.h MW_LAYER_PLATFORM_EXPORT_PATH(ahlededicated.h)
--- a/remotemgmt_plat/adaptive_history_list_session_api/inc/ahlededicated.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Common definitions for dedicated clients.
-*
-*/
-
-#ifndef AHLEDEDICATED_H
-#define AHLEDEDICATED_H
-
-#include <e32def.h>
-#include <e32cmn.h>
-#include "ahlegeneric.h"
-
-_LIT(KAHLEItemDefaultDescription, "");
-
-enum TAHLEClientType
-{
- EAHLEGeneric,
- EAHLEBrowser,
- EAHLEPhonebook,
- EAHLEMessaging,
- EAHLELogs,
- EAHLEEmail
-};
-
-enum TAHLEState
-{
- EAHLEAdaptiveSiteList,
- EAHLEAdaptiveSiteDetails,
- EAHLEAdaptiveAutoComplete
-};
-
-
-#endif // AHLEDEDICATED_H
-
-// End of File
--- a/remotemgmt_plat/adaptive_history_list_session_api/inc/ahlegeneric.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2002-2005 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: Common definitions for generic clients.
-*
-*/
-
-#ifndef AHLEGENERIC_H
-#define AHLEGENERIC_H
-
-_LIT(KAHLEItemDefaultName, "");
-_LIT(KAHLENoMatch, "");
-
-const TUint KAHLEMaxItemLength = 1024;
-const TUint KAHLEMaxDescriptionLength = 256;
-
-const static TReal32 KAHLEDefaultWeight = 1;
-
-enum TAHLESortOrder
- {
- EAHLEAscending,
- EAHLEDescending
- };
-
-#endif // AHLEGENERIC_H
-
-// End of File
--- a/remotemgmt_plat/dcmo_adapter_api/inc/DcmoConst.h Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/dcmo_adapter_api/inc/DcmoConst.h Wed Oct 13 15:30:06 2010 +0300
@@ -51,22 +51,4 @@
EDcmoUnknown
};
-
-enum TLawMoStatus
-{
- ELawMoSuccess,
- ELawMoOk,
- ELawMoFail,
- ELawMoFullyLockFailed,
- ELawMoPartialLockFailed,
- ELawMoUnlockFailed,
- ELawMoWipeSuccess,
- ELawMoWipeFailed,
- ELawMoWipeNotPerformed,
- ELawMoUserCancelled,
- ELawMoAccepted,
- ELawMoInvalid,
- ELawMoUnknown
-};
-
#endif// __DCMOCONST_H__
--- a/remotemgmt_plat/dcmo_control_api/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/dcmo_control_api/group/bld.inf Wed Oct 13 15:30:06 2010 +0300
@@ -25,5 +25,4 @@
PRJ_EXPORTS
../inc/dcmoClientBase.h MW_LAYER_PLATFORM_EXPORT_PATH(dcmoclientbase.h)
-../inc/dcmoClient.h MW_LAYER_PLATFORM_EXPORT_PATH(dcmoclient.h)
-../inc/lawmoclient.h MW_LAYER_PLATFORM_EXPORT_PATH(lawmoclient.h)
\ No newline at end of file
+../inc/dcmoClient.h MW_LAYER_PLATFORM_EXPORT_PATH(dcmoclient.h)
--- a/remotemgmt_plat/dcmo_control_api/inc/lawmoclient.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2009 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: header file for lawmo Client
-*
-*/
-
-#ifndef __LAWMOCLIENT_H__
-#define __LAWMOCLIENT_H__
-
-
-#include <e32base.h>
-#include <f32file.h>
-#include <dcmoconst.h>
-
-// needed for creating server thread.
-
-class RLawmoClient : public RSessionBase
- {
-public:
-
- /**
- * connects to DCMOServer
- * @param None
- * @return KErrNone Symbian error code
- */
- IMPORT_C TInt Connect();
- /**
- * Close server connection
- * @param None
- * @return None
- */
- IMPORT_C void Close();
- /**
- * Wipe the contents of the Device
- * @param None
- * @return None
- */
- IMPORT_C TLawMoStatus DeviceWipe();
-
- /**
- * Wipe All the contents in the Device
- * @param None
- * @return None
- */
- IMPORT_C TLawMoStatus DeviceWipeAll( );
-
- /**
- /*Fetches the ListItemName of the lawmo node
- * @param ItemName - Node on which this fetch is initiated
- * @param NodeValue- List Item name value
- * @return Symbian error code
- */
- IMPORT_C TInt GetListItemName( TDes& aItemName, TDes& aNodeValue);
-
- /**
- /*Fetches the tobewiped of the lawmo node
- * @param ItemName - Node on which this fetch is initiated
- * @param NodeValue- List Item name value
- * @return Symbian error code
- */
- IMPORT_C TInt GetToBeWipedValue( TDes& aItemName, TBool& aWipeVal);
-
- /**
- /*Sets the wipe value for the lawmo node
- * @param ItemName - Node on which this operation is initiated
- * @param NodeValue- wipe value
- * @return Symbian error code
- */
- IMPORT_C TInt SetToBeWipedValue( TDes& aItemName, TInt aWipeVal );
-
-private:
-
- };
-
-#endif // __LAWMOCLIENT_H__
--- a/remotemgmt_plat/device_management_parameter_api/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/device_management_parameter_api/group/bld.inf Wed Oct 13 15:30:06 2010 +0300
@@ -25,4 +25,3 @@
PRJ_EXPORTS
../inc/DevManInternalCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(DevManInternalCRKeys.h)
-../inc/lawmoadaptercrkeys.h MW_LAYER_PLATFORM_EXPORT_PATH(lawmoadaptercrkeys.h)
\ No newline at end of file
--- a/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/device_management_parameter_api/inc/DevManInternalCRKeys.h Wed Oct 13 15:30:06 2010 +0300
@@ -166,15 +166,6 @@
*/
const TUint32 KNSmlDMSCOMOTargetRef = 0x00000012;
-const TUint32 KLAWMOPhoneLock = 0x00000013;
-
-const TUint32 KLAWMOfactoryDmProfileID = 0x00000014;
-
-const TUint32 KMaxFactoryDMProfileId = 0x00000015;
-
-const TUint32 KLAWMOfactoryDmServerName = 0x00000016;
-
-const TUint32 KLAWMOfactoryDmServerID = 0x00000017;
#endif // SYNCML_DEVMAN_INTERNAL_CR_KEYS_H
--- a/remotemgmt_plat/device_management_parameter_api/inc/lawmoadaptercrkeys.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Name : LawmoadapterCRKeys.h
-* Part of : Lawmoadapter
-*
-* Copyright (c) 2009 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: Implementation of dm adapters
-* This is part of omadmextensions.
-*
-*/
-
-#ifndef LAWMOADAPTERCRKEYS_H
-#define LAWMOADAPTERCRKEYS_H
-
-// CONSTANTS
-
-// key uid
-const TUid KCRUidLawmoAdapter = {0x2002EA22};
-
-// State of Lawmo Adapter
-const TUint32 KLawmoRootNode = 0x00000001;
-const TUint32 KLawmoCorrelator = 0x00000002;
-const TUint32 KLawmoWipeStatus = 0x00000003;
-const TUint32 KLawmoSourceURI = 0x00000004;
-const TUint32 KLawmoSyncRetVal = 0x00000005;
-
-#endif // LawmoADAPTERCRKEYS_H
-
-// End of File
--- a/remotemgmt_plat/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/group/bld.inf Wed Oct 13 15:30:06 2010 +0300
@@ -46,8 +46,6 @@
#include "../diagnostics_framework_api/group/bld.inf"
#include "../diagnostics_results_api/group/bld.inf"
#include "../diagnostics_plugin_pool_api/group/bld.inf"
-#include "../adaptive_history_list_api/group/bld.inf"
-#include "../adaptive_history_list_session_api/group/bld.inf"
#include "../fota_engine_api/group/bld.inf"
#include "../update_package_storage_plugin_api/group/bld.inf"
#include "../syncml_notifier_roaming_api/group/bld.inf"
@@ -58,4 +56,3 @@
#include "../dm_native_notifier_api/group/bld.inf"
#include "../syncml_ds_customization_api/group/bld.inf"
#include "../syncml_ds_error_reporting_api/group/bld.inf"
-#include "../lawmo_plugin_api/group/bld.inf"
--- a/remotemgmt_plat/lawmo_plugin_api/group/bld.inf Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2009 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: File that exports the files belonging to
-: LAWMO Plugin API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/lawmointerface.h MW_LAYER_PLATFORM_EXPORT_PATH(lawmointerface.h)
-../inc/lawmointerface.inl MW_LAYER_PLATFORM_EXPORT_PATH(lawmointerface.inl)
-../inc/lawmocallbackinterface.h MW_LAYER_PLATFORM_EXPORT_PATH(lawmocallbackinterface.h)
--- a/remotemgmt_plat/lawmo_plugin_api/inc/lawmocallbackinterface.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 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: LAWMO CallBack Interface definition
-*
-*/
-
-#ifndef _MLAWMOCALLBACKINTERFACE_H__
-#define _MLAWMOCALLBACKINTERFACE_H__
-
-#include <e32base.h>
-
-class MLawmoPluginWipeObserver
- {
-public:
-
- /**
- * Called to notify the observer that the wipe call has been completed
- * by the Plugin at hand.
- * @param aSession session
- * @param aError <code>KErrNone</code>, if opening the session succeeded;
- * or one of the system-wide error codes, if opening the
- * session failed
- */
- virtual void HandleWipeCompleted(TInt status)= 0;
-
- };
-
-#endif // _MLAWMOCALLBACKINTERFACE_H__
-
--- a/remotemgmt_plat/lawmo_plugin_api/inc/lawmointerface.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2009 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: LAWMO Plugin Interface definition
-*
-*/
-
-#ifndef _MLAWMOPLUGININTERFACE_H__
-#define _MLAWMOPLUGININTERFACE_H__
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#include <lawmocallbackinterface.h>
-
-// UID of this interface
-const TUid KLAWMOPluginInterfaceUid = {0x2002EA1F};
-
-/**
- An LAWMO abstract class being representative of the
- concrete class which the client wishes to use.
-
- It acts as a base, for a real class to provide all the
- functionality that a client requires.
- It supplies instantiation & destruction by using
- the ECom framework, and functional services
- by using the methods of the actual class.
- */
-
-
-class MLAWMOPluginInterface
- {
-public:
-
- virtual void WipeL() = 0;
- };
-
-class CLAWMOPluginInterface : public CBase, public MLAWMOPluginInterface
- {
-public:
- // Instantiates an object of this type
- /**
- * Create instance of CLAWMOPluginInterface
- * @param aUid , implementation Uid
- * @return Instance of CLAWMOPluginInterface
- */
- static CLAWMOPluginInterface* NewL(TUid aUid, MLawmoPluginWipeObserver* aObserver);
- /**
- * C++ Destructor
- */
- virtual ~CLAWMOPluginInterface();
-
-private:
- // Unique instance identifier key
- TUid iDtor_ID_Key;
-
- };
-
-#include "lawmointerface.inl"
-
-#endif // _MLAWMOPLUGININTERFACE_H__
-
--- a/remotemgmt_plat/lawmo_plugin_api/inc/lawmointerface.inl Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2009 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: LAWMO Interface
-*
-*/
-
-/**
- * C++ Destructor
- */
-inline CLAWMOPluginInterface::~CLAWMOPluginInterface()
- {
- // Destroy any instance variables and then
- // inform the framework that this specific
- // instance of the interface has been destroyed.
- REComSession::DestroyedImplementation(iDtor_ID_Key);
- }
-
-/**
- * Create instance of CLAWMOPluginInterface
- * @param aUid , implementation Uid
- * @return Instance of CLAWMOPluginInterface
- */
-inline CLAWMOPluginInterface* CLAWMOPluginInterface::NewL(TUid aUid, MLawmoPluginWipeObserver* aObserver)
- {
- TAny* ptr = REComSession::CreateImplementationL( aUid, _FOFF(CLAWMOPluginInterface, iDtor_ID_Key), aObserver);
- CLAWMOPluginInterface* self = reinterpret_cast<CLAWMOPluginInterface*>( ptr );
- return self;
- }
-//
\ No newline at end of file
--- a/remotemgmt_plat/scp_server_api/inc/SCPClient.h Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/scp_server_api/inc/SCPClient.h Wed Oct 13 15:30:06 2010 +0300
@@ -269,7 +269,10 @@
* Fetch the limit-values for code length
*/
void FetchLimits( TInt& aMin, TInt& aMax );
- void InformAutolockTask();
+ /**
+ * Inform the autolock to unlock the screen
+ */
+ void InformAutolockTask();
TBool isFlagEnabled;
};
--- a/remotemgmt_plat/syncml_client_api/inc/SyncMLErr.h Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/syncml_client_api/inc/SyncMLErr.h Wed Oct 13 15:30:06 2010 +0300
@@ -121,11 +121,6 @@
const TInt KErrGeneral = KErrSyncEngineErrorBase - 94;
- /* Implementation of CMCC PIM v3 begins*/
- /** Server is full - CMCC PIM v3 specific*/
- const TInt KErrServerFull = KErrSyncEngineErrorBase - 95;
- /* Implementation of CMCC PIM v3 ends*/
-
/** Base value for push message parser-related errors. */
const TInt KErrPushMessageParserErrorBase = -8451; // 8451 - 8480
/** Push message is too short. */
--- a/remotemgmt_plat/terminal_security_device_lock_api/inc/TerminalControl3rdPartyAPI.h Wed Sep 15 13:08:27 2010 +0300
+++ b/remotemgmt_plat/terminal_security_device_lock_api/inc/TerminalControl3rdPartyAPI.h Wed Oct 13 15:30:06 2010 +0300
@@ -148,22 +148,6 @@
IMPORT_C TInt GetDeviceLockParameter(TInt aType, TDes8& aData);
- /**
- ResetDeviceLockParameters
-
- The function resets the Terminal Security parameters that were set by the calling application
- (by earlier calls to SetDeviceLockParameter())
-
- NOTE:
- > The function resets only those parameters that the calling function had set. Parameters
- not set by the calling application are not affected.
-
- > Calls to this function will not reset value of EPasscode. Device Lock Code will not be reset
-
- @param none
- @return KErrNone Symbian error code
- */
- IMPORT_C TInt ResetDeviceLockParameters();
};
#endif //__TERMINALCONTROL3RDPARTYAPI_H__
\ No newline at end of file
--- a/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/alertqueue/bld/NSmlAlertQueue.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -65,7 +65,7 @@
LIBRARY euser.lib estor.lib bafl.lib efsrv.lib nsmlwbxml.lib
LIBRARY nsmlhistorylog.lib
-LIBRARY NSmlDSSettings.lib
+LIBRARY nsmldssettings.lib
LIBRARY nsmldmsettings.lib
LIBRARY nsmldshostclient.lib
LIBRARY nsmlagentcommon.lib
--- a/syncmlfw/common/alertqueue/src/NSmlDSAlertParser11.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/alertqueue/src/NSmlDSAlertParser11.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -24,7 +24,7 @@
#include <barsc.h>
#include <s32mem.h>
#include <data_caging_path_literals.hrh>
-#include <nsmldstypesres.rsg>
+#include <NSmlDSTypesRes.rsg>
#include <nsmlconstants.h>
#include <nsmlunicodeconverter.h>
--- a/syncmlfw/common/alertqueue/src/NSmlDSAlertParser12.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/alertqueue/src/NSmlDSAlertParser12.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -20,7 +20,7 @@
#include <barsread.h>
#include <barsc.h>
#include <s32mem.h>
-#include <nsmldstypesres.rsg>
+#include <NSmlDSTypesRes.rsg>
#include <data_caging_path_literals.hrh>
#include <nsmlconstants.h>
--- a/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/obex/obexdmplugin/bld/nsmlobexdmplugin.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -77,7 +77,7 @@
LIBRARY nsmlobexcommserver.lib
LIBRARY ecom.lib
LIBRARY nsmlxml.lib
-LIBRARY NSmlPrivateAPI.lib
+LIBRARY nsmlprivateapi.lib
--- a/syncmlfw/common/sosserver/bld/nsmlsosserver.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/sosserver/bld/nsmlsosserver.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -74,7 +74,7 @@
SOURCE NSmlJobObject.cpp
LIBRARY euser.lib estor.lib ecom.lib bafl.lib efsrv.lib nsmldebug.lib edbms.lib
-LIBRARY NSmlDSSettings.lib
+LIBRARY nsmldssettings.lib
LIBRARY nsmldmsettings.lib
LIBRARY nsmltransport.lib
LIBRARY nsmltransporthandler.lib
--- a/syncmlfw/common/sosserver/inc/nsmlsosthread.h Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/sosserver/inc/nsmlsosthread.h Wed Oct 13 15:30:06 2010 +0300
@@ -128,8 +128,6 @@
CNSmlDMAgent* iDMAgent;
CNSmlDSAgent* iDSAgent;
CNSmlCancelTimeOut* iCancelTimeout;
- // Fix for cancel not happening when cancel key is pressed
- TBool iSyncCancelled;
};
--- a/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/sosserver/src/nsmlsosthread.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -147,9 +147,7 @@
FeatureManager::InitializeLibL();
iThreadParams.iThreadEngine = this;
iContentArray = new(ELeave) CArrayFixFlat<TNSmlContentSpecificSyncType>(1);
- // Fix for cancel not happening when cancel key is
- // pressed .
- iSyncCancelled = EFalse;
+
if ( iThreadParams.iCSArray )
{
for (TInt i = 0; i < iThreadParams.iCSArray->Count(); i++)
@@ -339,63 +337,11 @@
TInt status( KErrNone );
if ( iThreadParams.iCurrentJob.UsageType() == ESmlDevMan )
{
- CRepository* centrep = NULL;
- TRAPD( err, centrep = CRepository::NewL(KCRUidDeviceManagementInternalKeys));
- TInt phoneLock(0);
- TInt factoryProfileID(0);
- if (err==KErrNone )
- {
- TInt err = centrep->Get( KLAWMOPhoneLock , phoneLock );
- err = centrep->Get( KLAWMOfactoryDmProfileID , factoryProfileID );
- delete centrep;
- centrep = NULL;
- }
- if(phoneLock != 30)
- {
- _DBG_FILE("CNSmlThreadEngine phonelock != 30");
- if(factoryProfileID>0)
- {
-
- TInt profileId = iThreadParams.iCurrentJob.ProfileId();
-
- if(profileId!= factoryProfileID)
- {
- _DBG_FILE("CNSmlThreadEngine profid doesnt match with factory");
- TRequestStatus* stat = &iStatus;
- User::RequestComplete( stat, KErrNone );
- return;
- }
-
- }
- else
- {
- _DBG_FILE("CNSmlThreadEngine factoryprofileid<0");
- TRequestStatus* stat = &iStatus;
- User::RequestComplete( stat, KErrNone );
- return;
- }
- }
- _DBG_FILE("CNSmlThreadEngine startDMSessionL");
TRAP( status, StartDMSessionL() );
}
else
{
- // Scenario 1:
- // Fix for cancel not happening when cancel key is
- // pressed .
- if(!iSyncCancelled)
- {
- TRAP( status, StartDSSessionL() );
- }
- else
- {
- // Sync is cancelled from the UI before the
- // the job session has started.
- // Fix for cancel not happening when cancel key is
- // pressed .
- status = KErrCancel;
- iSyncCancelled = EFalse;
- }
+ TRAP( status, StartDSSessionL() );
}
if ( status != KErrNone )
@@ -413,11 +359,6 @@
//
void CNSmlThreadEngine::CancelJob()
{
- // Fix for cancel not happening when cancel key is
- // pressed .
- // job has been created but it is not running and from ui
- // Cancel has been called
- iSyncCancelled = ETrue;
if ( iCancelTimeout )
{
iCancelTimeout->SetJobCancelled( iThreadParams.iCurrentJob.UsageType() );
@@ -468,15 +409,7 @@
// Select correct sync method and start sync
TNSmlSyncInitiation syncInit = (TNSmlSyncInitiation)iThreadParams.iSyncInit;
- // Scenario 2:
- // Fix for cancel not happening when cancel key is
- // pressed .
- if(iSyncCancelled)
- {
- iSyncCancelled = EFalse;
- User::Leave( KErrCancel );
- }
-
+
switch ( iThreadParams.iCurrentJob.JobType() )
{
case EDSJobProfile:
--- a/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/sosserver_clientapi/bld/NSmlClientAPI.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -68,7 +68,7 @@
SYSTEMINCLUDE /epoc32/include/http
SYSTEMINCLUDE /epoc32/include/libc
-LIBRARY euser.lib estor.lib featmgr.lib bafl.lib
+LIBRARY euser.lib estor.lib FeatMgr.lib bafl.lib
LIBRARY eikcore.lib efsrv.lib ecom.lib
LIBRARY nsmltransporthandler.lib
LIBRARY nsmldebug.lib
--- a/syncmlfw/common/sosserver_transporthandler/src/NSmlTransportHandler.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/sosserver_transporthandler/src/NSmlTransportHandler.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -24,7 +24,7 @@
#include <f32file.h>
#include <SyncMLTransportProperties.h>
#include <data_caging_path_literals.hrh>
-#include <nsmltransport.rsg>
+#include <NSmlTransport.rsg>
#include <nsmlconstants.h>
#include "NSmlTransportHandler.h"
--- a/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/syncagent/bld/NSmlAgentCommon.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -79,7 +79,7 @@
LIBRARY inetprotutil.lib
#ifdef ARMCC
-LIBRARY ecom.lib
+LIBRARY ECOM.LIB
#endif
//RD_AUTO_RESTART
LIBRARY commdb.lib
--- a/syncmlfw/common/transport/bld/nsmltransport.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/transport/bld/nsmltransport.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -47,17 +47,17 @@
USERINCLUDE ../inc ../../http/inc ../../inc ../../wbxml/inc ../../wbxml/inc/syncml ../../syncagent/inc ../../debug/inc
USERINCLUDE ../../obex/obexcommserver/inc ../../obex/obexserverbinding/inc ../../obex/obexclient/inc
-LIBRARY euser.lib
+LIBRARY euser.lib
LIBRARY bluetooth.lib
LIBRARY nsmldebug.lib
-LIBRARY CommonEngine.lib // 1.2 CHANGES: Offline mode
-LIBRARY commdb.lib
-LIBRARY apengine.lib
-LIBRARY centralrepository.lib
-LIBRARY featmgr.lib
+LIBRARY commonengine.lib // 1.2 CHANGES: Offline mode
+LIBRARY commdb.lib
+LIBRARY apengine.lib
+LIBRARY CENTRALREPOSITORY.LIB
+LIBRARY FeatMgr.lib
#ifdef ARMCC
-LIBRARY ecom.lib
+LIBRARY ECOM.LIB
#endif
SMPSAFE
--- a/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/wbxml/bld/nsmlwbxml.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -70,7 +70,7 @@
LIBRARY euser.lib estor.lib
#ifdef ARMCC
-LIBRARY ecom.lib
+LIBRARY ECOM.LIB
#endif
SMPSAFE
--- a/syncmlfw/common/xml/bld/nsmlxml.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/common/xml/bld/nsmlxml.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -64,7 +64,7 @@
LIBRARY nsmlwbxml.lib euser.lib estor.lib
#ifdef ARMCC
-LIBRARY ecom.lib
+LIBRARY ECOM.LIB
#endif
SMPSAFE
Binary file syncmlfw/conf/devman.confml has changed
Binary file syncmlfw/conf/devman_101F9A0A.crml has changed
--- a/syncmlfw/dm/adapters/inc/nsmldmimpluids.h Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/adapters/inc/nsmldmimpluids.h Wed Oct 13 15:30:06 2010 +0300
@@ -39,5 +39,4 @@
const TUint KNSmlDMFotaAdapterImplUid = 0x101F9A09;
const TUint KNSmlDMAMAdapterImplUid = 0x20021336;
const TUint KNSmlDMConnMOAdapterImplUid = 0x2001FE5F;
-const TUint KNSmlDMLawMoAdapterImplUid = 0x2002EA23;
#endif // __CNSMLDMIMPLUIDS_H__
--- a/syncmlfw/dm/hostserver/dmhostservers/bld/nsmldmhostserver1.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/hostserver/dmhostservers/bld/nsmldmhostserver1.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -22,7 +22,7 @@
CAPABILITY CAP_GENERAL_DLL -DRM
EPOCHEAPSIZE 0x500 0x400000 // minimum and maximum heap sizes
-EPOCSTACKSIZE 0x3000
+EPOCSTACKSIZE 0x5000
VENDORID VID_DEFAULT
UID 0 0x101F9A02
TARGET nsmldmhostserver1.exe
--- a/syncmlfw/dm/provisioningadapter/bld/NSmlDmProvisioningAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/provisioningadapter/bld/NSmlDmProvisioningAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -50,7 +50,7 @@
LIBRARY euser.lib commdb.lib charconv.lib bafl.lib efsrv.lib apengine.lib
-LIBRARY nsmldebug.lib syncmlclientapi.lib NSmlPrivateAPI.lib
+LIBRARY nsmldebug.lib syncmlclientapi.lib nsmlprivateapi.lib
LIBRARY provisioningengine.lib featmgr.lib centralrepository.lib
#ifdef ARMCC
--- a/syncmlfw/dm/provisioningadapter/inc/ProvisioningInternalCRKeys.h Wed Sep 15 13:08:27 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2004 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: Provisioning internal Central Repository keys
-*
-*/
-
-
-#ifndef PROVISIONINGINTERNALCRKEYS_H
-#define PROVISIONINGINTERNALCRKEYS_H
-
-#include <e32def.h>
-
-/******************************************************************************
-* Provisioning Variation API
-* Keys under this category are used in defining Provisioning variation.
-*/
-const TUid KCRUidOMAProvisioningLV = {0x101F87AA};
-const TUid KOMAProvAuthenticationLV = {0x101F87AA};
-
-/**
-* Provisioning Local Variation Flags. Values are defined in ProvisioningVariant.hrh.
-*/
-const TUint32 KOMAProvisioningLVFlag = 0x00000000;
-const TUint32 KOMAProvAuthenticationLVFlag = 0x00000001;
-const TUint32 KOMAProvAuthFailMsgHandling = 0x00000002;
-const TUint32 KOMAProvOriginatorContent = 0x00000003;
-const TUint32 KOMAProvIsUserPin = 0x00000004;
-const TUint32 KOMAProvCriticalAdapterSettingCount = 0x00000005;
-const TUint32 KOMAProvMessageOpen = 0x00000006;
-const TUint32 KOMAProvAllowCriticalAdapterSetting = 0x00000007;
-#endif // PROVISIONINGINTERNALCRKEYS_H
-
-// End of file
--- 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 <cdbcols.h> // CommsDB columname defs
#include <stringresourcereader.h>
#include <barsread.h>
-#include <nsmldmprovisioningadapter.rsg>
+#include <NSmlDMProvisioningAdapter.rsg>
#include <f32file.h>
#include <bautils.h>
#include <ApUtils.h>
@@ -38,9 +38,8 @@
#include <NSmlPrivateAPI.h>
#include "NSmlDmProvisioningAdapter.h"
#include "NSmlTransportHandler.h"
+
#include <data_caging_path_literals.hrh>
-#include "ProvisioningInternalCRKeys.h"
-#include <centralrepository.h>
// ============================ 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");
}
--- a/syncmlfw/dm/settings/src/DMProfileContentHandler.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/settings/src/DMProfileContentHandler.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -22,10 +22,8 @@
#include <commdb.h>
#include <nsmldebug.h>
#include <featmgr.h>
-#include <centralrepository.h>
#include "DMprofileContentHandler.h"
#include "nsmldmsettings.h"
-#include "DevManInternalCRKeys.h"
#define DES_AS_8_BIT(str) (TPtrC8((TText8*)((str).Ptr()), (str).Size()))
@@ -180,8 +178,7 @@
RemoveRSCEntryL();
TInt iapId = 0;
- TInt count = iProfileArray->Count();
- for ( TInt i = 0; i < count; i++ )
+ for ( TInt i = 0; i < iProfileArray->Count(); i++ )
{
if(iProfileArray->At(i)->iAccessPoint)
{
@@ -213,19 +210,6 @@
CleanupStack::PopAndDestroy(); // profile
}
- CRepository* centrep = NULL;
- TRAPD( err, centrep = CRepository::NewL(KCRUidDeviceManagementInternalKeys));
- if (err==KErrNone )
- {
- TInt num(-1);
- TInt err = centrep->Get( KMaxFactoryDMProfileId , num );
- if( num >= 0 )
- err = centrep->Set( KMaxFactoryDMProfileId , (count + num ) );
- else
- err = centrep->Set( KMaxFactoryDMProfileId , count - 1);
- delete centrep;
- centrep = NULL;
- }
_DBG_FILE("CDMProfileContentHandler::SaveProfilesL(): end");
}
// -----------------------------------------------------------------------------
--- a/syncmlfw/dm/settings/src/NSmlDMResourceProfiles.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/settings/src/NSmlDMResourceProfiles.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -18,11 +18,9 @@
// INCLUDE FILES
-#include <featmgr.h>
-#include <centralrepository.h>
#include "nsmldmsettings.h"
#include "NSmlDMResourceProfile.h"
-#include "DevManInternalCRKeys.h"
+#include <featmgr.h>
const TInt KNSmlDmBluetoothType = 0x101F99F1;
// ----------------------------------------------------------
// CNSmlDMResourceProfiles implementation
@@ -79,8 +77,7 @@
{
RemoveDuplicateEntry();
RemoveObexEntryL();
- TInt count = iProfileArray->Count();
- for ( TInt i = 0; i < count ; i++ )
+ for ( TInt i = 0; i < iProfileArray->Count(); i++ )
{
CNSmlDMProfile* profile = iSettings->CreateProfileL();
CleanupStack::PushL( profile );
@@ -88,14 +85,6 @@
profile->SaveL();
CleanupStack::PopAndDestroy(); // profile
}
- CRepository* centrep = NULL;
- TRAPD( err, centrep = CRepository::NewL(KCRUidDeviceManagementInternalKeys));
- if (err==KErrNone )
- {
- TInt err = centrep->Set( KMaxFactoryDMProfileId , count-1 );
- delete centrep;
- centrep = NULL;
- }
}
// ----------------------------------------------------------
--- a/syncmlfw/dm/settings/src/NSmlDMSettings.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/settings/src/NSmlDMSettings.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -16,7 +16,7 @@
*/
-#include <nsmldmprofileres.rsg>
+#include <NSmlDMProfileRes.rsg>
#include <SyncMLDef.h>
#include <utf.h>
--- a/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/syncagent/src/nsmldmcmds.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -656,7 +656,6 @@
TPtr8 targeturi = HBufC8::NewLC ( (*aItemList[i].iTarget).Length())->Des();
targeturi.Append ( *aItemList[i].iTarget);
- if(targeturi.Compare(KNullDesC8)!=0)
DoTargetL ( itemPtr->item->target, targeturi );
CleanupStack::PopAndDestroy(); // targeturi
--- a/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/treemodule/src/nsmldmddf.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -634,8 +634,7 @@
// FOTA
// For the FOTA adapter put the correlator to aObject instead of
// data.
- if ( iAdapterId == KNSmlDMFotaAdapterImplUid || iAdapterId == KNSmlDMAMAdapterImplUid
- || iAdapterId == KNSmlDMLawMoAdapterImplUid)
+ if ( iAdapterId == KNSmlDMFotaAdapterImplUid || iAdapterId == KNSmlDMAMAdapterImplUid)
{
iSessionArray[iSessionId-1].ExecuteCommandL(iAdapterId,*luid,
aStatusRef,aURI,aCorrelator,aType,aLargeItem);
--- a/syncmlfw/dm/wappushalert/bld/nsmldmwappushalert.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/dm/wappushalert/bld/nsmldmwappushalert.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -50,5 +50,5 @@
LIBRARY ecom.lib
LIBRARY wappushutils.lib
LIBRARY nsmldebug.lib
-LIBRARy NSmlPrivateAPI.lib
+LIBRARy nsmlprivateapi.lib
SMPSAFE
--- a/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/adapters/dataproviderbase/bld/nsmldataproviderbase.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -43,5 +43,5 @@
SYSTEMINCLUDE /epoc32/include/syncml
SYSTEMINCLUDE /epoc32/include/ecom
-LIBRARY euser.lib estor.lib ecom.lib
+LIBRARY euser.lib estor.lib ECom.lib
--- a/syncmlfw/ds/alerthandler/bld/nsmldsalert.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/alerthandler/bld/nsmldsalert.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -49,11 +49,11 @@
LIBRARY euser.lib
LIBRARY estor.lib
LIBRARY nsmldebug.lib
-LIBRARY NSmlPrivateAPI.lib
-LIBRARY NSmlDSSettings.lib
+LIBRARY NSmlPrivateApi.lib
+LIBRARY nsmldssettings.lib
LIBRARY nsmlwbxml.lib
LIBRARY nsmlagentcommon.lib
-LIBRARY ecom.lib
+LIBRARY ecom.lib
--- a/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/dsutils/ProfileUtil/bld/NsmlProfileUtil.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -38,7 +38,7 @@
LIBRARY euser.lib
LIBRARY estor.lib
-LIBRARY NSmlDSSettings.lib
+LIBRARY nsmldssettings.lib
LIBRARY centralrepository.lib
LIBRARY nsmldebug.lib
--- a/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/hostserver/dshostserverbase/bld/nsmldshostserver.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -59,6 +59,6 @@
LIBRARY nsmlchangefinder.lib syncmldatafilter.lib
#ifdef ARMCC
-LIBRARY ecom.lib
+LIBRARY ECOM.LIB
#endif
--- a/syncmlfw/ds/netmon/bld/NetMon.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/netmon/bld/NetMon.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -40,7 +40,7 @@
LIBRARY flogger.lib
LIBRARY syncmlclientapi.lib
LIBRARY nsmltransporthandler.lib
-LIBRARY NsmlProfileUtil.lib
+LIBRARY nsmlprofileutil.lib
LIBRARY nsmldebug.lib
LIBRARY centralrepository.lib
LIBRARY efsrv.lib
--- a/syncmlfw/ds/netmon/src/CNetMon.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/netmon/src/CNetMon.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -106,8 +106,6 @@
{
DBG_FILE(_S8("CNetMon::~CNetMon() begins"));
- Cancel();
-
DBG_FILE(_S8("CNetMon::~CNetMon() ends"));
}
@@ -178,7 +176,12 @@
//CancelTimer();
- Complete();
+ // Un-register for events
+ iConnectionMonitor.CancelNotifications();
+ iConnectionMonitor.Close();
+
+ // Cleanup sync session
+ CloseSyncSession();
DBG_FILE(_S8("CNetMon::DoCancel() ends"));
}
@@ -507,12 +510,7 @@
{
DBG_FILE(_S8("CNetMon::Complete() begins"));
- // Un-register for events
- iConnectionMonitor.CancelNotifications();
- iConnectionMonitor.Close();
-
- // Cleanup sync session
- CloseSyncSession();
+ Cancel();
// Close the server
CActiveScheduler::Stop();
--- a/syncmlfw/ds/provisioningadapter/bld/NSmlDsProvisioningAdapter.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/provisioningadapter/bld/NSmlDsProvisioningAdapter.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -49,8 +49,8 @@
MW_LAYER_SYSTEMINCLUDE
SYSTEMINCLUDE /epoc32/include/ecom
-LIBRARY euser.lib ecom.lib commdb.lib charconv.lib apengine.lib
+LIBRARY euser.lib ECom.lib commdb.lib charconv.lib apengine.lib
LIBRARY nsmldbcaps.lib bafl.lib efsrv.lib nsmldebug.lib syncmlclientapi.lib
-LIBRARY provisioningengine.lib centralrepository.lib
+LIBRARY ProvisioningEngine.lib centralrepository.lib
SMPSAFE
--- a/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/provisioningadapter/src/NSmlDsProvisioningAdapter.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -24,7 +24,7 @@
#include <utf.h>
#include <stringresourcereader.h>
#include <barsread.h>
-#include <nsmldsprovisioningadapter.rsg>
+#include <NSmlDSProvisioningAdapter.rsg>
#include <bautils.h>
#include <ApUtils.h>
#include <barsc.h>
--- a/syncmlfw/ds/settings/src/NSmlDSSettings.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/settings/src/NSmlDSSettings.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -16,7 +16,7 @@
*/
-#include <nsmldsprofileres.rsg>
+#include <NSmlDSProfileRes.rsg>
#include <nsmlconstants.h>
#include <nsmldsconstants.h>
--- a/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/syncagent/bld/nsmldsagent.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -78,7 +78,7 @@
LIBRARY nsmlagentlog.lib
LIBRARY nsmldbcaps.lib
LIBRARY nsmlchangefinder.lib
-LIBRARY NSmlDSSettings.lib
+LIBRARY nsmldssettings.lib
LIBRARY nsmlfilter.lib
LIBRARY nsmldshostclient.lib
LIBRARY nsmlhistorylog.lib
--- a/syncmlfw/ds/syncagent/src/nsmldsagent.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/ds/syncagent/src/nsmldsagent.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -3104,17 +3104,6 @@
}
//RD_SUSPEND_RESUME
break;
-
- /* Implementation of CMCC PIM v3 begins*/
- case TNSmlError::ESmlStatusDeviceFull: // 420
- if ( FeatureManager::FeatureSupported(KFeatureIdFfTdCmccpimpromptserverfullwhenreceive420statuscodefromserver) )
- {
- // CMCC server full error enabled
- iDSObserver->OnSyncMLSyncError( MSyncMLProgressObserver::ESmlFatalError, SyncMLError::KErrServerFull, 0, 0, 0);
- error = ETrue;
- }
- break;
- /* Implementation of CMCC PIM v3 ends*/
default:
error = ETrue;
--- a/syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/syncmlnotifier/group/SyncMLNotifier.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -57,7 +57,7 @@
LIBRARY euser.lib cone.lib // Symbian OS framework libraries
LIBRARY avkon.lib // UI library
LIBRARY bafl.lib // Basic Application Framework Library
-LIBRARY CommonEngine.lib // Series 60 common components library
+LIBRARY commonengine.lib // Series 60 common components library
LIBRARY charconv.lib // Character conversion library
LIBRARY eikcoctl.lib eiksrv.lib // Eikon libraries
LIBRARY eikdlg.lib // Eikon libraries
--- a/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/syncmlnotifier/src/SyncMLAppLaunchNotifier.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -30,7 +30,7 @@
#include <ecom/ecom.h>
#include <centralrepository.h>
#include <SyncMLNotifierDomainCRKeys.h>
-#include <syncmlnotifier.rsg> // Own resources
+#include <SyncMLNotifier.rsg> // Own resources
#include "SyncMLAppLaunchNotifier.h" // Class declaration
#include "SyncMLTimedMessageQuery.h"
#include "SyncMLTimedQueryDialog.h"
--- a/syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/syncmlnotifier/src/SyncMLDlgNotifier.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -31,7 +31,7 @@
#include <avkon.mbg>
#include <aknconsts.h>
#include <utf.h>
-#include <syncmlnotifier.rsg> // Own resources
+#include <SyncMLNotifier.rsg> // Own resources
#include "SyncMLDlgNotifier.h" // Class definition
#include "SyncMLTimedMessageQuery.h"
#include "SyncMLAppLaunchNotifier.h"
@@ -168,6 +168,16 @@
{
User::Leave( KErrInUse );
}
+
+ if ( AutoLockOnL() )
+ {
+ // The phone is locked, access denied.
+ // Write results back to caller and complete message.
+ aMessage.Complete( KErrLocked );
+ iNeedToCompleteMessage = EFalse;
+ return;
+ }
+
iMessage = aMessage;
iNeedToCompleteMessage = ETrue;
iReplySlot = aReplySlot;
--- a/syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/syncmlfw/syncmlnotifier/src/SyncMLFwUpdNotifier.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -31,7 +31,7 @@
#include <centralrepository.h>
#include <DevManInternalCRKeys.h>
#include <SyncMLNotifierDomainCRKeys.h>
-#include <syncmlnotifier.rsg> // Own resources
+#include <SyncMLNotifier.rsg> // Own resources
#include <aknnotewrappers.h>
#include <e32property.h>
--- a/terminalsecurity/SCP/SCPClient/data/SCPNotifier.rss Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/data/SCPNotifier.rss Wed Oct 13 15:30:06 2010 +0300
@@ -110,21 +110,6 @@
buf = qtn_set_sec_code_setting_query_server;
}
-RESOURCE TBUF r_scp_lawmo_locked
- {
- buf = qtn_device_locked_remotely;
- }
-
-RESOURCE TBUF r_code_mismatch_discreet_popup_heading
- {
- buf = qtn_code_mismatch_discreet_popup_heading;
- }
-
-RESOURCE TBUF r_code_mismatch_discreet_popup_text
- {
- buf = qtn_code_mismatch_discreet_popup_text;
- }
-
RESOURCE DIALOG r_dialog_warning
{
flags = EAknWarningNoteFlags | EEikDialogFlagWait;
--- a/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/group/SCPClient.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -59,14 +59,15 @@
LIBRARY aknnotify.lib
LIBRARY eikdlg.lib
LIBRARY ws32.lib
-LIBRARY CommonEngine.lib
+LIBRARY commonengine.lib
LIBRARY bafl.lib
LIBRARY flogger.lib
LIBRARY featmgr.lib
LIBRARY centralrepository.lib // CenRep
LIBRARY aknnotify.lib
LIBRARY estor.lib
-LIBRARY apgrfx.lib
+LIBRARY apgrfx.lib
+
SMPSAFE
// End of file
--- a/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/inc/SCPQueryDialog.h Wed Oct 13 15:30:06 2010 +0300
@@ -137,7 +137,6 @@
TInt iKeyUsed;
CSCPLockObserver* iDeviceLockStatusObserver;
CSCPLockObserver* iCallStatusObserver;
- TBool iLockedByLawMo;
};
#endif
--- a/terminalsecurity/SCP/SCPClient/loc/SCPNotifier.loc Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/loc/SCPNotifier.loc Wed Oct 13 15:30:06 2010 +0300
@@ -41,16 +41,6 @@
//l: popup_info_list_pane_t2/opt1
//r: 5.2
#define qtn_set_sec_code_setting_query_server "Lock Code has not been set. Please set the Lock Code."
-//d: The text informing user that phone is locked by an Operator server
-//l: popup_query_data_window
-#define qtn_device_locked_remotely "Locked by %U"
-//d: This popup heading string is to alert the user that he has entered a wrong lock code.
-//l: popup_query_data_window
-//r: 5.2
-#define qtn_code_mismatch_discreet_popup_heading "Wrong code"
-//d: This string would inform the user to try entering the lock code again.
-//l: popup_query_data_window
-//r: 5.2
-#define qtn_code_mismatch_discreet_popup_text "please try again"
+
// End of File
--- a/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/src/SCPClient.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -32,7 +32,7 @@
#include "SCPQueryDialog.h"
#include "SCPParamObject.h"
-#include <scpnotifier.rsg>
+#include <SCPNotifier.rsg>
#include "SCP_IDs.h"
#include <centralrepository.h>
@@ -40,23 +40,18 @@
//#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS
#include <TerminalControl3rdPartyAPI.h>
#include <SCPServerInterface.h>
-#include <secui.rsg>
+#include <SecUi.rsg>
#include <scptimestamppluginlang.rsg>
#include <secui.hrh>
#include <StringLoader.h>
#include <bautils.h>
//#endif // DEVICE_LOCK_ENHANCEMENTS
-#include <DevManInternalCRKeys.h>
#include <featmgr.h>
#include "SCPDebug.h"
#include <e32property.h>
#include <SCPPServerPluginDefs.hrh>
#include <apgtask.h>
-#include <e32property.h>
-#include <PSVariables.h>
-#include <coreapplicationuisdomainpskeys.h>
-
/*#ifdef _DEBUG
#define __SCP_DEBUG
#endif // _DEBUG
@@ -73,7 +68,7 @@
static const TUint KDefaultMessageSlots = 3;
static const TInt KSCPConnectRetries( 2 );
-const TInt KLockedbyLawmo (30);
+
//#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS
_LIT( KDriveZ, "Z:" );
@@ -476,38 +471,22 @@
EXPORT_C TInt RSCPClient::SetPhoneLock( TBool aLocked )
{
Dprint( (_L("--> RSCPClient::SetPhoneLock( %d)"), aLocked ));
- TInt autolockState = -1;
- RProperty aProperty;
- aProperty.Get(KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, autolockState);
- Dprint( (_L("RSCPClient::SetPhoneLock()Autolock state before %d"), autolockState ));
-
- if((aLocked==0)&&(autolockState != EAutolockStatusUninitialized))
- InformAutolockTask();
- Dprint( (_L("RSCPClient sendreceive") ));
+
+ if(aLocked==0)
+ InformAutolockTask();
+
TInt ret = SendReceive(ESCPServSetPhoneLock, TIpcArgs( aLocked ) );
- Dprint( (_L("RSCPClient sendreceive done") ));
- aProperty.Get(KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, autolockState);
- Dprint( (_L("RSCPClient::SetPhoneLock()Autolock state after %d"), autolockState ));
- // Put it here because, we cant change autolock status before sendreceive
- // Uninitialised state is Only at Bootup.
- if((autolockState == EAutolockStatusUninitialized)&&(aLocked==0)&&(ret==KErrNone))
- {
- Dprint( (_L("RSCPClient::SetPhoneLock()setting autolock status") ));
- aProperty.Set(KPSUidCoreApplicationUIs, KCoreAppUIsAutolockStatus, EAutolockOff);
- // This is startup and we are done with ISA unlock
- // So set the Startup cenrep key so tht it is used in SeccodeQuery
- CRepository* lRepository = NULL;
- TInt returnv;
- TRAP(returnv, lRepository = CRepository :: NewL(KCRUidSCPLockCode));
- returnv = lRepository->Set(KSCPStartupQuery, 1);
- if(returnv==KErrNone)
- Dprint( (_L("RSCPClient::SetPhoneLock()setting KSCPStartupQuery") ));
- delete lRepository;
- }
+
Dprint( (_L("<-- RSCPClient::SetPhoneLock(): %d"), ret ));
return ret;
}
-
+
+// ---------------------------------------------------------
+// TInt RSCPClient::InformAutolockTask()
+// Informs the autolock to Unlock the homescreen
+// Status : Approved
+// ---------------------------------------------------------
+//
void RSCPClient::InformAutolockTask()
{
Dprint( (_L("RSCPClient::InformAutolockTask") ));
@@ -660,23 +639,6 @@
}
Dprint((_L("<-- RSCPClient::SecCodeQuery(): lStatus= %d, lErr= %d"), lStatus, lErr));
- CRepository* lRepository = NULL;
- TInt startup = 0;
- TInt returnv;
- TRAP(returnv, lRepository = CRepository :: NewL(KCRUidSCPLockCode));
- returnv = lRepository->Get(KSCPStartupQuery, startup);
- if(returnv == KErrNone)
- Dprint( (_L("RSCPClient::SecCodeQuery()KSCPStartupQuery get done")));
- lRepository->Set(KSCPStartupQuery, 0);
- delete lRepository;
- Dprint((_L("RSCPClient::SecCodeQuery(): startup ? %d"), startup ));
- //Check if this is Startup Query and tht device is remote unlocked now ?
- if(startup)
- {
- Dprint((_L("[RSCPClient] SecCodeQuery() startup remote Unlocked")));
- return KErrNone;
- }
- else
return (lErr != KErrNone) ? lErr : lStatus;
}
@@ -851,8 +813,10 @@
return ret;
}
+
EXPORT_C TInt RSCPClient :: PerformCleanupL(RArray<TUid>& aAppIDs) {
Dprint((_L("RSCPClient::PerformCleanupL() >>>")));
+
TInt lCount = aAppIDs.Count();
if(lCount < 1) {
@@ -874,6 +838,7 @@
Dprint((_L("RSCPClient::PerformCleanupL() <<<")));
return lStatus;
}
+
// ---------------------------------------------------------
// The server contains all the logic for the parameters, just
// propagate the call.
@@ -996,6 +961,7 @@
if ( ( ret ) && ( ret != ESecUiEmergencyCall ) && ( err == KErrNone ) )
{
verifyCodeBuffer.Zero();
+
/*TChar ch = static_cast<TChar>(newCodeBuffer[0]);
CSCPQueryDialog :: TKeypadContext lKPContext =
@@ -1344,55 +1310,13 @@
CleanupStack :: PopAndDestroy(lRepository);
return lRet;
}
- TInt currentLawmoState(0);
- Dprint( (_L("CSCPClient::lawmo cenrep") ));
- CRepository* crep = CRepository::NewLC( KCRUidDeviceManagementInternalKeys );
- TInt reterr = crep->Get( KLAWMOPhoneLock, currentLawmoState );
- Dprint( (_L("CSCPClient::lawmo cenrep done") ));
- if(reterr != KErrNone)
- {
- Dprint(_L("[RSCPClient]-> ERROR: Unable to perform get on CenRep lawmo, lErr=%d"), lRet);
- CleanupStack :: PopAndDestroy(crep);
- return reterr;
- }
+
HBufC* codeHBuf = HBufC :: NewLC(KSCPPasscodeMaxLength + 1);
HBufC8* addParamsHBuf = HBufC8 :: NewLC(KSCPMaxTARMNotifParamLen);
TPtr codeBuffer = codeHBuf->Des();
TPtr8 addParams = addParamsHBuf->Des();
- if(currentLawmoState!=KLockedbyLawmo)
- {
- // rundialog with a new resource file
- Dprint((_L("[RSCPClient]-> lawmo current state !=30")));
- TBuf<255> serverId;
- serverId.Zero();
- reterr = crep->Get( KLAWMOfactoryDmServerName, serverId );
- Dprint( (_L("RSCPClient::SetSecurityCode serverid: %s"), serverId.PtrZ() ));
- HBufC* prompt = StringLoader::LoadLC(R_SCP_LAWMO_LOCKED, serverId);
- Dprint( (_L("RSCPClient::SetSecurityCode stringval: %s"), (prompt->Des()).PtrZ() ));
- lRet = RunDialogL(codeBuffer, aButtonsShown, KSCPPasscodeMinLength, KSCPPasscodeMaxLength,
- 0, prompt, aECSSupport);
- if((lRet) && (lRet != ESecUiEmergencyCall) && (lRet != EAknSoftkeyEmergencyCall))
- {
- Dprint(_L("[RSCPClient]-> INFO: LL User has updated the lock code..."));
-
- lRet = SendReceive( ESCPServAuthenticateS60, TIpcArgs( &codeBuffer, &aPassword, &addParams, aFlags));
-
- Dprint((_L("[RSCPClient]-> INFO: LL addParams.Length()=%d")), addParams.Length());
- Dprint((_L("[RSCPClient]-> INFO: LL lRet=%d")), lRet);
- }
- else
- {
- switch(lRet)
- {
- case 0:
- lRet = KErrCancel;
- break;
- }
- }
- CleanupStack::PopAndDestroy(1);
- }
- else if(lDefCode == 0) {
+ if(lDefCode == 0) {
Dprint(_L("[RSCPClient]-> INFO: Default lock code has been set already by the user..."));
lRet = RunDialogL(codeBuffer, aButtonsShown, KSCPPasscodeMinLength, KSCPPasscodeMaxLength,
@@ -1528,7 +1452,7 @@
CleanupStack :: PopAndDestroy(tmp);
}
- CleanupStack :: PopAndDestroy(4); // repository * 2, addParamsHBuf, codeHBuf
+ CleanupStack :: PopAndDestroy(3); // repository, addParamsHBuf, codeHBuf
Dprint(_L("[RSCPClient]-> SetSecurityCodeL() <<< lRet=%d"), lRet);
return lRet;
}
--- a/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/src/SCPLockObserver.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -170,12 +170,6 @@
iDialog->TryCancelQueryL(ESecUiDeviceLocked);
iSubscribedToEvent = EFalse;
}
- else if((autolockState == EAutolockOff)||(autolockState == EAutolockStatusUninitialized))
- {
- Dprint(_L("CSCPLockObserver::RunL() TryCancelQueryL Device UnLocked"));
- iDialog->TryCancelQueryL(ESecUiNone);
- iSubscribedToEvent = EFalse;
- }
break;
case ESecUiCallStateObserver: {
TInt callState;
--- a/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPClient/src/SCPQueryDialog.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -22,18 +22,17 @@
#include <StringLoader.h>
#include <aknappui.h>
#include <avkon.rsg>
-#include <secui.rsg>
+#include <SecUi.rsg>
// Include the SecUi definitions
#include <secui.hrh>
#include "SCPDebug.h"
-#include <scpnotifier.rsg>
+#include <SCPNotifier.rsg>
// For Central Repository
#include <centralrepository.h>
#include <AknIncallBubbleNotify.h>
#include <e32property.h>
#include <ctsydomainpskeys.h>
#include "SCPCodePrivateCRKeys.h"
-#include <DevManInternalCRKeys.h>
#include <featmgr.h>
#include <aknglobalpopupprioritycontroller.h>
@@ -52,7 +51,7 @@
#endif // _DEBUG*/
const TInt KSCPSpecialDeleteEvent( 63529 );
-const TInt KLockedbyLawmo (30);
+
// ================= MEMBER FUNCTIONS =======================
//
// ----------------------------------------------------------
@@ -79,9 +78,8 @@
iPreviousCharacterWasInvalid( EFalse ),
iPrioritySet( EFalse ),
iPriorityDropped( EFalse ),
- iLockedByLawMo( EFalse ),
- iKeyUsed ( NULL ),
- iContextSensitive(aContextSensitive)
+ iContextSensitive(aContextSensitive),
+ iKeyUsed ( NULL )
{
def_mode = 0;
iAppKey = 0;
@@ -313,48 +311,23 @@
}
Dprint( (_L("CSCPQueryDialog::PreLayoutDynInitL(): Changing Window Priority") ));
- DrawableWindow()->SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront);
- ButtonGroupContainer().ButtonGroup()->AsControl()->DrawableWindow()->SetOrdinalPosition(0, ECoeWinPriorityAlwaysAtFront);
+ DrawableWindow()->SetOrdinalPosition(0, ECoeWinPriorityNormal);
}
else {
AknGlobalPopupPriorityController :: SetPopupPriorityL(*this, 0);
DrawableWindow()->SetOrdinalPosition(0, ECoeWinPriorityNormal);
- ButtonGroupContainer().ButtonGroup()->AsControl()->DrawableWindow()->SetOrdinalPosition(0, ECoeWinPriorityNormal);
}
// this must be done always to keep the reference count in synch
// this does not have any effect if autoforwarding has not been set true (normal application.)
iEikonEnv->BringForwards(ETrue, ECoeWinPriorityAlwaysAtFront+1);
-
- Dprint( (_L("CSCPQueryDialog::PreLayoutDynInitL(): Key sounds") ));
- // Key sounds
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PushContextL(R_AVKON_DEFAULT_SKEY_LIST);
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->BringToForeground();
- static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->LockContext();
- iFront = ETrue;
- TInt currentLawmoState(0);
- Dprint( (_L("CSCPQueryDialog::lawmo cenrep") ));
- CRepository* crep = CRepository::NewLC( KCRUidDeviceManagementInternalKeys );
- TInt reterr = crep->Get( KLAWMOPhoneLock, currentLawmoState );
- Dprint( (_L("CSCPQueryDialog::lawmo cenrep done") ));
-
- if(reterr != KErrNone)
- {
- Dprint(_L("[RSCPClient]-> ERROR: Unable to perform get on CenRep lawmo, lErr=%d"), reterr);
- CleanupStack :: PopAndDestroy(crep);
- return;
- }
-
- if(currentLawmoState!=KLockedbyLawmo)
- {
- // Hide the OK key
- Dprint( (_L("CSCPQueryDialog::lawmo state !=30, dim key") ));
- iLockedByLawMo = ETrue;
- ButtonGroupContainer().MakeCommandVisible( EAknSoftkeyOk, ETrue );
- ButtonGroupContainer().DimCommand(EAknSoftkeyOk, ETrue);
- }
- CleanupStack::PopAndDestroy();
+ Dprint( (_L("CSCPQueryDialog::PreLayoutDynInitL(): Key sounds") ));
+ // Key sounds
+ static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->PushContextL(R_AVKON_DEFAULT_SKEY_LIST);
+ static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->BringToForeground();
+ static_cast<CAknAppUi*>(iEikonEnv->EikAppUi())->KeySounds()->LockContext();
+ iFront = ETrue;
}
//
// ---------------------------------------------------------
@@ -649,11 +622,6 @@
ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyOk);
}
TRAP ( err , ButtonGroupContainer().AddCommandToStackL(0,EAknSoftkeyOk,*cbaLabel) );
- if(iLockedByLawMo)
- {
- ButtonGroupContainer().MakeCommandVisible( EAknSoftkeyOk, ETrue );
- ButtonGroupContainer().DimCommand(EAknSoftkeyOk, ETrue);
- }
ButtonGroupContainer().DrawDeferred();
delete cbaLabel;
}
@@ -671,13 +639,6 @@
else
{
return CAknTextQueryDialog::OfferKeyEventL(aKeyEvent,aType);
- }
-
- if(iLockedByLawMo)
- {
- Dprint( (_L("dim key hit 2") ));
- ButtonGroupContainer().MakeCommandVisible( EAknSoftkeyOk, ETrue );
- ButtonGroupContainer().DimCommand(EAknSoftkeyOk, ETrue);
}
}
//
@@ -796,11 +757,6 @@
ButtonGroupContainer().RemoveCommandFromStack(0,EAknSoftkeyOk);
}
TRAP ( err , ButtonGroupContainer().AddCommandToStackL(0, EAknSoftkeyOk, *cbaLabel) );
- if(iLockedByLawMo)
- {
- ButtonGroupContainer().MakeCommandVisible( EAknSoftkeyOk, ETrue );
- ButtonGroupContainer().DimCommand(EAknSoftkeyOk, ETrue);
- }
ButtonGroupContainer().DrawDeferred();
delete cbaLabel;
}
@@ -865,10 +821,6 @@
Dprint(_L("[CSCPQueryDialog]-> TryExitL 4"));
TryExitL(EAknSoftkeyCancel);
break;
- case ESecUiNone:
- Dprint(_L("[CSCPQueryDialog]-> TryExitL 5"));
- TryExitL(EAknSoftkeyOk);
- break;
default:
break;
}
--- a/terminalsecurity/SCP/SCPDatabase/src/SCPParamDBController.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPDatabase/src/SCPParamDBController.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -106,7 +106,6 @@
EXPORT_C TInt CSCPParamDBController :: SetValueL(TInt aParamID, const TInt32 aValue, const TInt32 aApp) {
switch(aParamID) {
- case RTerminalControl3rdPartySession :: ETimeout:
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
@@ -147,7 +146,6 @@
EXPORT_C TInt CSCPParamDBController :: GetValueL(TInt aParamID, TInt32& aValue, TInt32& aApp) {
switch(aParamID) {
- case RTerminalControl3rdPartySession :: ETimeout:
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
@@ -192,7 +190,6 @@
EXPORT_C TInt CSCPParamDBController :: DropValuesL(TInt aParamID, const TInt32 aApp) {
switch(aParamID) {
- case RTerminalControl3rdPartySession :: ETimeout:
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
@@ -219,7 +216,6 @@
EXPORT_C TInt CSCPParamDBController :: DropValuesL(TInt aParamID, RPointerArray <HBufC>& aParamValues, const TInt32 aApp) {
switch(aParamID) {
- case RTerminalControl3rdPartySession :: ETimeout:
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
--- a/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPHistoryPlugin.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -23,7 +23,7 @@
#include <SCPParamObject.h>
#include "SCPHistoryPlugin.h"
-#include <scphistorypluginlang.rsg>
+#include <SCPHistoryPluginLang.rsg>
#include "SCP_IDs.h"
--- a/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPSpecificStringsPlugin.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPHistoryPlugin/src/SCPSpecificStringsPlugin.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -23,7 +23,7 @@
#include <SCPParamObject.h>
#include "SCPSpecificStringsPlugin.h"
-#include <scphistorypluginlang.rsg>
+#include <SCPHistoryPluginLang.rsg>
#include "SCP_IDs.h"
#include <featmgr.h>
--- a/terminalsecurity/SCP/SCPPatternPlugin/src/SCPPatternPlugin.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPPatternPlugin/src/SCPPatternPlugin.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -24,7 +24,7 @@
#include <featmgr.h>
#include "SCPPatternPlugin.h"
-#include <scppatternpluginlang.rsg>
+#include <SCPPatternPluginLang.rsg>
#include "SCP_IDs.h"
--- a/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPServer/group/SCPServer.mmp Wed Oct 13 15:30:06 2010 +0300
@@ -80,7 +80,7 @@
#endif // SCP_USE_POLICY_ENGINE
#ifdef SCP_SMS_LOCK_AVAILABLE
-LIBRARY RLockSettings.lib
+LIBRARY rlocksettings.lib
#endif // SCP_SMS_LOCK_AVAILABLE
//#ifdef __SAP_DEVICE_LOCK_ENHANCEMENTS
--- a/terminalsecurity/SCP/SCPServer/inc/SCPServer.h Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPServer/inc/SCPServer.h Wed Oct 13 15:30:06 2010 +0300
@@ -136,7 +136,7 @@
// Only Autolock allowed for the Check configuration call
},
{
- _INIT_SECURITY_POLICY_C1( ECapability_None ),
+ _INIT_SECURITY_POLICY_S0( KSCPEvntHndlrUid ),
CPolicyServer::EFailClient
},
{
--- a/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPServer/src/SCPServer.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -737,7 +737,6 @@
User::LeaveIfError(err);
}
-
@@ -1280,74 +1279,84 @@
TInt lRetStatus(KErrNone);
Dprint(_L("[CSCPServer]-> Initiating branching on parameter..."));
- switch(aID) {
- case ESCPAutolockPeriod:
- case ESCPMaxAutolockPeriod: {
+ switch ( aID )
+ {
+ case ( ESCPAutolockPeriod ):
+ // Flow through
+ case ( ESCPMaxAutolockPeriod ):
+ {
// Convert the value, and set it
TInt value;
TLex lex(aValue);
lRetStatus = lex.Val(value);
+
if((lRetStatus != KErrNone ) || ( value < 0) || ( value > KSCPAutolockPeriodMaximum )) {
lRetStatus = KErrArgument;
break;
- }
+ }
//Check if the device memory is encrypted or not.
TBool encryptionEnabled = IsDeviceMemoryEncrypted();
- CSCPParamDBController* lParamDB = CSCPParamDBController :: NewLC();
// Value OK
- if(aID == ESCPMaxAutolockPeriod) {
- if( encryptionEnabled ) {
- Dprint(_L("[CSCPServer]-> Memory is encrypted"));
+ if(aID == ESCPMaxAutolockPeriod)
+ {
+ if ( encryptionEnabled )
+ {
+ Dprint(_L("Memory is encrypted"));
+ if (( 0 == value) || value > KMaxAutolockPeriod)
+ {
+ Dprint((_L("Denying setting of max auto lock as value is %d"), value));
+ User::Leave( KErrPermissionDenied );
+ }
+
+ }
+ else
+ {
+ Dprint(_L("Memory is decrypted, hence no restrictions to max autolock"));
+ }
- if(( 0 == value) || value > KMaxAutolockPeriod) {
- Dprint((_L("[CSCPServer]-> Denying setting of max auto lock as value is %d"), value));
- User :: Leave( KErrPermissionDenied );
- }
- }
- else {
- Dprint(_L("Memory is decrypted, hence no restrictions to max autolock"));
- }
-
- Dprint(_L("[CSCPServer]-> Branched to ESCPMaxAutolockPeriod..."));
+ Dprint(_L("[CSCPServer]-> Branched to ESCPMaxAutolockPeriod..."));
+ CSCPParamDBController* lParamDB = CSCPParamDBController :: NewLC();
lRetStatus = SetBestPolicyL(RTerminalControl3rdPartySession :: EMaxTimeout, aValue, aCallerIdentity, lParamDB);
- if(lRetStatus == KErrNone) {
+ if(lRetStatus == KErrNone)
+ {
// Do we have to change the Autolock period as well?
TInt currentALperiod;
lRetStatus = GetAutolockPeriodL(currentALperiod);
- if(lRetStatus == KErrNone) {
- if( (iConfiguration.iMaxTimeout > 0) &&
- ((iConfiguration.iMaxTimeout < currentALperiod) ||
- (currentALperiod == 0))) {
-
+ if(lRetStatus == KErrNone)
+ {
+ if((iConfiguration.iMaxTimeout > 0) && ((iConfiguration.iMaxTimeout < currentALperiod) || (currentALperiod == 0)))
+ {
Dprint((_L("[CSCPServer]-> Changing AL period to Max. AL period (Current ALP: %d, Max. ALP: %d)"), currentALperiod, value));
- //lRetStatus = SetAutolockPeriodL(value);
- /*
- * Call to SetBestPolicyL will not check for Stronger/Weaker. The value of ETimeout just gets stored in
- * both the internal DB and the CenRep
- */
- lRetStatus = SetBestPolicyL(RTerminalControl3rdPartySession :: ETimeout, aValue, aCallerIdentity, lParamDB);
+ lRetStatus = SetAutolockPeriodL(value);
}
}
- else {
+ else
+ {
Dprint((_L("[CSCPServer]-> ERROR: Couldn't get the Autolock period: %d"), lRetStatus));
}
}
+
+ CleanupStack :: PopAndDestroy(); //lParamDB
}
- // Autolock Period
- else {
- //Code is commented as it is already taken care by the below condition #1343 irrespective of the drive encryption state.
- /* if ( 0 == value ) {
- if(encryptionEnabled) {
+
+ else
+ { // Autolock Period
+
+ //Code is commented as it is already taken care by the below condition #1343 irrespective of the drive encryption state.
+ /* if ( 0 == value )
+ {
+ if ( encryptionEnabled )
+ {
Dprint(_L("Permission denied!"));
- User :: Leave(KErrPermissionDenied);
- }
- }*/
-
+ User::Leave( KErrPermissionDenied );
+ }
+ }*/
+
Dprint(_L("[CSCPServer]-> Branched to ESCPAutolockPeriod..."));
// Check if this value is not allowed by the Max. Autolock period
if ((iConfiguration.iMaxTimeout > 0) && ((iConfiguration.iMaxTimeout < value) || (value == 0))) {
@@ -1356,20 +1365,13 @@
lRetStatus = KErrArgument;
}
else {
- //lRetStatus = SetAutolockPeriodL(value);
- /*
- * Call to SetBestPolicyL will not check for Stronger/Weaker. The value of ETimeout just gets stored in
- * both the internal DB and the CenRep
- */
- lRetStatus = SetBestPolicyL(RTerminalControl3rdPartySession :: ETimeout, aValue, aCallerIdentity, lParamDB);
+ lRetStatus = SetAutolockPeriodL(value);
if(lRetStatus != KErrNone) {
Dprint((_L("[CSCPServer]-> ERROR: Couldn't set the Autolock period: %d"), lRetStatus));
}
}
}
-
- CleanupStack :: PopAndDestroy(); //lParamDB
}
break;
case ESCPCodeChangePolicy:
@@ -2597,10 +2599,9 @@
TBool lFirstTime(EFalse);
TInt32 lNumValue (-1);
TInt32 lNumValDB (-1);
- TInt lRetStatus = KErrNone;
+ TInt32 lRetStatus = KErrNone;
switch(aID) {
- case RTerminalControl3rdPartySession :: ETimeout:
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
@@ -2642,9 +2643,6 @@
else {
// Fetch the previous value of the parameter from the private database
switch(aID) {
- case RTerminalControl3rdPartySession :: ETimeout:
- // No need to fetch previous value for ETimeout since Stronger/Weaker check is not required for it.
- break;
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMinLength:
case RTerminalControl3rdPartySession :: EPasscodeMaxLength:
@@ -2713,12 +2711,6 @@
// Decision code that verifies if policy is strongest
switch(aID) {
- case RTerminalControl3rdPartySession :: ETimeout:
- /*
- * No need to check stronger/weaker for ETimeout. The value just has to be maintained in both
- * DB and the CenRep
- */
- break;
case RTerminalControl3rdPartySession :: EMaxTimeout:
case RTerminalControl3rdPartySession :: EPasscodeMaxRepeatedCharacters:
case RTerminalControl3rdPartySession :: EPasscodeExpiration:
@@ -2772,17 +2764,11 @@
*/
if (lRetStatus == KErrNone) {
switch (aID) {
- case RTerminalControl3rdPartySession :: ETimeout:
- lRetStatus = SetAutolockPeriodL(TInt(lNumValue));
- Dprint(_L("[CSCPServer]-> After setting ETimeout lRetStatus = %d "), lRetStatus);
- break;
-
case RTerminalControl3rdPartySession :: EMaxTimeout:
iConfiguration.iMaxTimeout = lNumValue;
lRetStatus = iConfiguration.WriteSetupL();
Dprint(_L("[CSCPServer]-> After setting EMaxTimeout lRetStatus = %d "), lRetStatus);
break;
-
default:
TUint16* ptr = const_cast<TUint16*>(aValue.Ptr());
TPtr valBuf(ptr, aValue.Length(), aValue.Length());
@@ -2877,31 +2863,14 @@
Dprint(_L("[CSCPServer]-> Old Index of EPasscodeHistoryBuffer=%d"), lHistBuffIndex);
Dprint(_L("[CSCPServer]-> Old Index of EPasscodeMinChangeTolerance=%d"), lMinTolIndex);
}
-
- /*
- * If both ETimeout and EMaxTimeout are marked for cleanup then interchange the cleanup order of
- * ETimeout and EMaxTimeout since AutoLock (ETimeout) cannot be disabled
- * if MaxAutolock (EMaxTimeout) is still enabled
- */
- if( lParamIds[0] == RTerminalControl3rdPartySession :: ETimeout &&
- lParamIds[1] == RTerminalControl3rdPartySession :: EMaxTimeout) {
-
- lParamIds[0] = RTerminalControl3rdPartySession :: EMaxTimeout;
- lParamIds[1] = RTerminalControl3rdPartySession :: ETimeout;
- }
}
for(TInt j=0; j < lCount; j++) {
TInt lCurrParamID = lParamIds[j];
lDefValueBuf->Des().Zero();
lDefValueBuf->Des().Format(_L("%d "), 0);
-
// Initialize the default values here...
switch(lCurrParamID) {
- case RTerminalControl3rdPartySession :: ETimeout:
- // lDefValueBuf already has the default value, 0 initialized...
- lCurrParamID = ESCPAutolockPeriod;
- break;
case RTerminalControl3rdPartySession :: EMaxTimeout:
// lDefValueBuf already has the default value, 0 initialized...
lCurrParamID = ESCPMaxAutolockPeriod;
@@ -2930,7 +2899,6 @@
for(TInt k=0; k < lDesCount; k++) {
TRAP(lStatus, lStatus = SetParameterValueL(lCurrParamID, lDesArr[k]->Des(), lAppID));
-
if(KErrNone != lStatus) {
Dprint(_L("[CSCPServer]-> ERROR: Unable to cleanup parameter %d error %d"), lParamIds[j], lStatus);
lSubOpsFailed = ETrue;
@@ -2944,40 +2912,6 @@
CleanupStack :: PopAndDestroy(1); // lDesArray
}
break;
-
- case ESCPAutolockPeriod: {
- TInt32 lParamValueDB(0);
- TInt lParamValueCenRep(0);
- TInt32 lCurrParamOwner(0);
-
- lStatus = lParamDB->GetValueL(RTerminalControl3rdPartySession :: ETimeout, lParamValueDB, lCurrParamOwner);
-
- if(lStatus != KErrNone) {
- Dprint(_L("[CSCPServer]-> ERROR: Unable to get current value of ETimeout from DB..."));
- lSubOpsFailed = ETrue;
- break;
- }
-
- lStatus = GetAutolockPeriodL(lParamValueCenRep);
-
- if(lStatus != KErrNone) {
- Dprint(_L("[CSCPServer]-> ERROR: Unable to get current value of ETimeout from CenRep..."));
- lSubOpsFailed = ETrue;
- break;
- }
-
- /*
- * It is possible that AutoLock set from UI is different. In that case internal DB and CenRep
- * are not in sync. Compare the two values and if they are same assume that the values are in sync.
- * Limitation is that if the user sets the AutoLock with the same value as set by the current app then
- * AutoLock will get disabled.
- *
- */
- if(lParamValueCenRep != lParamValueDB) {
- break;
- }
- }
-
default: {
iOverrideForCleanup = ETrue;
TRAP(lStatus, lStatus = SetParameterValueL(lCurrParamID, lDefValueBuf->Des(), lAppID));
@@ -2994,8 +2928,7 @@
aParamValArray.AppendL(lTmpBuffer);
}
}
- break;
- };
+ }
if(KErrNone != lStatus) {
Dprint(_L("[CSCPServer]-> ERROR: Unable to cleanup parameter %d error %d"), lParamIds[j], lStatus);
--- a/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPServer/src/SCPSession.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -1573,26 +1573,20 @@
Dprint(_L("[CSCPSession]-> NotifyAllStakeHoldersL() <<<"));
return KErrNone;
}
-
TInt CSCPSession :: HandleCleanupL(const RMessage2& aMessage) {
- Dprint((_L("[CSCPSession]-> HandleCleanupL() >>>")));
-
- if( (aMessage.SecureId().iId != KSCPServerSIDTerminalControl) &&
- (aMessage.SecureId().iId != KSCPEvntHndlrUid)) {
-
- Dprint((_L("[CSCPSession]-> ERROR: caller app id=%ld. Permission denied..."), aMessage.SecureId().iId));
- User :: Leave(KErrPermissionDenied);
- }
-
// Copy the client data into a local buffer
TInt32 lCount = aMessage.GetDesLength(1);
+/* // If the caller is not SCPEventHandler the deny access
+ if(aMessage.SecureId() != KSCPEvntHndlrUid) {
+ return KErrPermissionDenied;
+ }*/
+
// Atleast one application id has to be present in the received message (atleast 8 bytes)
if(lCount < sizeof(TInt32)) {
return KErrArgument;
}
- TInt lStatus = KErrNone;
RArray<const TParamChange> lChangeArray;
CleanupClosePushL(lChangeArray);
@@ -1601,7 +1595,9 @@
HBufC8* lBuffer = HBufC8 :: NewLC(lCount);
TPtr8 bufPtr = lBuffer->Des();
- aMessage.ReadL(1, bufPtr);
+ aMessage.ReadL(1, bufPtr);
+
+ TInt lStatus = KErrNone;
TRAPD(lErr, lStatus = iServer.PerformCleanupL(lBuffer, lChangeArray, lParamValArray));
@@ -1625,10 +1621,8 @@
lParamValArray.ResetAndDestroy();
CleanupStack :: PopAndDestroy(3); // lParamIDArray lParamValArray lBuffer
- Dprint((_L("[CSCPSession]-> HandleCleanupL() <<<")));
return lStatus;
}
-
TInt CSCPSession :: HandleSetALPeriodL( const RMessage2& aMessage ) {
Dprint((_L("[CSCPSession]-> HandleSetParamMessageL() >>>")));
TBool oldALState = EFalse;
--- a/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -21,7 +21,7 @@
#include <e32std.h>
#include <ecom/implementationproxy.h>
#include <SCPParamObject.h>
-#include <scptimestamppluginlang.rsg>
+#include <SCPTimestampPluginLang.rsg>
#include "SCP_IDs.h"
#include <bautils.h>
#include <hal.h>
--- a/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPUserInf.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPUserInf.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -16,7 +16,7 @@
*/
#include "SCPUserInf.h"
-#include <scptimestamppluginlang.rsg>
+#include <SCPTimestampPluginLang.rsg>
#include <AknGlobalNote.h>
#include <aknnotewrappers.h>
--- a/terminalsecurity/SCP/inc/SCPLockCode.h Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/SCP/inc/SCPLockCode.h Wed Oct 13 15:30:06 2010 +0300
@@ -36,13 +36,7 @@
* Default value: 12345
*/
const TUint32 KSCPLockCodeDefaultLockCode = 0x00000001;
-/**
- *
- * The value assigned to this key is used to get and set ifits startup
- * Possible values: 0 or 1
- * Default value: 0
-*/
-const TUint32 KSCPStartupQuery = 0x00000002;
+
#endif// End of File
--- a/terminalsecurity/client/BWINS/TerminalControlu.def Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/client/BWINS/TerminalControlu.def Wed Oct 13 15:30:06 2010 +0300
@@ -60,5 +60,4 @@
?GetPasscodeMinSpecialCharacters@RTerminalControlSession@@QAEHAAJ@Z @ 59 NONAME ; int RTerminalControlSession::GetPasscodeMinSpecialCharacters(long &)
?GetPasscodeDisallowSimple@RTerminalControlSession@@QAEHAAH@Z @ 60 NONAME ; int RTerminalControlSession::GetPasscodeDisallowSimple(int &)
?SetPasscodeDisallowSimple@RTerminalControlSession@@QAEHH@Z @ 61 NONAME ; int RTerminalControlSession::SetPasscodeDisallowSimple(int)
- ?ResetDeviceLockParameters@RTerminalControl3rdPartySession@@QAEHXZ @ 62 NONAME ; int RTerminalControl3rdPartySession::ResetDeviceLockParameters(void)
--- a/terminalsecurity/client/eabi/TerminalControlu.def Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/client/eabi/TerminalControlu.def Wed Oct 13 15:30:06 2010 +0300
@@ -60,5 +60,4 @@
_ZN23RTerminalControlSession31SetPasscodeMinSpecialCharactersEl @ 59 NONAME
_ZN23RTerminalControlSession25GetPasscodeDisallowSimpleERi @ 60 NONAME
_ZN23RTerminalControlSession25SetPasscodeDisallowSimpleEi @ 61 NONAME
- _ZN31RTerminalControl3rdPartySession25ResetDeviceLockParametersEv @ 62 NONAME
--- a/terminalsecurity/client/src/TerminalControlClient.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/client/src/TerminalControlClient.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -1317,9 +1317,4 @@
return SendReceive( E3rdPartySetterGet, args1 );
}
-EXPORT_C TInt RTerminalControl3rdPartySession :: ResetDeviceLockParameters() {
- RDEBUG("RTerminalControl3rdPartySession::SetDeviceLockParameter");
- TIpcArgs args1;
- return SendReceive(E3rdPartySetterReset, args1);
-}
Binary file terminalsecurity/conf/Keys_SCPLockCode.confml has changed
Binary file terminalsecurity/conf/Keys_SCPLockCode_2002677B.crml has changed
--- a/terminalsecurity/inc/TerminalControlClientServer.h Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/inc/TerminalControlClientServer.h Wed Oct 13 15:30:06 2010 +0300
@@ -97,7 +97,6 @@
E3rdPartySetterGet,
E3rdPartySetterGetSize,
E3rdPartySetterSet,
- E3rdPartySetterReset
};
#endif// __TERMINALCONTROLCLIENTSERVER_H__
--- a/terminalsecurity/server/inc/TerminalControlServer.h Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/server/inc/TerminalControlServer.h Wed Oct 13 15:30:06 2010 +0300
@@ -158,7 +158,6 @@
void StopProcessByFullNameL ( const TDesC8& aName );
TBool GetPasscodePolicyL ( );
void SetPasscodePolicyL ( TBool aIsSet );
- void ResetParametersL(TInt32 aAppID);
private:
void SetIntValueL( TInt avalue, TInt aSCPCommandEnum );
--- a/terminalsecurity/server/src/TerminalControlServer.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/server/src/TerminalControlServer.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -1195,14 +1195,5 @@
,policySet, this->Message().SecureId().iId));
}
-void CTerminalControlServer :: ResetParametersL(TInt32 aAppID) {
- RDEBUG("CTerminalControlServer::ResetParametersL >>>");
- RArray <TUid> lAppIdArray;
- CleanupClosePushL(lAppIdArray);
- lAppIdArray.AppendL(TUid :: Uid(aAppID));
- User :: LeaveIfError(iSCPClient.PerformCleanupL(lAppIdArray));
- CleanupStack :: PopAndDestroy(1); //lAppIdArray
- RDEBUG("CTerminalControlServer::ResetParametersL <<<");
-}
// ----------------------------------------------------------------------------------------
// End of file
--- a/terminalsecurity/server/src/TerminalControlSession.cpp Wed Sep 15 13:08:27 2010 +0300
+++ b/terminalsecurity/server/src/TerminalControlSession.cpp Wed Oct 13 15:30:06 2010 +0300
@@ -177,10 +177,6 @@
case E3rdPartySetterSet:
SetDeviceLockParameterL( aMessage );
break;
-
- case E3rdPartySetterReset:
- Server().ResetParametersL(aMessage.SecureId().iId);
- break;
}
}