# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1270068271 -10800 # Node ID d8287cc0d36fc6e84c2e57803d22750a974c56a7 # Parent af762ad247ea5a200372ccb52ff72db51cb8ca0b Revision: 201010 Kit: 201013 diff -r af762ad247ea -r d8287cc0d36f datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp --- a/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_gps_data_source_adaptation source \sf\os\lbs\datasourceadaptation\gpsdatasourceadaptation diff -r af762ad247ea -r d8287cc0d36f datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h --- a/datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp --- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp Wed Mar 31 23:44:31 2010 +0300 @@ -94,11 +94,13 @@ //Set UUID selectionFilter().SetUUID(KSerialPortServiceClass); - - TBTDeviceClass selectionDeviceClass( - EMajorServicePositioning, - EMajorDeviceUnclassified, - 0); //Minor device class unspecified + //Apply No filter: To support BC - Some older Nokia (or other) devices do not specify + //one or other Class causing filter out if filtered for Positioning + //Major Service Class, Major Device Class and Minor device class unspecified + TBTDeviceClass selectionDeviceClass( + 0, + 0, + 0); //Set device class selectionFilter().SetDeviceClass(selectionDeviceClass); diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp --- a/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_bt_positioning_module source \sf\os\lbs\datasourcemodules\bluetoothgpspositioningmodule diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp --- a/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_default_positioning_module source \sf\os\lbs\datasourcemodules\defaultpositioningmodule diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp --- a/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_agps_positioning_module source \sf\os\lbs\datasourcemodules\gpspositioningmodule diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp --- a/datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp Wed Mar 31 23:44:31 2010 +0300 @@ -25,7 +25,7 @@ #include "LbsPsyNgMsgs.h" #include "lbscommoninternaldatatypes.h" -#include +#include const TUid KSuplPsyUid = {KSuplPsyImplUid}; //KSuplPsyImplUid defined in "suplpsy.hrh" // ----------------------------------------------------------------------------- diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/networkpositioningmodule/group/bld.inf --- a/datasourcemodules/networkpositioningmodule/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/networkpositioningmodule/group/bld.inf Wed Mar 31 23:44:31 2010 +0300 @@ -25,8 +25,12 @@ ./101fe98e.cre z:/private/10202be9/101fe98e.cre // ConfML files -../conf/networkpositioningmodule.confml OS_LAYER_EXPORTS_CONFML(networkpositioningmodule.confml) -../conf/networkpositioningmodule_101fe98e.crml OS_LAYER_EXPORTS_CRML(networkpositioningmodule_101fe98e.crml) +//! No longer exporting these confml files as this version of the APGS PSY is only used if APE Centric is enabled. If not +//! another version of the PSY is used (which has the same UID), so these confml files overwrite those of the other PSY. +//! A build time feature flag is being raised for these to only export these if APE Centric is enabled. For now, since +//! APE Centric is not being used, these are not exported. Once the feature flag is raised it can be changed to use that. +//../conf/networkpositioningmodule.confml OS_LAYER_EXPORTS_CONFML(networkpositioningmodule.confml) +//../conf/networkpositioningmodule_101fe98e.crml OS_LAYER_EXPORTS_CRML(networkpositioningmodule_101fe98e.crml) PRJ_MMPFILES lbsnetpsy.mmp diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp --- a/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_network_positioning_module source \sf\os\lbs\datasourcemodules\networkpositioningmodule diff -r af762ad247ea -r d8287cc0d36f datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp --- a/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_simulation_positioning_module source \sf\os\lbs\datasourcemodules\simulationpositioningmodule diff -r af762ad247ea -r d8287cc0d36f lbs_info/lbs_metadata/lbs_metadata.mrp --- a/lbs_info/lbs_metadata/lbs_metadata.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/lbs_info/lbs_metadata/lbs_metadata.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_metadata source \sf\os\lbs\lbs_info\lbs_metadata source \sf\os\lbs\package_definition.xml diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/group/lbs_testproduct.mrp --- a/lbstest/lbstestproduct/group/lbs_testproduct.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/group/lbs_testproduct.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_testproduct source \sf\os\lbs\lbstest\lbstestproduct\test_group diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf --- a/lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf Wed Mar 31 23:44:31 2010 +0300 @@ -16,7 +16,7 @@ //#include "../lbsprivfwutils/group/bld.inf" #include "../lbsprivfwtestchannel/group/BLD.INF" #include "../lbsprivfwproxy/group/bld.inf" -#include "../lbsprivfwnotifier/group/bld.inf" +//#include "../lbsprivfwnotifier/group/bld.inf" #include "../lbstestprivacycontroller/group/bld.inf" #include "../lbstestprivacycontrollersimple/group/bld.inf" diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby --- a/lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby Wed Mar 31 23:44:31 2010 +0300 @@ -20,7 +20,7 @@ REM LBS Privacy FW test support dlls -#include +REM #include #include #include REM #include diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h Wed Mar 31 23:44:31 2010 +0300 @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h Wed Mar 31 23:44:31 2010 +0300 @@ -30,10 +30,9 @@ #include #include -#include #include #include - +#include #include #include diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h Wed Mar 31 23:44:31 2010 +0300 @@ -31,8 +31,7 @@ #include #include #include - -#include +#include #include #include diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/s60privacyfw/group/bld.inf --- a/lbstest/lbstestproduct/s60privacyfw/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/s60privacyfw/group/bld.inf Wed Mar 31 23:44:31 2010 +0300 @@ -15,7 +15,7 @@ #include "../LcfFIPrivacyNotifier_1_0_ECom/Controller/group/Bld.inf" -#include "../LcfFIPrivacyNotifier_1_0_ECom/Notifier/group/Bld.inf" +//#include "../LcfFIPrivacyNotifier_1_0_ECom/Notifier/group/Bld.inf" #include "../Td_PrivFW_TEF/group/Bld.inf" PRJ_TESTEXPORTS diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby --- a/lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby Wed Mar 31 23:44:31 2010 +0300 @@ -18,11 +18,14 @@ #ifndef __NILE_LBS_PLUGIN_IBY__ #define __NILE_LBS_PLUGIN_IBY__ -#ifdef _DEBUG -ECOM_PLUGIN_UDEB(lcfnotifier.dll, lcfnotifier.rsc) -#else -ECOM_PLUGIN(lcfnotifier.dll, lcfnotifier.rsc) -#endif + +/* Wont build without QNN +* #ifdef _DEBUG +* ECOM_PLUGIN_UDEB(lcfnotifier.dll, lcfnotifier.rsc) +* #else +* ECOM_PLUGIN(lcfnotifier.dll, lcfnotifier.rsc) +* #endif +*/ file=ABI_DIR\DEBUG_DIR\LcfPluginCtrl.dll System\libs\LcfPluginCtrl.dll diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml Wed Mar 31 23:44:31 2010 +0300 @@ -17,12 +17,12 @@ networkprotocolmodules\suplproxyprotocolmodule\test\te_terminalplugin\group\BLD.INF - + lbsprivfwproxy.dll c:\sys\bin\lbsprivfwproxy.dll diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml Wed Mar 31 23:44:31 2010 +0300 @@ -54,12 +54,12 @@ c:\resource\plugins\testreflocplugin.rsc - + \epoc32\data\Z\resource\plugins\testqnnplugin.rsc diff -r af762ad247ea -r d8287cc0d36f lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml Wed Mar 31 23:44:31 2010 +0300 @@ -11,12 +11,12 @@ - + \epoc32\data\Z\resource\plugins\lbsprivfwnotifier.rsc diff -r af762ad247ea -r d8287cc0d36f lbstest/locationprotocoltest/group/lbs_networktest.mrp --- a/lbstest/locationprotocoltest/group/lbs_networktest.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/lbstest/locationprotocoltest/group/lbs_networktest.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_networktest source \sf\os\lbs\lbstest\locationprotocoltest diff -r af762ad247ea -r d8287cc0d36f locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp --- a/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_agpslocationmanager source \sf\os\lbs\locationmgmt\agpslocationmgr diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h --- a/locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/LbsNetProtocol/inc/lbsnetprotocolbase.h --- a/locationmgmt/locationcore/LbsNetProtocol/inc/lbsnetprotocolbase.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locationcore/LbsNetProtocol/inc/lbsnetprotocolbase.h Wed Mar 31 23:44:31 2010 +0300 @@ -968,22 +968,22 @@ class CLbsNetworkProtocolBase2 : public CLbsNetworkProtocolBase { public: - virtual void RequestTransmitLocation( + IMPORT_C virtual void RequestTransmitLocation( const TLbsNetSessionId& aSessionId, const TDesC& aDestination, TInt aPriority, const TLbsNetPosRequestOptionsBase& aOptions) = 0; - virtual void RespondPrivacyRequest( + IMPORT_C virtual void RespondPrivacyRequest( const TLbsNetSessionId& aSessionId, const TLbsPrivacyResponse& aResponse, TInt aReason) = 0; - virtual void CancelExternalLocation( + IMPORT_C virtual void CancelExternalLocation( const TLbsNetSessionId& aSessionId, TInt aReason); - virtual void RequestAssistanceData( + IMPORT_C virtual void RequestAssistanceData( TLbsAsistanceDataGroup aDataRequestMask, const TLbsNetSessionIdArray& aSessionIdArray) = 0; diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/conf/locationsettings.confml Binary file locationmgmt/locationcore/conf/locationsettings.confml has changed diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/group/lbs_admin.mrp --- a/locationmgmt/locationcore/group/lbs_admin.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locationcore/group/lbs_admin.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_admin source \sf\os\lbs\locationmgmt\locationcore\documentation diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/lbslocsettings/data/101f500c.txt Binary file locationmgmt/locationcore/lbslocsettings/data/101f500c.txt has changed diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locationcore/lbslocsettings/group/101F500C.cre Binary file locationmgmt/locationcore/lbslocsettings/group/101F500C.cre has changed diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp --- a/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_locationmonitor source \sf\os\lbs\locationmgmt\locmonitor\lbslocmonitorserver diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/group/lbslocationmonitor.mmp --- a/locationmgmt/locmonitor/lbslocmonitorserver/group/lbslocationmonitor.mmp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/group/lbslocationmonitor.mmp Wed Mar 31 23:44:31 2010 +0300 @@ -41,6 +41,7 @@ SOURCE clbslocmonitorrequesthandler.cpp SOURCE rlbslocmonitordb.cpp SOURCE clbslocmonitordbengine.cpp +SOURCE clbslocmonitordbtimer.cpp SOURCEPATH ../../../locationcore/LbsLocCommon/ServerFramework/src diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h --- a/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h Wed Mar 31 23:44:31 2010 +0300 @@ -26,11 +26,12 @@ #include #include #include "rlbslocmonitordb.h" +#include "clbslocmonitordbtimer.h" //------------------------------------------------------------------------------- /** */ -class CLbsLocMonitorDbEngine : public CActive +class CLbsLocMonitorDbEngine : public CActive, MLocMonitorDBCallback { public: @@ -42,7 +43,9 @@ TUint aCid, TPosition& aPosition, TPositionAreaExtendedInfo& aMatchingAreaInfo, TRequestStatus& aStatus); TInt GetPosition(TPosition& aPosition, TRequestStatus& aStatus); TInt ClearDatabase(); - static TInt FlushTimerCallback(TAny* aPtr); + + // from CLbsLocMonitorDbTimer + void FlushTimerCallback(); private: @@ -62,11 +65,11 @@ private: RSqlDatabase iDatabase; - CPeriodic* iPeriodic; TTimeIntervalMicroSeconds32 iFlushInterval; TInt iCount; RSqlStatement iSqlSaveStatement; TRequestStatus* iClientStatus; + CLbsLocMonitorDbTimer* iDbTimer; TBool iDBInitialised; TInt iLastMcc; diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbtimer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbtimer.h Wed Mar 31 23:44:31 2010 +0300 @@ -0,0 +1,65 @@ +/* +* 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: +* +*/ + +#ifndef LBS_LOCMONITORDBTIMER_H +#define LBS_LOCMONITORDBTIMER_H + + + +//------------------------------------------------------------------------------- +#include + + +//------------------------------------------------------------------------------- +/** +*/ + +class MLocMonitorDBCallback + { +public: + virtual void FlushTimerCallback() = 0; + }; + + + +class CLbsLocMonitorDbTimer : public CActive + { + +public: + static CLbsLocMonitorDbTimer* NewL(MLocMonitorDBCallback& aObserver); + virtual ~CLbsLocMonitorDbTimer(); + TBool IsRunning(); + TBool StartTimer(TTimeIntervalSeconds aTimeInterval); + + +private: + CLbsLocMonitorDbTimer(MLocMonitorDBCallback& aObserver); + void ConstructL(); + virtual void RunL(); + virtual void DoCancel(); + + +private: + MLocMonitorDBCallback& iObserver; + RTimer iTimer; + TBool iRunning; + }; + + + + +#endif //LBS_LOCATIONMONITORDBTIMER_H diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/inc/lbslocmonitordbenginedefs.h --- a/locationmgmt/locmonitor/lbslocmonitorserver/inc/lbslocmonitordbenginedefs.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/inc/lbslocmonitordbenginedefs.h Wed Mar 31 23:44:31 2010 +0300 @@ -23,7 +23,7 @@ const TInt KMaxDbSize = 1000; const TTimeIntervalMicroSeconds32 KInitialPeriod = 200000000; -const TTimeIntervalMicroSeconds32 KFlushPeriod = 30000000; +const TTimeIntervalSeconds KFlushPeriod = 7200; // 2 Hours in seconds #if defined (LBS_LOCMONITORDB_TEST) && defined (__WINS__) // Unit test emulator diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp --- a/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp Wed Mar 31 23:44:31 2010 +0300 @@ -38,8 +38,7 @@ { LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::ConstructL"); InitDbL(); - iPeriodic = CPeriodic::NewL(EPriorityStandard); - iPeriodic->Start(KInitialPeriod, KFlushPeriod, TCallBack(FlushTimerCallback, this)); + iDbTimer = CLbsLocMonitorDbTimer::NewL(*this); } @@ -89,11 +88,9 @@ { LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::~CLbsLocMonitorDbEngine"); Cancel(); - if(iPeriodic) - { - iPeriodic->Cancel(); - delete iPeriodic; - } + + delete iDbTimer; + if(iDBInitialised) { iSqlSaveStatement.Close(); @@ -118,6 +115,13 @@ } iClientStatus = &aStatus; *iClientStatus = KRequestPending; + + // If the db flush timer is not running, start it + if(!iDbTimer->IsRunning()) + { + iDbTimer->StartTimer(KFlushPeriod); + } + // If the cache does not contain a cell, this cell goes in the cache if (!iIsLastValid) { @@ -378,15 +382,10 @@ } -TInt CLbsLocMonitorDbEngine::FlushTimerCallback(TAny* aPtr) +void CLbsLocMonitorDbEngine::FlushTimerCallback() { LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::FlushTimerCallback"); - CLbsLocMonitorDbEngine* DbEngine = static_cast(aPtr); - if (DbEngine) - { - DbEngine->Flush(EFalse); - } - return KErrNone; + Flush(EFalse); } diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbtimer.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbtimer.cpp Wed Mar 31 23:44:31 2010 +0300 @@ -0,0 +1,99 @@ +/* +* 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: +* +*/ + + + +#include "clbslocmonitordbtimer.h" +#include "lbslocmonitordbenginedefs.h" +#include "lbsdevloggermacros.h" + + + +CLbsLocMonitorDbTimer* CLbsLocMonitorDbTimer::NewL(MLocMonitorDBCallback& aObserver) + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::NewL"); + CLbsLocMonitorDbTimer* self = new(ELeave)CLbsLocMonitorDbTimer(aObserver); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + + +void CLbsLocMonitorDbTimer::ConstructL() + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::ConstructL"); + User::LeaveIfError (iTimer.CreateLocal ()); + } + + +CLbsLocMonitorDbTimer::CLbsLocMonitorDbTimer(MLocMonitorDBCallback& aObserver): +CActive(EPriorityStandard), +iObserver(aObserver), +iRunning(EFalse) + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::CLbsLocMonitorDbTimer"); + CActiveScheduler::Add(this); + } + + +CLbsLocMonitorDbTimer::~CLbsLocMonitorDbTimer() + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::~CLbsLocMonitorDbTimer"); + Cancel(); + iTimer.Close(); + } + + +TBool CLbsLocMonitorDbTimer::IsRunning() + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::IsRunning"); + return iRunning; + } + + +TBool CLbsLocMonitorDbTimer::StartTimer(TTimeIntervalSeconds aTimeInterval) + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::StartTimer"); + TBool started = EFalse; + if(!iRunning) + { + iRunning = ETrue; + TTime targetTime; + targetTime.UniversalTime(); // target time is now and try for 5 seconds! + targetTime += aTimeInterval; + iTimer.At(iStatus, targetTime); + SetActive(); + started = ETrue; + } + return started; + } + + +void CLbsLocMonitorDbTimer::RunL() + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::RunL"); + iRunning = EFalse; + iObserver.FlushTimerCallback(); + } + + +void CLbsLocMonitorDbTimer::DoCancel() + { + LBSLOG(ELogP1,"->CLbsLocMonitorDbTimer::DoCancel"); + iTimer.Cancel(); + } diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/test/te_lbslocmonitordbsuite/group/te_lbslocationmonitordb.mmp --- a/locationmgmt/locmonitor/test/te_lbslocmonitordbsuite/group/te_lbslocationmonitordb.mmp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/test/te_lbslocmonitordbsuite/group/te_lbslocationmonitordb.mmp Wed Mar 31 23:44:31 2010 +0300 @@ -42,6 +42,7 @@ SOURCEPATH ../../../lbslocmonitorserver/src SOURCE rlbslocmonitordb.cpp SOURCE clbslocmonitordbengine.cpp +SOURCE clbslocmonitordbtimer.cpp SOURCE lbslocmonitorareainfodefs.cpp OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitordbengine.h --- a/locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitordbengine.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitordbengine.h Wed Mar 31 23:44:31 2010 +0300 @@ -22,16 +22,16 @@ //------------------------------------------------------------------------------- #include -#include -#include +#include +#include #include -//TODO remove #include "rlbslocmonitordb.h" +#include "clbslocmonitordbtimer.h" //------------------------------------------------------------------------------- /** */ -class CLbsLocMonitorDbEngine : public CActive +class CLbsLocMonitorDbEngine : public CActive, MLocMonitorDBCallback { public: @@ -43,7 +43,9 @@ TUint aCid, TPosition& aPosition, TPositionAreaExtendedInfo& aMatchingAreaInfo, TRequestStatus& aStatus); TInt GetPosition(TPosition& aPosition, TRequestStatus& aStatus); TInt ClearDatabase(); - static TInt FlushTimerCallback(TAny* aPtr); + + // from CLbsLocMonitorDbTimer + void FlushTimerCallback(); private: @@ -63,12 +65,13 @@ private: RSqlDatabase iDatabase; - CPeriodic* iPeriodic; TTimeIntervalMicroSeconds32 iFlushInterval; TInt iCount; RSqlStatement iSqlSaveStatement; TRequestStatus* iClientStatus; + CLbsLocMonitorDbTimer* iDbTimer; + TBool iDBInitialised; TInt iLastMcc; TInt iLastMnc; TInt iLastLac; diff -r af762ad247ea -r d8287cc0d36f locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitordbtimer.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locationmgmt/locmonitor/test/testlocationmonitor/inc/clbslocmonitordbtimer.h Wed Mar 31 23:44:31 2010 +0300 @@ -0,0 +1,65 @@ +/* +* 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: +* +*/ + +#ifndef LBS_LOCMONITORDBTIMER_H +#define LBS_LOCMONITORDBTIMER_H + + + +//------------------------------------------------------------------------------- +#include + + +//------------------------------------------------------------------------------- +/** +*/ + +class MLocMonitorDBCallback + { +public: + virtual void FlushTimerCallback() = 0; + }; + + + +class CLbsLocMonitorDbTimer : public CActive + { + +public: + static CLbsLocMonitorDbTimer* NewL(MLocMonitorDBCallback& aObserver); + virtual ~CLbsLocMonitorDbTimer(); + TBool IsRunning(); + TBool StartTimer(TTimeIntervalSeconds aTimeInterval); + + +private: + CLbsLocMonitorDbTimer(MLocMonitorDBCallback& aObserver); + void ConstructL(); + virtual void RunL(); + virtual void DoCancel(); + + +private: + MLocMonitorDBCallback& iObserver; + RTimer iTimer; + TBool iRunning; + }; + + + + +#endif //LBS_LOCATIONMONITORDBTIMER_H diff -r af762ad247ea -r d8287cc0d36f locationmgmt/networkgateway/group/lbs_networkgateway.mrp --- a/locationmgmt/networkgateway/group/lbs_networkgateway.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/networkgateway/group/lbs_networkgateway.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_networkgateway source \sf\os\lbs\locationmgmt\networkgateway diff -r af762ad247ea -r d8287cc0d36f locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp --- a/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_networklocationmanager source \sf\os\lbs\locationmgmt\networklocationmgr diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/locationserver/group/lbs_locationserver.mrp --- a/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_locationserver diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/locationserver/traces/osttracedefinitions.h --- a/locationrequestmgmt/locationserver/traces/osttracedefinitions.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/locationserver/traces/osttracedefinitions.h Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +* All rights reserved. +* This component and the accompanying materials are made available +* under the terms of "Eclipse Public License v1.0" +* which accompanies this distribution, and is available +* at the URL "http://www.eclipse.org/legal/epl-v10.html". +* +* Initial Contributors: +* Nokia Corporation - initial contribution. +* +* Contributors: +* +* Description: +* +*/ + #ifndef __OSTTRACEDEFINITIONS_H__ #define __OSTTRACEDEFINITIONS_H__ diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp Wed Mar 31 23:44:31 2010 +0300 @@ -29,8 +29,8 @@ SOURCE EPos_RPosRequestorStack.cpp USERINCLUDE ../inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN illigal depenancy on cntdef.h in APP layer. Needs fixing -APP_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN //Needs macro for system include for epoc32\include\lbs + LIBRARY euser.lib LIBRARY estor.lib diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/BWINS/EPOSPRVQNIFU.DEF --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/BWINS/EPOSPRVQNIFU.DEF Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -EXPORTS - ??0CPosPrivacyNotifier@@IAE@XZ @ 1 NONAME ; CPosPrivacyNotifier::CPosPrivacyNotifier(void) - ??1CPosPrivacyNotifier@@UAE@XZ @ 2 NONAME ; CPosPrivacyNotifier::~CPosPrivacyNotifier(void) - ?BaseConstructL@CPosPrivacyNotifier@@IAEXVTUid@@H@Z @ 3 NONAME ; void CPosPrivacyNotifier::BaseConstructL(class TUid, int) - ?CancelReason@CPosPrivacyNotifier@@QBE?AW4TPosVerifyCancelReason@@XZ @ 4 NONAME ; enum TPosVerifyCancelReason CPosPrivacyNotifier::CancelReason(void) const - ?CheckClientSecureId@CPosPrivacyNotifier@@QAEHVTSecureId@@@Z @ 5 NONAME ; int CPosPrivacyNotifier::CheckClientSecureId(class TSecureId) - ?CompleteAllRequests@CPosPrivacyNotifier@@QAEXH@Z @ 6 NONAME ; void CPosPrivacyNotifier::CompleteAllRequests(int) - ?CompleteRequest@CPosPrivacyNotifier@@QAEXJH@Z @ 7 NONAME ; void CPosPrivacyNotifier::CompleteRequest(long, int) - ?CurrentRequest@CPosPrivacyNotifier@@QBEJXZ @ 8 NONAME ; long CPosPrivacyNotifier::CurrentRequest(void) const - ?GetRequestsL@CPosPrivacyNotifier@@QBEXAAV?$RArray@J@@@Z @ 9 NONAME ; void CPosPrivacyNotifier::GetRequestsL(class RArray &) const - ?LocationRequestDecision@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 10 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::LocationRequestDecision(void) const - ?NotificationReason@CPosPrivacyNotifier@@QBE?AW4TPosNotificationReason@@XZ @ 11 NONAME ; enum TPosNotificationReason CPosPrivacyNotifier::NotificationReason(void) const - ?NotifierBase@CPosPrivacyNotifier@@QBEPAVMEikSrvNotifierBase2@@XZ @ 12 NONAME ; class MEikSrvNotifierBase2 * CPosPrivacyNotifier::NotifierBase(void) const - ?QueryTimeoutStrategy@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 13 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy(void) const - ?RequestSource@CPosPrivacyNotifier@@QBE?AW4TPosRequestSource@@XZ @ 14 NONAME ; enum TPosRequestSource CPosPrivacyNotifier::RequestSource(void) const - ?RequestTypeL@CPosPrivacyNotifier@@QBE?AW4TRequestType@1@J@Z @ 15 NONAME ; enum CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL(long) const - ?RequestorCountL@CPosPrivacyNotifier@@QBEHXZ @ 16 NONAME ; int CPosPrivacyNotifier::RequestorCountL(void) const - ?RequestorLC@CPosPrivacyNotifier@@QBEPAVCPosRequestor@@H@Z @ 17 NONAME ; class CPosRequestor * CPosPrivacyNotifier::RequestorLC(int) const - ?SetCurrentRequestL@CPosPrivacyNotifier@@QAEXJ@Z @ 18 NONAME ; void CPosPrivacyNotifier::SetCurrentRequestL(long) - diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/EABI/eposprvqnifU.DEF --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/EABI/eposprvqnifU.DEF Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN19CPosPrivacyNotifier14BaseConstructLE4TUidi @ 1 NONAME - _ZN19CPosPrivacyNotifier15CompleteRequestEli @ 2 NONAME - _ZN19CPosPrivacyNotifier18SetCurrentRequestLEl @ 3 NONAME - _ZN19CPosPrivacyNotifier19CheckClientSecureIdE9TSecureId @ 4 NONAME - _ZN19CPosPrivacyNotifier19CompleteAllRequestsEi @ 5 NONAME - _ZN19CPosPrivacyNotifierC2Ev @ 6 NONAME - _ZN19CPosPrivacyNotifierD0Ev @ 7 NONAME - _ZN19CPosPrivacyNotifierD1Ev @ 8 NONAME - _ZN19CPosPrivacyNotifierD2Ev @ 9 NONAME - _ZNK19CPosPrivacyNotifier11RequestorLCEi @ 10 NONAME - _ZNK19CPosPrivacyNotifier12CancelReasonEv @ 11 NONAME - _ZNK19CPosPrivacyNotifier12GetRequestsLER6RArrayIlE @ 12 NONAME - _ZNK19CPosPrivacyNotifier12NotifierBaseEv @ 13 NONAME - _ZNK19CPosPrivacyNotifier12RequestTypeLEl @ 14 NONAME - _ZNK19CPosPrivacyNotifier13RequestSourceEv @ 15 NONAME - _ZNK19CPosPrivacyNotifier14CurrentRequestEv @ 16 NONAME - _ZNK19CPosPrivacyNotifier15RequestorCountLEv @ 17 NONAME - _ZNK19CPosPrivacyNotifier18NotificationReasonEv @ 18 NONAME - _ZNK19CPosPrivacyNotifier20QueryTimeoutStrategyEv @ 19 NONAME - _ZNK19CPosPrivacyNotifier23LocationRequestDecisionEv @ 20 NONAME - _ZTI19CPosPrivacyNotifier @ 21 NONAME ; ## - _ZTV19CPosPrivacyNotifier @ 22 NONAME ; ## - diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf Wed Mar 31 23:44:31 2010 +0300 @@ -14,21 +14,13 @@ // - -#include "../test/group/bld.inf" - PRJ_EXPORTS ../inc/EPos_PrivacyNotifier.hrh /epoc32/include/lbs/epos_privacynotifier.hrh -../inc/EPos_CPosPrivacyNotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/epos_cposprivacynotifier.h) - -lbsqueryandnotification.iby /epoc32/rom/include/lbsqueryandnotification.iby -// This file does not have to be exported. NRH should use relative path instead. -//..\inc\EPos_TPosQNInputData.h OSEXT_LAYER_SOURCE_PATH(locationextensions\privacyframework\inc\EPos_TPosQNInputData.h) +// File needs to be exported to allow UI layer to access it. Otherwise code duplication/differentiation will occur. +..\inc\EPos_TPosQNInputData.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/EPos_TPosQNInputData.h) -PRJ_MMPFILES -EPos_PrivacyQNInterface.mmp // End of file diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/EPos_PrivacyQNInterface.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/EPos_PrivacyQNInterface.mmp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -TARGET eposprvqnif.dll -TARGETTYPE dll -UID 0x1000008d 0x101f7a88 - -VENDORID 0x70000001 -CAPABILITY ALL -TCB - -SOURCEPATH ../src -SOURCE EPos_CPosPrivacyNotifier.cpp -SOURCE EPos_CPosPrivacyNotifierExtension.cpp -SOURCE EPos_CPosRequestHandler.cpp - -USERINCLUDE ../inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN illigal dependancy. depends on cntdef.h in app layer. needs fixing -APP_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib -LIBRARY estor.lib -LIBRARY eiksrv.lib -LIBRARY eposprvtyp.lib - -SMPSAFE diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/lbsqueryandnotification.iby --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/lbsqueryandnotification.iby Mon Mar 15 12:45:55 2010 +0200 +++ /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: -* -*/ -#ifndef __LBS_QUERYANDNOTIFICATION_IBY__ -#define __LBS_QUERYANDNOTIFICATION_IBY__ - - -REM LBS Query And Notification Api - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) && defined(SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG) - -file=ABI_DIR\DEBUG_DIR\eposprvqnif.dll System\libs\eposprvqnif.dll - -#endif // SYMBIAN_EXCLUDE_LOCATION && SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG - -#endif diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifier.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifier.h Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -/* -* Copyright (c) 2005-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: -* -*/ - - - -#ifndef CPOSPRIVACYNOTIFIER_H -#define CPOSPRIVACYNOTIFIER_H - -// INCLUDES -#include -#include - -// DATA TYPES -/** -@publishedPartner -@deprecated -*/ -typedef TInt32 TPosQNRequestId; - -// CONSTANT DECLARATIONS -/** -@publishedPartner -@deprecated -*/ -const TPosQNRequestId KPosNullQNRequestId = -1; - -// FORWARD DECLARATIONS -class CPosPrivacyNotifierExtension; -class CPosRequestor; -class MEikSrvNotifierBase2; - -// CLASS DECLARATION -/** -Base class for LBS Privacy Query & Notify (Q&N) privacy notifiers. - -A privacy notifier is a UI plug-in which handles privacy query and -notification requests. - -This class contains declarations for event methods that must be implemented -by the notifier in order to receive information about new requests or -cancelled requests. - -It also contains methods for accessing information about a request and for -completing a request. - -@publishedPartner -@deprecated -*/ -class CPosPrivacyNotifier : public CBase - { - public: - /** - Specifies whether the requested dialog should be a query or a - notification dialog. - */ - enum TRequestType { - /** Query dialog requested. */ - EQuery = 0, - /** Notification dialog requested. */ - ENotification - }; - - public: - IMPORT_C virtual ~CPosPrivacyNotifier(); - - public: - - /** - * This method is called when a new privacy query or notification has - * been requested. - * - * @param aRequestId The ID of the new query or notification request. - */ - virtual void HandleNewRequestL( - /* IN */ TPosQNRequestId aRequestId - ) = 0; - - /** - * This method is called when a privacy query or notification request is - * cancelled. - * - * It is not necessary to call @ref CompleteRequest for a cancelled - * request. - * - * @param aRequestId The ID of the cancelled query or notification - * request. - */ - virtual void HandleRequestCancelled( - /* IN */ TPosQNRequestId aRequestId - ) = 0; - - /** - * This method is called to cancel all outstanding requests. - * - * It is not necessary to call @ref CompleteRequest for a cancelled - * request. - */ - virtual void HandleAllRequestCancelled() = 0; - - IMPORT_C MEikSrvNotifierBase2* NotifierBase() const; - IMPORT_C TPosVerifyCancelReason CancelReason() const; - IMPORT_C void GetRequestsL(RArray& aRequestArray) const; - IMPORT_C TRequestType RequestTypeL(TPosQNRequestId aRequestId) const; - IMPORT_C void SetCurrentRequestL(TPosQNRequestId aRequestId); - IMPORT_C TPosQNRequestId CurrentRequest() const; - IMPORT_C TPosRequestDecision QueryTimeoutStrategy() const; - IMPORT_C TPosRequestSource RequestSource() const; - IMPORT_C TPosRequestDecision LocationRequestDecision() const; - IMPORT_C TPosNotificationReason NotificationReason() const; - IMPORT_C TInt RequestorCountL() const; - IMPORT_C CPosRequestor* RequestorLC(TInt aRequestorIndex) const; - IMPORT_C void CompleteRequest(TPosQNRequestId aRequestId, TInt aCompletionCode); - IMPORT_C void CompleteAllRequests(TInt aCompletionCode); - IMPORT_C TBool CheckClientSecureId(TSecureId aSecureId); - - protected: - IMPORT_C CPosPrivacyNotifier(); - IMPORT_C void BaseConstructL(TUid aChannel,TInt aPriority); - - private: - // By default, prohibit copy constructor - CPosPrivacyNotifier( const CPosPrivacyNotifier& ); - // Prohibit assigment operator - CPosPrivacyNotifier& operator= ( const CPosPrivacyNotifier& ); - - private: - CPosPrivacyNotifierExtension* iExtension; - }; - -#endif // CPOSPRIVACYNOTIFIER_H diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifierExtension.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifierExtension.h Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,204 +0,0 @@ -/* -* Copyright (c) 2005-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 - @internalComponent - @released -*/ - -#ifndef CPOSPRIVACYNOTIFIEREXTENSION_H -#define CPOSPRIVACYNOTIFIEREXTENSION_H - -// INCLUDES -#include -#include -#include "EPos_TPosQNInputData.h" - -// FORWARD DECLARATIONS -class CPosRequestHandler; - -// CLASS DECLARATION - -/** -* The privacy notifier extension helper class. -*/ -NONSHARABLE_CLASS(CPosPrivacyNotifierExtension) : public CBase, public MEikSrvNotifierBase2 - { - public: - - /** - * Two-phased constructor. - */ - static CPosPrivacyNotifierExtension* NewL( - CPosPrivacyNotifier* aPrivNotifier); - - /** - * Destructor. - */ - ~CPosPrivacyNotifierExtension(); - - public: // New functions - - /** - * Finds the request id in the array which matches the specified - * request id. - * @param aRequestId The id of a query or notification request. - * @return The index of the matching request id within the array. - * KErrNotFound, if no matching request id can be found. - */ - TInt Find(TPosQNRequestId aRequestId) const; - - /** - * Resets data - */ - void ResetData(); - - /** - * Removes a request from the array containing all outstanding requests. - * @param aRequestId The id of a query or notification request. - * @return The index of the matching request id within the array. - * KErrNotFound, if no matching request id can be found. - */ - TInt RemoveRequestFromArray(TPosQNRequestId aRequestId); - - /** - * Empties the array containing all outstanding requests. - */ -// void RemoveAllRequestsFromArray(); - - /** - * Prepares the current request by getting RequestorStack. - */ - void PrepareL(TPosQNRequestId aRequestId); - - /** - * This method completes a privacy query or notification request. - * - * @param aRequestId The id of the privacy query or notification request - * to complete. - * @param aCompletionCode The request completion code. - */ - void CompleteRequest( - /* IN */ TPosQNRequestId aRequestId, - /* IN */ TInt aCompletionCode - ); - - /** - * This method completes all outstanding requests. - * - * This function should be used if a serious error is encountered. All - * requests can then be completed with the same error code. - * - * @param aCompletionCode The request completion code. - */ - void CompleteAllRequests( - /* IN */ TInt aCompletionCode - ); - - public: // Functions from base classes - - /** - * From MEikSrvNotifierBase2 Called to destroy notifier. - */ - void Release(); - - /** - * From MEikSrvNotifierBase2 Called when the DLL is loaded. - * @return info object containing UID, channel and priority - */ - TNotifierInfo RegisterL(); - - /** - * From MEikSrvNotifierBase2 - * @return info object containing UID, channel and priority - */ - TNotifierInfo Info() const; - - /** - * From MEikSrvNotifierBase2 - * - * Not supported, leaves if called. - * @param aBuffer Input descriptor. Not used. - * @return TPtrC8 - */ - TPtrC8 StartL(const TDesC8& aBuffer); - - /** - * From MEikSrvNotifierBase2 - * - * @param aBuffer Input descriptor, contains the format. Not used. - * @param aReplySlot Reply slot. Not used. - * @param aMessage Used to write data back to client - */ - void StartL( - const TDesC8& aBuffer, - TInt aReplySlot, - const RMessagePtr2& aMessage - ); - - /** - * From MEikSrvNotifierBase2 - * Cancels all outstanding requests. - */ - void Cancel(); - - /** - * From MEikSrvNotifierBase2 - * Starts the notifier dialog. - * @param aBuffer Input descriptor, contains the format. - * A TPosQNInputData is expected as input. - * @return TPtrC8 - */ - TPtrC8 UpdateL(const TDesC8& aBuffer); - - private: - /** - * C++ default constructor. - */ - CPosPrivacyNotifierExtension(); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL(CPosPrivacyNotifier* aPrivNotifier); - - // By default, prohibit copy constructor - CPosPrivacyNotifierExtension(const CPosPrivacyNotifierExtension&); - // Prohibit assigment operator - CPosPrivacyNotifierExtension& operator= ( - const CPosPrivacyNotifierExtension&); - - public: // Data - TNotifierInfo iNotifierInfo; - RArray iRequestArray; - TPosQNRequestId iCurrentRequestId; - RPosRequestorStack iRequestorStack; - RMessagePtr2 iMessage; - - private: // Data - CPosPrivacyNotifier* iPrivacyNotifier; - CPosRequestHandler* iRequestHandler; - - }; - -#endif // CPOSPRIVACYNOTIFIEREXTENSION_H - -// End of File diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosRequestHandler.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosRequestHandler.h Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -/* -* Copyright (c) 2005-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 - @internalComponent - @released -*/ - -#ifndef EPOS_CPOSREQUESTHANDLER_H -#define EPOS_CPOSREQUESTHANDLER_H - -// INCLUDES -#include -#include "EPos_TPosQNInputData.h" - -// FORWARD DECLARATIONS -class CPosPrivacyNotifier; - -// CLASS DECLARATION - -/** -* The privacy notifier request handling helper class. -*/ -NONSHARABLE_CLASS(CPosRequestHandler) : public CActive - { - public: // Constructors and destructors - - /** - * Two-phased constructor. - */ - static CPosRequestHandler* NewL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension); - - /** - * Destructor. - */ - ~CPosRequestHandler(); - - public: // New functions - - /** - * Starts the active scheduler. - * @param aInputData Data containing update parameters. - */ - void ScheduleRequest(const TPosQNInputData& aInputData); - - protected: // Functions from base classes - - /** - * From CActive. - */ - void RunL(); - - /** - * From CActive. - */ - void DoCancel(); - - /** - * From CActive. - */ - TInt RunError(TInt aError); - - private: - - /** - * Private C++ default constructor. - */ - CPosRequestHandler(); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension); - - private: // Data - - CPosPrivacyNotifier* iPrivacyNotifier; - CPosPrivacyNotifierExtension* iExtension; - TPosQNInputData iInputData; - -}; - -#endif // EPOS_CPOSREQUESTHANDLER_H - diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h Wed Mar 31 23:44:31 2010 +0300 @@ -29,13 +29,14 @@ // INCLUDES #include -#include + // FORWARD DECLARATIONS // CLASS DECLARATION const TInt KPosQNInputDataClassSize = 36; +typedef TInt32 TPosQNRequestId; /** * Data sent in Query/Notification communication. diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifier.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifier.cpp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,488 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -#include -#include -#include -#include -#include "EPos_CPosPrivacyNotifierExtension.h" - -#if defined(NRH_UNIT_TEST) -// For the NRH unit test, use a custom notifier UID. -// This is so that we can have both the unit test -// Q&N notifier and the integration test Q&N notifier -// (using the real UID) in the same ROM. -const TUid KNotifierUid = { 0x10283744 }; -#else -const TUid KNotifierUid = { KPosPrivacyNotifierImplUid }; -#endif // NRH_UNIT_TEST - - -// --------------------------------------------------------------------------- -/** -Default constructor. - -This constructor assumes that the notifier only supports -EBasicCapabilities, i.e. the notifier supports queries but only -notifications of accepted requests are supported. If the notifier -is more advanced, the overloaded constructor should be used. -*/ -EXPORT_C CPosPrivacyNotifier::CPosPrivacyNotifier() - { - } - -// --------------------------------------------------------------------------- -/** -Symbian 2nd phase constructor. Must be called first thing during construction. - -The notifier must specify channel and priority. These attributes are -defined by the Notifier Framework in eiknotapi.h. - -The different priority values are defined in -MEikSrvNotifierBase2::TNotifierPriority. - -@param aChannel A channel. See definition in Notifier Framework. -@param aPriority A notifier priority. See definition in Notifier Framework. - -@see MEikSrvNotifierBase2::TNotifierPriority -*/ -EXPORT_C void CPosPrivacyNotifier::BaseConstructL( - TUid aChannel, - TInt aPriority) - { - iExtension = CPosPrivacyNotifierExtension::NewL(this); - iExtension->iNotifierInfo.iChannel = aChannel; - iExtension->iNotifierInfo.iPriority = aPriority; - iExtension->iNotifierInfo.iUid = KNotifierUid; - } - -// --------------------------------------------------------------------------- -EXPORT_C CPosPrivacyNotifier::~CPosPrivacyNotifier() - { - delete iExtension; - } - -// --------------------------------------------------------------------------- -/** -Retrieves a handle to the notifier base. - -This handle is needed to populate the notifier base array in the -notifier factory method. - -@return A handle to the notifier base. -*/ -EXPORT_C MEikSrvNotifierBase2* CPosPrivacyNotifier::NotifierBase() const - { - return iExtension; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the cancel reason. - -Cancel reason can only be retrieved when HandleRequestCancelled or -HandleAllRequestCancelled is running. If the method is called at another -time, it will return ECancelReasonNotAvailable. - -Note that the TCancelReason enum is designed to be extendable, -i.e. new values may be added in the future. This means that any -unrecognized value must be treated like ECancelReasonNotAvailable. - -@return The cancel reason. - -@see HandleRequestCancelled() -@see HandleAllRequestCancelled() -@see ECancelReasonNotAvailable -@see TCancelReason -*/ -EXPORT_C TPosVerifyCancelReason - CPosPrivacyNotifier::CancelReason() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound) - { - return EPosCancelReasonNotAvailable; - } - - return iExtension->iRequestArray[index].iCancelReason; - } - -// --------------------------------------------------------------------------- -/** -Returns a list of all outstanding privacy query and notification requests. - -If there are no outstanding requests, an empty array will be returned. - -@param aRequestArray On return, this array will contain all - outstanding query and notification requests. -*/ -EXPORT_C void CPosPrivacyNotifier::GetRequestsL( - RArray& aRequestArray) const - { - aRequestArray.Reset(); - for (TInt i = 0; i < iExtension->iRequestArray.Count(); i++) - { - User::LeaveIfError( - aRequestArray.Append(iExtension->iRequestArray[i].iId)); - } - } - -// --------------------------------------------------------------------------- -/** -Checks whether a request is privacy query or notification type. - -@param aRequestId The ID of the request to check. -@return @p EQuery if query type and ENotification if notification type. - -@leave If the specified request is not an outstanding request, this method - will leave with error code KErrNotFound. -*/ -EXPORT_C CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL( - TPosQNRequestId aRequestId) const - { - TInt index = iExtension->Find(aRequestId); - __ASSERT_ALWAYS(index != KErrNotFound, User::Leave(KErrNotFound)); - - if (iExtension->iRequestArray[index].iType == - TPosQNInputData::EQuery) - { - return CPosPrivacyNotifier::EQuery; - } - - return CPosPrivacyNotifier::ENotification; - } - -// --------------------------------------------------------------------------- -/** -Sets the request which the notifier wants to read information about. - -Current request specifies the request which will be accessed when -RequestorCountL and RequestorLC are called. - -@param aRequestId The ID of the current request. - -@leave If the specified request is not an outstanding request, this method - will leave with error code KErrNotFound. -*/ -EXPORT_C void CPosPrivacyNotifier::SetCurrentRequestL( - TPosQNRequestId aRequestId) - { - iExtension->PrepareL(aRequestId); - } - -// --------------------------------------------------------------------------- -/** -Returns the ID of the current request. - -Current request specifies the request which will be accessed when -RequestorCountL and RequestorLC are called. - -@return The ID of the current request. If the current request has - become invalid, e.g. the request set as current has been cancelled, - KPosNullQNRequestId will be returned. - -@see RequestorCountL() -@see RequestorLC() -*/ -EXPORT_C TPosQNRequestId CPosPrivacyNotifier::CurrentRequest() const - { - return iExtension->iCurrentRequestId; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the timeout strategy for a query. - -Timeout strategy specifies what the decision will be if the -verification query times out. The decision is either -EPosDecisionRejected or EPosDecisionAccepted. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Timeout strategy can only be retrieved for a query request. If the -current request is a notification, this method will return -EPosDecisionNotAvailable. - -Note that the TPosRequestDecision enum is designed to be -extendable, i.e. new values may be added in the future. This means -that any unrecognized value must be treated like -EPosDecisionNotAvailable. - -@return The timeout strategy. - -@see SetCurrentRequestL() -*/ -EXPORT_C TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == - TPosQNInputData::ENotification) - { - return EPosDecisionNotAvailable; - } - - return iExtension->iRequestArray[index].iTimeoutStrategy; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the source of the location request. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Note that the TPosRequestSource enum is designed to be extendable, -i.e. new values may be added in the future. This means that any -unrecognized value must be treated like EPosRequestSourceNotAvailable. - -@return The request source, e.g. EPosRequestSourceNetwork or - EPosRequestSourceNotAvailable if the request source is not specified. - -@see SetCurrentRequestL() -@see TPosRequestSource -*/ -EXPORT_C TPosRequestSource CPosPrivacyNotifier::RequestSource() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound) - { - return EPosRequestSourceNotAvailable; - } - - return iExtension->iRequestArray[index].iRequestSource; - } - -// --------------------------------------------------------------------------- -/** -Retrieves whether the location request was accepted or rejected. - -For notification requests, this method will return the request -decision. For queries, this method will return EPosDecisionNotAvailable. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL, otherwise this method will return -EPosDecisionNotAvailable. - -Note that the TPosRequestDecision enum is designed to be -extendable, i.e. new values may be added in the future. -This means that any unrecognized value must be treated like -EPosDecisionNotAvailable. - -@return Whether the location request was accepted or rejected, or - EPosDecisionNotAvailable if the outcome has not yet been decided. - -@see SetCurrentRequestL() -@see TPosRequestDecision -*/ -EXPORT_C TPosRequestDecision - CPosPrivacyNotifier::LocationRequestDecision() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == TPosQNInputData::EQuery) - { - return EPosDecisionNotAvailable; - } - - return iExtension->iRequestArray[index].iRequestDecision; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the reason for a notification. - -Note that the TPosNotificationReason enum is designed to be -extendable, i.e. new values may be added in the future. This means -that any unrecognized value must be treated like -EPosNotificationReasonNotAvailable. -If the notification reason is not known, the notification request -should be completed with code KErrNotSupported. - -@return The notification reason. - For queries, this method will return EPosNotificationReasonNotAvailable. - - Before calling this method, current request must first be set by - calling SetCurrentRequestL, otherwise this method will return - EPosNotificationReasonNotAvailable. - -@see EPosNotificationReasonNotAvailable -@see SetCurrentRequestL() -@see TPosNotificationReason -*/ -EXPORT_C TPosNotificationReason CPosPrivacyNotifier::NotificationReason() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == TPosQNInputData::EQuery) - { - return EPosNotificationReasonNotAvailable; - } - - return iExtension->iRequestArray[index].iNotificationReason; - } - -// --------------------------------------------------------------------------- -/** -Returns the number of requestors in the current request. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -@return The number of requestors in the current request. - -@leave If the current request has not been set or the current request is no - longer valid, e.g. because it has been cancelled or completed, this - method will leave with error code KErrNotFound. - -@see SetCurrentRequestL() -*/ -EXPORT_C TInt CPosPrivacyNotifier::RequestorCountL() const - { - __ASSERT_ALWAYS(CurrentRequest() != KPosNullQNRequestId, - User::Leave(KErrNotFound)); - - return iExtension->iRequestorStack.Count(); - } - -// --------------------------------------------------------------------------- -/** -Returns basic information about the requestor at a specified index. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Whether the requestor is a contact or a service can be found by -calling CPosRequestor::RequestorType. - -If the requestor is a contact, the requestor object can be cast to -CPosContactRequestor. - -If the requestor is a service, the requestor object can be cast to -CPosServiceRequestor. - -@param aRequestorIndex The index of the requestor. -@return Information about the requestor. - -@leave If the specified requestor index is not valid, i.e. less than 0 or - larger than or equal to RequestorCountL, this method will - leave with error code KErrArgument. - - If the current request has not been set or the current request is no - longer valid, e.g. because it has been cancelled or completed, this method - will leave with error code KErrNotFound. - -@see SetCurrentRequestL() -@see RequestorCountL() -@see CPosContactRequestor -@see CPosServiceRequestor -@see CPosRequestor::RequestorType -*/ -EXPORT_C CPosRequestor* CPosPrivacyNotifier::RequestorLC( - TInt aRequestorIndex) const - { - __ASSERT_ALWAYS(CurrentRequest() != KPosNullQNRequestId, - User::Leave(KErrNotFound)); - - __ASSERT_ALWAYS(aRequestorIndex >= 0 && - aRequestorIndex < iExtension->iRequestorStack.Count(), - User::Leave(KErrArgument)); - - CPosRequestor* requestor = iExtension->iRequestorStack[aRequestorIndex]; - TInt type = requestor->RequestorType(); - CPosRequestor::TRequestorIdFormat format = requestor->RequestorIdFormat(); - TPtrC idString = requestor->RequestorIdString(); - - if (type == CPosRequestor::ERequestorService) - { - CPosServiceRequestor* serviceRequestor = CPosServiceRequestor::NewLC(format, idString); - serviceRequestor->SetRequestType(requestor->RequestType()); - serviceRequestor->SetNetworkType(requestor->NetworkType()); - return serviceRequestor; - } - - CPosContactRequestor* contactRequestor = CPosContactRequestor::NewLC(format, idString); - contactRequestor->SetRequestType(requestor->RequestType()); - contactRequestor->SetNetworkType(requestor->NetworkType()); - return contactRequestor; - } - -// --------------------------------------------------------------------------- -/** -This method completes a privacy query or notification request. - -@param aRequestId The ID of the privacy query or notification request - to complete. -@param aCompletionCode The request completion code. - If the request is a privacy query, the completion code should be one of: - - KErrNone if query is accepted by the phone user. - - KErrAccessDenied if query is rejected by the phone user. - - KErrTimedOut if the query times out. - - If the request is a privacy notification, the completion code should be one of: - - KErrNone if the phone user dismisses the privacy notification - - KErrTimedOut if the notification times out. -*/ -EXPORT_C void CPosPrivacyNotifier::CompleteRequest( - TPosQNRequestId aRequestId, - TInt aCompletionCode) - { - iExtension->CompleteRequest(aRequestId, aCompletionCode); - } - -// --------------------------------------------------------------------------- -/** -This method completes all outstanding requests. - -This method can be used to accept or reject all outstanding -requests by completing with codes @p KErrNone or @p KErrAccessDenied -respectively. All notification requests will also be completed with -this code. - -@param aCompletionCode The request completion code. -*/ -EXPORT_C void CPosPrivacyNotifier::CompleteAllRequests(TInt aCompletionCode) - { - iExtension->CompleteAllRequests(aCompletionCode); - } - -// --------------------------------------------------------------------------- -/** -Checks that the Privacy UI was launched by the expected client. - -The caller specifies the secure ID of the expected client and this -method returns whether the Privacy UI was launched by that client or not. - -@param aSecureId The secureID of the expected client -@return ETrue if the client that called the notifier is the expected client -*/ -#pragma message("NOTE: CPosPrivacyNotifier::CheckClientSecureId has no type/return definition.") -EXPORT_C TBool CPosPrivacyNotifier::CheckClientSecureId(TSecureId aSecureId) - { - return iExtension->iMessage.SecureId() == aSecureId; - } diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifierExtension.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifierExtension.cpp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,279 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -// INCLUDE FILES -#include -#include -#include "EPos_CPosPrivacyNotifierExtension.h" -#include "EPos_CPosRequestHandler.h" - -// ================= MEMBER FUNCTIONS ======================= - -// C++ default constructor can NOT contain any code, that -// might leave. -// -CPosPrivacyNotifierExtension::CPosPrivacyNotifierExtension() - { - } - -// ----------------------------------------------------------------------------- -// CPosPrivacyNotifierExtension::ConstructL -// Symbian 2nd phase constructor can leave. -// ----------------------------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::ConstructL( - CPosPrivacyNotifier* aPrivNotifier) - { - iRequestHandler = CPosRequestHandler::NewL(aPrivNotifier, this); - iPrivacyNotifier = aPrivNotifier; - ResetData(); - } - -// Two-phased constructor -CPosPrivacyNotifierExtension* CPosPrivacyNotifierExtension::NewL( - CPosPrivacyNotifier* aPrivNotifier) - { - CPosPrivacyNotifierExtension* self = new (ELeave) - CPosPrivacyNotifierExtension; - CleanupStack::PushL(self); - self->ConstructL(aPrivNotifier); - CleanupStack::Pop(self); - return self; - } - -// Destructor -CPosPrivacyNotifierExtension::~CPosPrivacyNotifierExtension() - { - iRequestorStack.ResetAndDestroy(); - iRequestArray.Close(); - delete iRequestHandler; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Find -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosPrivacyNotifierExtension::Find(TPosQNRequestId aRequestId) const - { - for (TInt index = 0; index < iRequestArray.Count(); index++) - { - if (iRequestArray[index].iId == aRequestId) - { - return index; - } - } - return KErrNotFound; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::ResetData -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::ResetData() - { - iRequestorStack.ResetAndDestroy(); - iCurrentRequestId = KPosNullQNRequestId; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::RemoveRequestFromArray -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosPrivacyNotifierExtension::RemoveRequestFromArray( - TPosQNRequestId aRequestId) - { - TInt index = Find(aRequestId); - if (index == KErrNotFound) - { - return KErrNotFound; - } - - iRequestArray.Remove(index); - return index; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::PrepareL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::PrepareL( - TPosQNRequestId aRequestId) - { - TInt index = Find(aRequestId); - __ASSERT_ALWAYS(index != KErrNotFound, User::Leave(KErrNotFound)); - - iCurrentRequestId = aRequestId; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::CompleteRequest -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::CompleteRequest( - TPosQNRequestId aRequestId, - TInt aCompletionCode) - { - if (RemoveRequestFromArray(aRequestId) != KErrNotFound) - { - iMessage.Complete(aCompletionCode); - ResetData(); - } - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::CompleteAllRequests -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::CompleteAllRequests(TInt aCompletionCode) - { - CompleteRequest(iCurrentRequestId, aCompletionCode); - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Release -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::Release() - { - delete iPrivacyNotifier; - iPrivacyNotifier = NULL; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::RegisterL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -CPosPrivacyNotifierExtension::TNotifierInfo - CPosPrivacyNotifierExtension::RegisterL() - { - return iNotifierInfo; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Info -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -CPosPrivacyNotifierExtension::TNotifierInfo - CPosPrivacyNotifierExtension::Info() const - { - return iNotifierInfo; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::StartL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TPtrC8 CPosPrivacyNotifierExtension::StartL(const TDesC8& /*aBuffer*/) - { - User::Leave(KErrNotSupported); - return TPtrC8(); - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::StartL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::StartL( - const TDesC8& /*aBuffer*/, - TInt /*aReplySlot*/, - const RMessagePtr2& aMessage) - { - iMessage = aMessage; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Cancel -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::Cancel() - { - if (iRequestArray.Count() > 0) - { - TPosQNRequestId reqId = iRequestArray[0].iId; - iPrivacyNotifier->HandleRequestCancelled(reqId); - CompleteRequest(reqId, KErrCancel); - } - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::UpdateL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TPtrC8 CPosPrivacyNotifierExtension::UpdateL(const TDesC8& aBuffer) - { - TPtrC8 tposQnData = aBuffer.Left(KPosQNInputDataClassSize); - - TPckgBuf input; - input.Copy(tposQnData); - TPosQNInputData update = input(); - - TInt index = Find(update.iId); - if (update.iCancelReason == EPosCancelReasonNotAvailable || - (update.iCancelReason == EPosCancelReasonTimeout && - update.iNotificationReason == EPosVerificationTimeout) ) - { - HBufC8* buf = HBufC8::NewLC(update.iDataSize); - TPtrC8 bufPtr = aBuffer.Mid(KPosQNInputDataClassSize); - - RDesReadStream stream(bufPtr); - CleanupClosePushL(stream); - iRequestorStack.InternalizeL(stream); - CleanupStack::PopAndDestroy(2, buf); //buf, stream - - User::LeaveIfError(iRequestArray.Append(update)); - iRequestHandler->ScheduleRequest(update); - } - else - { - if (index == KErrNotFound) - { - User::Leave(KErrArgument); - } - - iRequestArray[index].iCancelReason = update.iCancelReason; - } - - return TPtrC8(); - } - -// End of File diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosRequestHandler.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosRequestHandler.cpp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -#include "EPos_CPosRequestHandler.h" -#include -#include "EPos_CPosPrivacyNotifierExtension.h" - -// ================= MEMBER FUNCTIONS ======================= - -// C++ default constructor can NOT contain any code, that -// might leave. -// -CPosRequestHandler::CPosRequestHandler() : - CActive(CActive::EPriorityHigh) - { - } - -// EPOC default constructor can leave. -void CPosRequestHandler::ConstructL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension) - { - iPrivacyNotifier = aNotifier; - iExtension = aExtension; - CActiveScheduler::Add(this); - } - -// Two-phased constructor. -CPosRequestHandler* CPosRequestHandler::NewL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension) - { - CPosRequestHandler* self = - new(ELeave) CPosRequestHandler; - CleanupStack::PushL(self); - self->ConstructL(aNotifier, aExtension); - CleanupStack::Pop(self); - return self; - } - -// Destructor -CPosRequestHandler::~CPosRequestHandler() - { - Cancel(); - } - -// --------------------------------------------------------- -// CPosRequestHandler::ScheduleRequest -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::ScheduleRequest(const TPosQNInputData& aInputData) - { - iInputData = aInputData; - - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete(status, KErrNone); - } - -// --------------------------------------------------------- -// CPosRequestHandler::RunL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::RunL() - { - iPrivacyNotifier->HandleNewRequestL(iInputData.iId); - } - -// --------------------------------------------------------- -// CPosRequestHandler::DoCancel -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::DoCancel() - { - } - -// --------------------------------------------------------- -// CPosRequestHandler::RunError -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosRequestHandler::RunError(TInt aError) - { - iExtension->CompleteRequest(iInputData.iId, aError); - return KErrNone; - } - -// End of File diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/bwins/t_eposprvqnifu.def --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/bwins/t_eposprvqnifu.def Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -EXPORTS - ??0CPosPrivacyNotifier@@IAE@XZ @ 1 NONAME ; CPosPrivacyNotifier::CPosPrivacyNotifier(void) - ??1CPosPrivacyNotifier@@UAE@XZ @ 2 NONAME ; CPosPrivacyNotifier::~CPosPrivacyNotifier(void) - ?BaseConstructL@CPosPrivacyNotifier@@IAEXVTUid@@H@Z @ 3 NONAME ; void CPosPrivacyNotifier::BaseConstructL(class TUid, int) - ?CancelReason@CPosPrivacyNotifier@@QBE?AW4TPosVerifyCancelReason@@XZ @ 4 NONAME ; enum TPosVerifyCancelReason CPosPrivacyNotifier::CancelReason(void) const - ?CheckClientSecureId@CPosPrivacyNotifier@@QAEHVTSecureId@@@Z @ 5 NONAME ; int CPosPrivacyNotifier::CheckClientSecureId(class TSecureId) - ?CompleteAllRequests@CPosPrivacyNotifier@@QAEXH@Z @ 6 NONAME ; void CPosPrivacyNotifier::CompleteAllRequests(int) - ?CompleteRequest@CPosPrivacyNotifier@@QAEXJH@Z @ 7 NONAME ; void CPosPrivacyNotifier::CompleteRequest(long, int) - ?CurrentRequest@CPosPrivacyNotifier@@QBEJXZ @ 8 NONAME ; long CPosPrivacyNotifier::CurrentRequest(void) const - ?GetRequestsL@CPosPrivacyNotifier@@QBEXAAV?$RArray@J@@@Z @ 9 NONAME ; void CPosPrivacyNotifier::GetRequestsL(class RArray &) const - ?LocationRequestDecision@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 10 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::LocationRequestDecision(void) const - ?NotificationReason@CPosPrivacyNotifier@@QBE?AW4TPosNotificationReason@@XZ @ 11 NONAME ; enum TPosNotificationReason CPosPrivacyNotifier::NotificationReason(void) const - ?NotifierBase@CPosPrivacyNotifier@@QBEPAVMEikSrvNotifierBase2@@XZ @ 12 NONAME ; class MEikSrvNotifierBase2 * CPosPrivacyNotifier::NotifierBase(void) const - ?QueryTimeoutStrategy@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 13 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy(void) const - ?RequestSource@CPosPrivacyNotifier@@QBE?AW4TPosRequestSource@@XZ @ 14 NONAME ; enum TPosRequestSource CPosPrivacyNotifier::RequestSource(void) const - ?RequestTypeL@CPosPrivacyNotifier@@QBE?AW4TRequestType@1@J@Z @ 15 NONAME ; enum CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL(long) const - ?RequestorCountL@CPosPrivacyNotifier@@QBEHXZ @ 16 NONAME ; int CPosPrivacyNotifier::RequestorCountL(void) const - ?RequestorLC@CPosPrivacyNotifier@@QBEPAVCPosRequestor@@H@Z @ 17 NONAME ; class CPosRequestor * CPosPrivacyNotifier::RequestorLC(int) const - ?SetCurrentRequestL@CPosPrivacyNotifier@@QAEXJ@Z @ 18 NONAME ; void CPosPrivacyNotifier::SetCurrentRequestL(long) - diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/eabi/t_eposprvqnifu.def --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/eabi/t_eposprvqnifu.def Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN19CPosPrivacyNotifier14BaseConstructLE4TUidi @ 1 NONAME - _ZN19CPosPrivacyNotifier15CompleteRequestEli @ 2 NONAME - _ZN19CPosPrivacyNotifier18SetCurrentRequestLEl @ 3 NONAME - _ZN19CPosPrivacyNotifier19CheckClientSecureIdE9TSecureId @ 4 NONAME - _ZN19CPosPrivacyNotifier19CompleteAllRequestsEi @ 5 NONAME - _ZN19CPosPrivacyNotifierC2Ev @ 6 NONAME - _ZN19CPosPrivacyNotifierD0Ev @ 7 NONAME - _ZN19CPosPrivacyNotifierD1Ev @ 8 NONAME - _ZN19CPosPrivacyNotifierD2Ev @ 9 NONAME - _ZNK19CPosPrivacyNotifier11RequestorLCEi @ 10 NONAME - _ZNK19CPosPrivacyNotifier12CancelReasonEv @ 11 NONAME - _ZNK19CPosPrivacyNotifier12GetRequestsLER6RArrayIlE @ 12 NONAME - _ZNK19CPosPrivacyNotifier12NotifierBaseEv @ 13 NONAME - _ZNK19CPosPrivacyNotifier12RequestTypeLEl @ 14 NONAME - _ZNK19CPosPrivacyNotifier13RequestSourceEv @ 15 NONAME - _ZNK19CPosPrivacyNotifier14CurrentRequestEv @ 16 NONAME - _ZNK19CPosPrivacyNotifier15RequestorCountLEv @ 17 NONAME - _ZNK19CPosPrivacyNotifier18NotificationReasonEv @ 18 NONAME - _ZNK19CPosPrivacyNotifier20QueryTimeoutStrategyEv @ 19 NONAME - _ZNK19CPosPrivacyNotifier23LocationRequestDecisionEv @ 20 NONAME - _ZTI19CPosPrivacyNotifier @ 21 NONAME - _ZTV19CPosPrivacyNotifier @ 22 NONAME - diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/bld.inf --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -// Copyright (c) 2007-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: -// - -PRJ_TESTEXPORTS - -PRJ_TESTMMPFILES -t_eposprvqnif.mmp diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/t_eposprvqnif.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/t_eposprvqnif.mmp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -// Copyright (c) 2005-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: -// This is a special build of the Q&N API for the NRH unit test. -// For the unit test, the UID of the RNotifier used is different, -// so that we can have both the unit test Q&N notifier and the -// integration test Q&N notifiers in the same ROM. -// - - - -MACRO NRH_UNIT_TEST - -TARGET t_eposprvqnif.dll -TARGETTYPE dll -UID 0x1000008d 0x10283745 - -VENDORID 0x70000001 -CAPABILITY ALL -TCB - -SOURCEPATH ../../src -SOURCE EPos_CPosPrivacyNotifier.cpp -SOURCE EPos_CPosPrivacyNotifierExtension.cpp -SOURCE EPos_CPosRequestHandler.cpp - -USERINCLUDE ../../inc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -APP_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib -LIBRARY estor.lib -LIBRARY eiksrv.lib -LIBRARY eposprvtyp.lib - -SMPSAFE diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp --- a/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_networkrequesthandler source \sf\os\lbs\locationrequestmgmt\networkrequesthandler @@ -14,5 +30,4 @@ ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\test ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LBSPrivacyNotification\LbsPrivacyExtNotifiers\test -ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LBSPrivacyNotification\LbsQueryAndNotification\QueryAndNotificationAPI\test ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LbsX3P\LbsX3PApi\test diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby --- a/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby Wed Mar 31 23:44:31 2010 +0300 @@ -26,7 +26,6 @@ #include "lbsprivacyexnotifiers.iby" #ifdef SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG #include "lbsprivacydatatypes.iby" - #include "lbsqueryandnotification.iby" #endif //SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG #endif // SYMBIAN_EXCLUDE_LOCATION diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp --- a/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp Wed Mar 31 23:44:31 2010 +0300 @@ -97,7 +97,6 @@ USERINCLUDE ../../../locationmgmt/locationcore/LbsLocDataSource/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsPartnerCommon/inc USERINCLUDE ../LBSPrivacyNotification/LbsPrivacyController/inc -USERINCLUDE ../LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc USERINCLUDE ../../../locationmgmt/locationcore/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsDebug/inc @@ -108,8 +107,8 @@ USERINCLUDE ../../../locationmgmt/locationcore/LbsLocCommon/inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN relies on cntdef.h in app layer. This dependancy should be broken -APP_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN //Needs macro for system include for epoc32\include\lbs + LIBRARY euser.lib LIBRARY estor.lib diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h --- a/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h Wed Mar 31 23:44:31 2010 +0300 @@ -31,7 +31,7 @@ #include #include #include -#include "EPos_TPosQNInputData.h" +#include #include "EPos_PrivacyInternal.h" #include diff -r af762ad247ea -r d8287cc0d36f locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp --- a/locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp Mon Mar 15 12:45:55 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp Wed Mar 31 23:44:31 2010 +0300 @@ -105,7 +105,6 @@ USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocDataSource/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsPartnerCommon/inc USERINCLUDE ../../LBSPrivacyNotification/LbsPrivacyController/inc -USERINCLUDE ../../LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc USERINCLUDE ../../../../locationmgmt/locationcore/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsDebug/inc @@ -116,7 +115,7 @@ USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocCommon/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN -APP_LAYER_SYSTEMINCLUDE_SYMBIAN + LIBRARY euser.lib LIBRARY estor.lib diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp --- a/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp Mon Mar 15 12:45:55 2010 +0200 +++ b/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp Wed Mar 31 23:44:31 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). +# All rights reserved. +# This component and the accompanying materials are made available +# under the terms of "Eclipse Public License v1.0" +# which accompanies this distribution, and is available +# at the URL "http://www.eclipse.org/legal/epl-v10.html". +# +# Initial Contributors: +# Nokia Corporation - initial contribution. +# +# Contributors: +# +# Description: +# + component lbs_privacyprotocolmodule source \sf\os\lbs\networkprotocolmodules\privacyprotocolmodule diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/bld.inf --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -// Copyright (c) 2008-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: -// - -PRJ_PLATFORMS -DEFAULT - -PRJ_EXPORTS -suplrrlpprotocol.iby /epoc32/rom/include/suplrrlpprotocol.iby - -PRJ_MMPFILES -suplrrlpprotocol.mmp - -#include "../test/group/bld.inf" diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.iby --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.iby Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -// Copyright (c) 2008-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: -// - -#ifndef __SUPL_RRLP_PROTOCOL_IBY__ -#define __SUPL_RRLP_PROTOCOL_IBY__ - - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) -#if defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) || defined(SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY) - -file=ABI_DIR\DEBUG_DIR\suplrrlpprotocol.dll System\libs\suplrrlpprotocol.dll - -#endif // SYMBIAN_INCLUDE_LOCATION_SUPLv10 || SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY -#endif // SYMBIAN_EXCLUDE_LOCATION - - -#endif // __SUPL_RRLP_PROTOCOL_IBY__ diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.mmp --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.mmp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - -// Copyright (c) 2008-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: suplrrlpprotocol.mmp - This is the project specification file for SuplRRLPProtocol. -// -// - -TARGET suplrrlpprotocol.dll -TARGETTYPE DLL -UID 0 0x10283764 - -CAPABILITY ALL -TCB - -// Sources -SOURCEPATH ../src -SOURCE suplrrlpstatemachine.cpp -SOURCE dllmain.cpp - -// -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -OS_LAYER_LIBC_SYSTEMINCLUDE - -// Includes -USERINCLUDE ../inc -USERINCLUDE ../../suplpositioningprotbase/inc/ -USERINCLUDE ../../../../common/suplrrlpasn1/inc/ -USERINCLUDE ../../../../../locationmgmt/locationcore/LbsPartnerCommon/inc -USERINCLUDE ../../../../common/supldevlogger/inc - -// Libraries -LIBRARY lbspartnercommon.lib -LIBRARY euser.lib -LIBRARY lbsnetprotocol.lib -LIBRARY lbsassistancedata.lib -LIBRARY lbs.lib -LIBRARY suplrrlpasn1.lib -LIBRARY supldevlogger.lib - -SMPSAFE diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/bld.inf --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -// Copyright (c) 2006-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: -// - - -// #include "../test/group/bld.inf" - -PRJ_EXPORTS -./rrlptestmessage.iby /epoc32/rom/include/rrlptestmessage.iby - -PRJ_TESTMMPFILES -rrlptestmessage.mmp - diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.iby --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.iby Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +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: -* -*/ -#ifndef __SUPLASN1_IBY__ -#define __SUPLASN1_IBY__ - -REM SUPL ASN1 Encode - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) - -file=ABI_DIR\DEBUG_DIR\rrlptestmessage.dll System\Libs\rrlptestmessage.dll - -#endif // SYMBIAN_EXCLUDE_LOCATION - -#endif \ No newline at end of file diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.mmp --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.mmp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +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: -* -*/ -TARGET suplrrlptestmessages.dll -TARGETTYPE DLL -CAPABILITY ALL -TCB -UID 0x1000008d 0x10283763 - -USERINCLUDE ../rrlp/inc -USERINCLUDE ../../../../../common/asn1export/inc -USERINCLUDE ../../../../../common/asn1export/inc/rtpersrc -USERINCLUDE ../../../../../common/asn1export/inc/rtsrc -USERINCLUDE ../../../../../common/asn1export/inc/rtxsrc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -OS_LAYER_ESTLIB_SYSTEMINCLUDE -OS_LAYER_LIBC_SYSTEMINCLUDE - - -SOURCEPATH ../rrlp/src - -SOURCE rrlpmessagebase.cpp - -SOURCE rrlpprotocolerror.cpp -SOURCE rrlpmeasureposrequest.cpp -SOURCE rrlpmeasureposresponse.cpp -SOURCE rrlpassistancedata.cpp -SOURCE rrlpassistancedataack.cpp - - -SOURCE suplmessagebase.cpp -SOURCE suplmessagecommon.cpp -SOURCE suplpospayload.cpp -SOURCE suplinit.cpp -SOURCE suplposinit.cpp -SOURCE suplstart.cpp -SOURCE suplresponse.cpp -SOURCE suplpos.cpp -SOURCE suplend.cpp - -SOURCE suplasn1decoder.cpp -SOURCE suplasn1decoderimpl.cpp - -// SUPL source files (required for ASN1 decode of SUPL INIT) -SOURCE SUPL-INIT.cpp -SOURCE SUPL-INITDec.cpp -SOURCE ULP.cpp -SOURCE ULP-Components.cpp -SOURCE ULP-ComponentsDec.cpp -SOURCE ULPDec.cpp - - -LIBRARY euser.lib lbsassistancedata.lib lbsnetprotocol.lib lbs.lib lbsloccommon.lib - -// libraries used by Objective Systems stuff (required for ASN1 decode of SUPL INIT) -LIBRARY estlib.lib -LIBRARY asn1rt.lib -LIBRARY asn1per.lib - -// Macro definitions for generated ASN1 code -macro USEASN1RTDLL USEASN1PERDLL _NO_LICENSE_CHECK _NO_INT64_SUPPORT _COMPACT - - -SMPSAFE diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp --- a/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp Mon Mar 15 12:45:55 2010 +0200 +++ b/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp Wed Mar 31 23:44:31 2010 +0300 @@ -32,7 +32,7 @@ #include // Timeout timer -const TInt KTimeoutTime = 10; // Seconds, will convert to TTimeIntervalSeconds. +const TInt KTimeoutTime = 15; // Seconds, will convert to TTimeIntervalSeconds. CSocketWriterBase::CSocketWriterBase(const TLbsHostSettingsId& aSlpId, TInt aCallbackIndex, diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h --- a/networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h Mon Mar 15 12:45:55 2010 +0200 +++ b/networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h Wed Mar 31 23:44:31 2010 +0300 @@ -75,7 +75,7 @@ /** KSessionConnectedTimerDurationInSec Timer duration for when connection confirmation expected from Connection Manager */ -const TInt KSessionConnectedTimerDurationInSec = 10; +const TInt KSessionConnectedTimerDurationInSec = 15; /** SUPL State Machine observer mixin definition. diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplprotocolmodule/group/bld.inf --- a/networkprotocolmodules/suplprotocolmodule/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -// Copyright (c) 2008-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: -// - -PRJ_EXPORTS -lbssupl.iby /epoc32/rom/include/lbssupl.iby - -// ConfML files -../conf/suplprotocolmodule.confml OS_LAYER_EXPORTS_CONFML(suplprotocolmodule.confml) -../conf/suplprotocolmodule_10285AA8.crml OS_LAYER_EXPORTS_CRML(suplprotocolmodule_10285aa8.crml) - -// Main projects, in build order -#include "../HostSettingsApi/group/BLD.INF" -#include "../SuplConnectionManager/group/bld.inf" -#include "../SuplProtocol/group/bld.inf" - -#include "../SuplPushAPI/group/BLD.INF" diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp --- a/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -component lbs_suplprotocolmodule - -source \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\ - -binary \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group all - -exports \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group - -notes_source \component_defs\release.src - - -ipr E -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\HostSettingsAPI\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplConnectionManager\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplRrlpProtocol\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplProtocol\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplPushAPI\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplRrlpAsn1\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\test -ipr B \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\test\export - diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplprotocolmodule/group/lbssupl.iby --- a/networkprotocolmodules/suplprotocolmodule/group/lbssupl.iby Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -// Copyright (c) 2008-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: -// - -#ifndef __LBS_SUPL_IBY__ -#define __LBS_SUPL_IBY__ - - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) && defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) - -#include "supldevlogger.iby" -#include "asn1export.iby" -#include "asn1supl.iby" -#include "asn1rrlp.iby" -#include "lbshostsettings.iby" -#include "suplrrlpprotocol.iby" -#include "lbssuplconnectionmanager.iby" -#include "suplprotocolmodule.iby" -#include "lbssuplpush.iby" -#include "suplrrlpasn1.iby" - -#endif // SYMBIAN_EXCLUDE_LOCATION, SYMBIAN_INCLUDE_LOCATION_SUPLv10 - - -#endif // __LBS_SUPL_IBY__ diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplproxyprotocolmodule/group/bld.inf --- a/networkprotocolmodules/suplproxyprotocolmodule/group/bld.inf Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -// Copyright (c) 2007-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: -// - -#include "../../common/group/bld.inf" -#include "../../suplcontrolplaneprotocols/common/group/bld.inf" -#include "../clientapi/common/posmsgapi/group/bld.inf" -#include "../clientapi/suplposmsgpluginapi/group/bld.inf" -#include "../clientapi/suplposmsgplugin/group/bld.inf" -#include "../supltiapi/group/bld.inf" -#include "../suplproxyprotocolmodule/group/bld.inf" - -#include "../test/group/bld.inf" - -PRJ_EXPORTS -lbs_suplproxyprotocolmodule.iby /epoc32/rom/include/lbs_suplproxyprotocolmodule.iby diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.iby --- a/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.iby Mon Mar 15 12:45:55 2010 +0200 +++ /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: -* -*/ -#ifndef __LBS_SUPLPROXYPROTOCOLMODULE_IBY__ -#define __LBS_SUPLPROXYPROTOCOLMODULE_IBY__ - -REM LBS SUPL Proxy Protocol Module - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) -#include "lbsnetworkprivacy.iby" -#include "lbsprivacyrequest.iby" - -#include "suplproxyclientpossession.iby" -#include "epos_omasuplposmsgpluginimpl.iby" -#include "netpmutils.iby" -#include "epos_omasuplposmessageplugin.iby" -#include "supltiapi.iby" -#include "suplrrlpprotocol.iby" -#include "suplrrlpasn1.iby" -#include "asn1export.iby" -#include "asn1supl.iby" -#include "asn1rrlp.iby" - -#include "lbssuplproxyprotocolmodule.iby" - -#endif // SYMBIAN_EXCLUDE_LOCATION -#endif diff -r af762ad247ea -r d8287cc0d36f networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp --- a/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp Mon Mar 15 12:45:55 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -component lbs_suplproxyprotocolmodule - -source \sf\os\lbs\networkprotocolmodules\common -source \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols -source \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule - -binary \sf\os\lbs\networkprotocolmodules\common\group all -binary \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\group all -binary \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group all - -exports \sf\os\lbs\networkprotocolmodules\common\group -exports \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\group -exports \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group - -notes_source \component_defs\release.src - -ipr E - -ipr T \sf\os\lbs\networkprotocolmodules\common\test -ipr T \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\test -ipr T \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\test