--- a/genericpositioningplugins/locationsuplpsy/group/bld.inf Tue Feb 02 10:12:24 2010 +0200
+++ b/genericpositioningplugins/locationsuplpsy/group/bld.inf Fri Feb 19 23:14:27 2010 +0200
@@ -27,7 +27,7 @@
../data/suplpsystub.sis /epoc32/data/z/system/install/suplpsystub.sis
// Conf Files...
../conf/suplpsy.confml MW_LAYER_CONFML(suplpsy.confml)
-../conf/suplpsy_10206913.crml MW_LAYER_CONFML(suplpsy_10206913.crml)
+../conf/suplpsy_10206913.crml MW_LAYER_CRML(suplpsy_10206913.crml)
PRJ_MMPFILES
nla_suplpsy.mmp
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss Fri Feb 19 23:14:27 2010 +0200
@@ -1,5 +1,5 @@
/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2005-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"
@@ -122,7 +122,7 @@
flags = EEikDialogFlagNoDrag | EEikDialogFlagButtonsRight | EEikDialogFlagNoTitleBar |
EEikDialogFlagCbaButtons | EEikDialogFlagWait |
EEikDialogFlagFillScreen;
- buttons = r_satellite_dialog_cba;
+ buttons = R_AVKON_SOFTKEYS_CLOSE;
items =
{
DLG_LINE
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -210,6 +210,7 @@
//
void CSatelliteDialog::UpdateL()
{
+/*
CEikButtonGroupContainer& buttonContainer = ButtonGroupContainer();
// Dim the "ChangeView" command when satellite data is not
@@ -224,6 +225,7 @@
buttonContainer.SetCommandSetL(R_SATELLITE_DIALOG_CBA);
buttonContainer.DrawNow();
}
+*/
DrawNow();
}
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -46,6 +46,7 @@
#include <data_caging_path_literals.hrh>
#include <gulicon.h> // Gul Icon
#include <StringLoader.h>
+#include <hlplch.h>
#include <epos_csuplsettingsconstants.h>
#include <epos_csuplsettingparams.h>
@@ -329,6 +330,8 @@
}
case EAknCmdHelp:
{
+ HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
+ iAvkonAppUi->AppHelpContextL() );
break;
}
case EEikCmdExit:
@@ -552,6 +555,16 @@
//dont close editor
retVal = EFalse;
}
+ else if( err == KErrArgument )
+ {
+ ShowServerValidationInfoNoteL( R_LOC_SERVER_INFO_NOTE );
+ iIsEditMode = ETrue;
+ SetEditableL( iIsEditMode );
+ SetInitialCurrentLine();
+ SetCursorToEndL();
+ //dont close editor
+ retVal = EFalse;
+ }
}
else
{ // save the existing slp entry info
@@ -576,6 +589,16 @@
SetInitialCurrentLine();
SetCursorToEndL();
}
+ else if( err == KErrArgument )
+ {
+ ShowServerValidationInfoNoteL( R_LOC_SERVER_INFO_NOTE );
+ iIsEditMode = ETrue;
+ SetEditableL( iIsEditMode );
+ SetInitialCurrentLine();
+ SetCursorToEndL();
+ //dont close editor
+ retVal = EFalse;
+ }
}
HandleMSKCaptionL();
//dont close editor
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioncontainer.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioncontainer.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -269,7 +269,7 @@
{
DEBUG( + CLocSUPLSessionContainer::GetHelpContext );
aContext.iContext = iContextName;
- aContext.iMajor = TUid::Uid( KLOCSUPLSERVERUIUID3 );
+ aContext.iMajor = TUid::Uid( KLOCSUPLSETTINGSUIUID3 );
DEBUG( - CLocSUPLSessionContainer::GetHelpContext );
}
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioneditor.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioneditor.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -39,6 +39,7 @@
#include <data_caging_path_literals.hrh>
#include <gulicon.h> // Gul Icon
#include <StringLoader.h>
+#include <hlplch.h>
#include <epos_csuplsettingsconstants.h>
#include <epos_csuplsettingparams.h>
@@ -229,6 +230,8 @@
}
case EAknCmdHelp:
{
+ HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
+ iAvkonAppUi->AppHelpContextL() );
break;
}
case EEikCmdExit:
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -448,17 +448,18 @@
{
DEBUG( + CLocSUPLSettingsAdapter::AddNewServerL );
CServerParams* serverParam = CServerParams::NewL();
- serverParam->Set(
+ CleanupStack::PushL( serverParam );
+ User::LeaveIfError(serverParam->Set(
aServerAddress,
aIapName,
ETrue,
EFalse, // default value
aUsageInHomeNw,
- ETrue );
+ ETrue ));
TInt64 slpId;
User::LeaveIfError( iSUPLSettings->AddNewServer( serverParam, slpId ) );
- delete serverParam;
+ CleanupStack::PopAndDestroy();
DEBUG( - CLocSUPLSettingsAdapter::AddNewServerL );
}
--- a/locationsystemui/locationsysui/locsysuiview/src/locsysuiview.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationsystemui/locationsysui/locsysuiview/src/locsysuiview.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -119,10 +119,7 @@
if ( FeatureManager::FeatureSupported( KFeatureIdFfLocationsysuiHidePositioningMenu ) )
{
- // To Do : changes for ou1cimx1#228781 Location: Positioning view does not open
- // Commenting the leaving part as the hide positioning feature flag is get enabled for all configuration by default
- // so till the flag issue resolved, the leaving part will be commented as this issue affected the BAT.
- // User::Leave( KErrNotSupported );
+ User::Leave( KErrNotSupported );
}
// Open the Resource File
--- a/locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss Fri Feb 19 23:14:27 2010 +0200
@@ -141,6 +141,47 @@
}
};
}
+
+//----------------------------------------------------
+//
+// r_lbtmgmtplugin_contextmenubar
+// Context Menu Bar Location Trigger Management plug-in view.
+//
+//----------------------------------------------------
+//
+RESOURCE MENU_BAR r_lbtmgmtplugin_contextmenubar
+ {
+ titles =
+ {
+ MENU_TITLE { menu_pane = r_lbtmgmtplugin_contextmenu; txt=""; }
+ };
+ }
+
+//------------------------------------------------------------------------------
+//
+// r_lbtmgmtplugin_contextmenu
+//
+// Context Menu Items for Location Trigger Management plug-in view.
+//
+//------------------------------------------------------------------------------
+//
+RESOURCE MENU_PANE r_lbtmgmtplugin_contextmenu
+ {
+ items=
+ {
+ MENU_ITEM
+ {
+ command = ELbtMgmtInfo;
+ txt = qtn_options_loctr_info;
+ },
+ MENU_ITEM
+ {
+ command = ELbtMgmtClearAll;
+ txt = qtn_options_loctr_clear_triggers;
+ }
+ };
+ }
+
//------------------------------------------------------------------------------
@@ -176,21 +217,6 @@
{
MENU_ITEM
{
- command = ELbtMgmtChange;
- txt = qtn_options_change;
- },
- MENU_ITEM
- {
- command = ELbtMgmtInfo;
- txt = qtn_options_loctr_info;
- },
- MENU_ITEM
- {
- command = ELbtMgmtClearAll;
- txt = qtn_options_loctr_clear_triggers;
- },
- MENU_ITEM
- {
command = EAknCmdHelp;
txt = qtn_options_help;
},
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.hrh Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.hrh Fri Feb 19 23:14:27 2010 +0200
@@ -30,6 +30,7 @@
ELbtMgmtInfo,
ELbtMgmtMSKInfo,
ELbtMgmtClearAll,
+ ELbtMgmtShowCSMenu,
ECmdNone
};
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugincontainer.h Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/inc/lbtmgmtplugincontainer.h Fri Feb 19 23:14:27 2010 +0200
@@ -27,6 +27,7 @@
class MDesCArray;
class MLbtMgmtPluginCmdHdlr;
class CAknSettingStyleListBox;
+class CLbtMgmtPluginView;
// Class Definition
@@ -48,7 +49,8 @@
static CLbtMgmtPluginContainer* NewL(
const TRect& aRect,
MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler );
+ MLbtMgmtPluginCmdHdlr& aCmdHandler,
+ CLbtMgmtPluginView* aView );
/**
* Static Two phase contructor that instantiates the CLbtMgmtPluginContainer
@@ -62,7 +64,8 @@
static CLbtMgmtPluginContainer* NewLC(
const TRect& aRect,
MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler );
+ MLbtMgmtPluginCmdHdlr& aCmdHandler,
+ CLbtMgmtPluginView* aView );
/**
* Destructor
*/
@@ -118,6 +121,10 @@
* Updates listbox model
*/
void Update();
+ /*
+ * Shows context specific menu items
+ */
+ void ShowContextMenuL();
protected:
/**
@@ -135,7 +142,8 @@
* Overloaded Constructor
*/
CLbtMgmtPluginContainer( MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler );
+ MLbtMgmtPluginCmdHdlr& aCmdHandler,
+ CLbtMgmtPluginView* aView );
/**
* Second phase of the two phase Construction process
@@ -182,6 +190,10 @@
* Help context
*/
TCoeContextName iContextName;
+ /*
+ * reference to the lbtmgmtplugin view
+ */
+ CLbtMgmtPluginView* iView;
};
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtpluginview.h Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/inc/lbtmgmtpluginview.h Fri Feb 19 23:14:27 2010 +0200
@@ -100,15 +100,15 @@
*/
void HandleCommandL(TInt aCommand);
- /**
- * From MEikMenuObserver
- */
- void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
/**
* For CBA Change
*/
void SetCba( TInt aResourceId );
+ /*
+ * returns CLbtMgmtPluginEngine
+ */
+ CLbtMgmtPluginEngine* GetLbtMgmtPluginEngine();
public:
/**
--- a/locationtriggering/lbtmgmtui/loc/lbtmgmtsettings.loc Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/loc/lbtmgmtsettings.loc Fri Feb 19 23:14:27 2010 +0200
@@ -93,7 +93,7 @@
//l: popup_info_list_pane_t1
//r: 9.1tb
//
-#define qtn_loctr_info_popup_text "There are active location triggers. Individual triggers can be managed in applications where created. All active triggers can be cleared from options menu."
+#define qtn_loctr_info_popup_text "There are active location triggers. Individual triggers can be managed in applications where created. All active triggers can be cleared using the menu item \" Clear triggers \" "
//d: Confirmation String to Clear all Triggers
//l: popup_note_window/opt1
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtplugincontainer.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/src/lbtmgmtplugincontainer.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -29,6 +29,8 @@
#include "lbtmgmtplugincmdhdlr.h"
#include "lbtmgmtplugin.hrh"
#include "lbtmgmtpluginuid.hrh"
+#include "lbtmgmtpluginview.h"
+#include "lbtmgmtpluginengine.h"
// Constant defintions
const TInt KNoofComponentControls = 1;
@@ -42,11 +44,9 @@
//
// ---------------------------------------------------------------------------
//
-CLbtMgmtPluginContainer::CLbtMgmtPluginContainer(
- MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler )
- :iListBoxModel( aListBoxModel ),
- iCmdHandler( aCmdHandler )
+CLbtMgmtPluginContainer::CLbtMgmtPluginContainer(MDesCArray& aListBoxModel,
+ MLbtMgmtPluginCmdHdlr& aCmdHandler, CLbtMgmtPluginView* aView) :
+ iListBoxModel(aListBoxModel), iCmdHandler(aCmdHandler), iView(aView)
{
}
@@ -72,14 +72,13 @@
// @return CLbtMgmtPluginContainer* Reference to the object created
// ---------------------------------------------------------------------------
//
-CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewL(
- const TRect& aRect,
- MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler )
- {
- CLbtMgmtPluginContainer* self =
- NewLC( aRect, aListBoxModel, aCmdHandler );
- CleanupStack::Pop( self );
+CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewL(const TRect& aRect,
+ MDesCArray& aListBoxModel, MLbtMgmtPluginCmdHdlr& aCmdHandler,
+ CLbtMgmtPluginView* aView)
+ {
+ CLbtMgmtPluginContainer* self = NewLC(aRect, aListBoxModel, aCmdHandler,
+ aView);
+ CleanupStack::Pop(self);
return self;
}
@@ -93,15 +92,14 @@
// @return CLbtMgmtPluginContainer* Reference to the object created
// ---------------------------------------------------------------------------
//
-CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewLC(
- const TRect& aRect,
- MDesCArray& aListBoxModel,
- MLbtMgmtPluginCmdHdlr& aCmdHandler )
- {
- CLbtMgmtPluginContainer* self =
- new(ELeave) CLbtMgmtPluginContainer( aListBoxModel, aCmdHandler );
- CleanupStack::PushL( self );
- self->ConstructL( aRect );
+CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewLC(const TRect& aRect,
+ MDesCArray& aListBoxModel, MLbtMgmtPluginCmdHdlr& aCmdHandler,
+ CLbtMgmtPluginView* aView)
+ {
+ CLbtMgmtPluginContainer* self = new (ELeave) CLbtMgmtPluginContainer(
+ aListBoxModel, aCmdHandler, aView);
+ CleanupStack::PushL(self);
+ self->ConstructL(aRect);
return self;
}
@@ -226,19 +224,24 @@
//
// ---------------------------------------------------------------------------
//
-void CLbtMgmtPluginContainer::HandleListBoxEventL(
- CEikListBox* /* aListBox */,
- MEikListBoxObserver::TListBoxEvent aEventType )
+void CLbtMgmtPluginContainer::HandleListBoxEventL(
+ CEikListBox* /* aListBox */,
+ MEikListBoxObserver::TListBoxEvent aEventType)
{
- switch ( aEventType )
+ switch (aEventType)
{
// List box Item Selection
case EEventEnterKeyPressed:
case EEventItemSingleClicked:
{
+ if (iView->GetLbtMgmtPluginEngine()->ActiveTriggers())
+ {
+ iView->HandleCommandL(ELbtMgmtShowCSMenu);
+ }
// Settings element has been selected. Command has to be issued to
// change the settings configuration
- iCmdHandler.HandleCmdL( MLbtMgmtPluginCmdHdlr::EListBoxItemSelected );
+ iCmdHandler.HandleCmdL(
+ MLbtMgmtPluginCmdHdlr::EListBoxItemSelected);
break;
}
default:
@@ -365,3 +368,20 @@
}
}
+// ---------------------------------------------------------------------------
+// void CLbtMgmtPluginContainer::ShowContextMenuL
+// Shows context specific menu items
+// ---------------------------------------------------------------------------
+//
+void CLbtMgmtPluginContainer::ShowContextMenuL()
+ {
+ // Switch to Context specific options menu,
+ // Show it and switch back to main options menu.
+ CEikMenuBar* menuBar = iView->MenuBar();
+ // TRAP displaying of menu bar.
+ // If it fails, the correct resource is set back before leave.
+ TRAPD( err, menuBar->TryDisplayContextMenuBarL() );
+ User::LeaveIfError(err);
+
+ }
+
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtpluginview.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/locationtriggering/lbtmgmtui/src/lbtmgmtpluginview.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -154,13 +154,13 @@
iEngine = CLbtMgmtPluginEngine::NewL( *this );
// Create new Container
- iContainer = CLbtMgmtPluginContainer::NewL( ClientRect(),
- *iEngine,
- *this );
- iContainer->SetMopParent( this );
- AppUi()->AddToViewStackL( *this, iContainer );
-
- SetCba( R_LBTMGMTPLUGIN_CBA_CHANGE );
+ iContainer = CLbtMgmtPluginContainer::NewL(ClientRect(), *iEngine, *this,
+ this);
+ iContainer->SetMopParent(this);
+ AppUi()->AddToViewStackL(*this, iContainer);
+ MenuBar()->SetContextMenuTitleResourceId(R_LBTMGMTPLUGIN_CONTEXTMENUBAR);
+
+ SetCba(R_LBTMGMTPLUGIN_CBA_CHANGE);
}
// ---------------------------------------------------------------------------
@@ -203,15 +203,23 @@
{
switch( aCommand )
{
+ case ELbtMgmtShowCSMenu:
+ if (CLbtMgmtPluginEngine::EActiveTriggers
+ == iContainer->GetFocussedItem())
+ {
+ iContainer->ShowContextMenuL();
+ }
+ break;
case ELbtMgmtChange:
case ELbtMgmtMSKChange:
{
SettingsChangeL(aCommand);
break;
- }
+ }
+ case ELbtMgmtMSKInfo:
+ break;
case ELbtMgmtInfo:
- case ELbtMgmtMSKInfo:
- {
+ {
iEngine->ShowInfoDialogL();
break;
}
@@ -240,46 +248,10 @@
{
// Un-handled commands are to be passed to the
// App UI
- AppUi()->HandleCommandL( aCommand );
- break;
+ AppUi()->HandleCommandL(aCommand);
+ break;
}
}
- }
-
-// -----------------------------------------------------------------------------
-// CLbtMgmtPluginView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::DynInitMenuPaneL( TInt aResourceId,
- CEikMenuPane* aMenuPane )
- {
- if ( aResourceId == R_LBTMGMTPLUGIN_MENU )
- {
- User::LeaveIfNull( aMenuPane );
- //Handle Help Feature
-
- //Context sensitive menu items
- if( CLbtMgmtPluginEngine::EActiveTriggers == iContainer->GetFocussedItem() )
- {
- aMenuPane->SetItemDimmed( ELbtMgmtChange, ETrue );
- if( iEngine->ActiveTriggers() )
- {
- aMenuPane->SetItemDimmed( ELbtMgmtClearAll, EFalse );
- aMenuPane->SetItemDimmed( ELbtMgmtInfo, EFalse );
- }
- else
- {
- aMenuPane->SetItemDimmed( ELbtMgmtClearAll, ETrue );
- aMenuPane->SetItemDimmed( ELbtMgmtInfo, ETrue );
- }
- }
- else
- {
- aMenuPane->SetItemDimmed( ELbtMgmtChange, EFalse );
- aMenuPane->SetItemDimmed( ELbtMgmtClearAll, ETrue );
- aMenuPane->SetItemDimmed( ELbtMgmtInfo, ETrue );
- }
- }
}
// -----------------------------------------------------------------------------
@@ -428,8 +400,6 @@
case CLbtMgmtPluginEngine::EActiveTriggers:
{
// If condition is added for any pointer event from container
- if( iEngine->ActiveTriggers() )
- iEngine->ShowInfoDialogL();
break;
}
default:
@@ -499,3 +469,14 @@
//If leave occurs before this, close is called automatically when the thread exits.
fsSession.Close();
}
+
+// ---------------------------------------------------------------------------
+// CLbtMgmtPluginView :: GetLbtMgmtPluginEngine
+//
+//
+// ---------------------------------------------------------------------------
+//
+CLbtMgmtPluginEngine* CLbtMgmtPluginView::GetLbtMgmtPluginEngine()
+ {
+ return iEngine;
+ }
--- a/locsrv_plat/geocoding_api/tsrc/group/bld.inf Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/geocoding_api/tsrc/group/bld.inf Fri Feb 19 23:14:27 2010 +0200
@@ -40,6 +40,11 @@
// NOTE: If using ARS requirements .mmp file operation should be done under this.
// 'abld test build'
testmnclientlib.mmp
+../mapnavproviderrefapp/group/geocodingrefengine.mmp
+../mapnavproviderrefapp/group/geocodingrefprovider.mmp
+../mapnavproviderrefapp/group/geocodingrefproviderback.mmp
+../mapnavproviderrefapp/group/geocodingrefproviderplugin.mmp
+
PRJ_MMPFILES
// Specify the .mmp files required for building the important component
--- a/locsrv_plat/geocoding_api/tsrc/group/testmnclientlib.pkg Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/geocoding_api/tsrc/group/testmnclientlib.pkg Fri Feb 19 23:14:27 2010 +0200
@@ -40,8 +40,24 @@
; Files to install
"\epoc32\release\armv5\urel\testmnclientlib.dll"-"C:\sys\bin\testmnclientlib.dll"
+"\epoc32\release\armv5\urel\mnrefprovider.exe"-"!:\sys\bin\mnrefprovider.exe"
+"\epoc32\data\z\resource\apps\mnrefprovider.rsc"-"!:\resource\apps\mnrefprovider.rsc"
+"\epoc32\data\z\resource\apps\mnrefprovider.mbm"-"!:\resource\apps\mnrefprovider.mbm"
+"\epoc32\data\z\resource\apps\mnrefprovider.mif"-"!:\resource\apps\mnrefprovider.mif"
+"\epoc32\data\z\private\10003a3f\apps\mnrefprovider_reg.rsc"-"!:\private\10003a3f\import\apps\mnrefprovider_reg.rsc"
+
+"\epoc32\release\armv5\urel\mnrefproviderback.exe"-"!:\sys\bin\mnrefproviderback.exe"
+"\epoc32\data\z\resource\apps\mnrefproviderback.rsc"-"!:\resource\apps\mnrefproviderback.rsc"
+"\epoc32\data\z\private\10003a3f\apps\mnrefproviderback_reg.rsc"-"!:\private\10003a3f\import\apps\mnrefproviderback_reg.rsc"
+
+"\epoc32\release\armv5\urel\mnrefproviderengine.dll"-"!:\sys\bin\mnrefproviderengine.dll"
+"\epoc32\data\z\resource\mnrefproviderengine.rsc"-"!:\resource\mnrefproviderengine.rsc"
+
+"\epoc32\release\armv5\urel\mnrefproviderplugin.dll"-"!:\sys\bin\mnrefproviderplugin.dll"
+"\epoc32\data\z\resource\plugins\mnrefproviderplugin.rsc"-"!:\resource\plugins\mnrefproviderplugin.rsc"
+
;refprovider sisx
-"..\data\mnrefprovider_armv5.sisx"-"E:\testing\data\mnrefprovider.sisx"
+;"..\data\mnrefprovider_armv5.sisx"-"E:\testing\data\mnrefprovider.sisx"
"..\conf\testmnclientlib.cfg"-"C:\testframework\testmnclientlib.cfg"
"..\init\testframework.ini"-"C:\testframework\testframework.ini"
--- a/locsrv_plat/map_and_navigation_api/inc/mnmapview.h Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_api/inc/mnmapview.h Fri Feb 19 23:14:27 2010 +0200
@@ -20,7 +20,7 @@
#define MN_MAPVIEW_H
#include <e32base.h>
-#include <epos_landmarks.h>
+#include <EPos_Landmarks.h>
#include <lbsposition.h>
class RFs;
--- a/locsrv_plat/map_and_navigation_api/tsrc/group/bld.inf Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_api/tsrc/group/bld.inf Fri Feb 19 23:14:27 2010 +0200
@@ -40,6 +40,11 @@
// NOTE: If using ARS requirements .mmp file operation should be done under this.
// 'abld test build'
testmapandnavapi.mmp
+../mapnavproviderrefapp/group/mapnavrefengine.mmp
+../mapnavproviderrefapp/group/mapnavrefprovider.mmp
+../mapnavproviderrefapp/group/mapnavrefproviderback.mmp
+../mapnavproviderrefapp/group/mapnavrefproviderplugin.mmp
+
PRJ_MMPFILES
// Specify the .mmp files required for building the important component
--- a/locsrv_plat/map_and_navigation_api/tsrc/group/map_and_navigation_api_test.pkg Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_api/tsrc/group/map_and_navigation_api_test.pkg Fri Feb 19 23:14:27 2010 +0200
@@ -54,5 +54,9 @@
"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
+"\epoc32\release\armv5\urel\mnrefproviderplugin.dll"-"!:\sys\bin\mnrefproviderplugin.dll"
+"\epoc32\data\z\resource\plugins\mnrefproviderplugin.rsc"-"!:\resource\plugins\mnrefproviderplugin.rsc"
+
+
"..\conf\testmapandnavapi.cfg"-"C:\testframework\testmapandnavapi.cfg"
"..\init\testframework.ini"-"C:\testframework\testframework.ini"
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnservicebase.h Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_provider_api/inc/mnservicebase.h Fri Feb 19 23:14:27 2010 +0200
@@ -19,7 +19,7 @@
#ifndef MN_SERVICEBASE_H
#define MN_SERVICEBASE_H
-#include <aknserverapp.h>
+#include <AknServerApp.h>
class CPosLandmark;
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/bld.inf Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/bld.inf Fri Feb 19 23:14:27 2010 +0200
@@ -44,6 +44,11 @@
#endif
testmnproviderdiscovery.mmp
+../mapnavproviderrefapp/group/mnprovdiscrefengine.mmp
+../mapnavproviderrefapp/group/mnprovdiscrefprovider.mmp
+../mapnavproviderrefapp/group/mnprovdiscrefproviderback.mmp
+../mapnavproviderrefapp/group/mnprovdiscrefproviderplugin.mmp
+
PRJ_MMPFILES
// Specify the .mmp files required for building the important component
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/map_and_navigation_provider_discovery_api_test.pkg Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/map_and_navigation_provider_discovery_api_test.pkg Fri Feb 19 23:14:27 2010 +0200
@@ -54,5 +54,9 @@
"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
+"\epoc32\release\armv5\urel\mnrefproviderplugin.dll"-"!:\sys\bin\mnrefproviderplugin.dll"
+"\epoc32\data\z\resource\plugins\mnrefproviderplugin.rsc"-"!:\resource\plugins\mnrefproviderplugin.rsc"
+
+
"..\conf\testmnproviderdiscovery.cfg"-"C:\testframework\testmnproviderdiscovery.cfg"
"..\init\testframework.ini"-"C:\testframework\testframework.ini"
\ No newline at end of file
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/bld.inf Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/bld.inf Fri Feb 19 23:14:27 2010 +0200
@@ -40,6 +40,12 @@
// NOTE: If using ARS requirements .mmp file operation should be done under this.
// 'abld test build'
testmapimgconpluginapi.mmp
+../mapnavproviderrefapp/group/mnconvpluginrefengine.mmp
+../mapnavproviderrefapp/group/mnconvpluginrefprovider.mmp
+../mapnavproviderrefapp/group/mnconvpluginrefproviderback.mmp
+../mapnavproviderrefapp/group/mnconvpluginrefproviderplugin.mmp
+
+
PRJ_MMPFILES
// Specify the .mmp files required for building the important component
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/map_image_conversion_plugin_api_test.pkg Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/map_image_conversion_plugin_api_test.pkg Fri Feb 19 23:14:27 2010 +0200
@@ -57,6 +57,10 @@
"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
-;"..\conf\testmapimgconpluginapi.cfg"-"C:\testframework\testmapimgconpluginapi.cfg"
-;"..\init\testframework.ini"-"C:\testframework\testframework.ini"
+"\epoc32\release\armv5\urel\mnrefproviderplugin.dll"-"!:\sys\bin\mnrefproviderplugin.dll"
+"\epoc32\data\z\resource\plugins\mnrefproviderplugin.rsc"-"!:\resource\plugins\mnrefproviderplugin.rsc"
+
+"..\conf\testmapimgconpluginapi.cfg"-"C:\testframework\testmapimgconpluginapi.cfg"
+"..\init\testframework.ini"-"C:\testframework\testframework.ini"
+
--- a/locsrv_pub/blid_application_satellite_info_api/tsrc/UT_CSatelliteUITest/group/CSatelliteUITest_DoxyFile.txt Tue Feb 02 10:12:24 2010 +0200
+++ b/locsrv_pub/blid_application_satellite_info_api/tsrc/UT_CSatelliteUITest/group/CSatelliteUITest_DoxyFile.txt Fri Feb 19 23:14:27 2010 +0200
@@ -2,9 +2,9 @@
# 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"
+# under the terms of the License "Symbian Foundation License v1.0"
# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+# at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
#
# Initial Contributors:
# Nokia Corporation - initial contribution.
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplreport.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplreport.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -406,6 +406,10 @@
iOptionalMask |= KSessionListShift;
+ sessionList.Close();
+ reportDataList.Close();
+
+
}
/*
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -243,17 +243,32 @@
aStatus = KRequestPending;
TRequestStatus *status = &aStatus;
- if( iIsInitilized && iOMASuplProtocolHandler1 )
+
+ if( iIsInitilized )
{
- iOMASuplProtocolHandler1->RunSessionL(
- aSuplSession,
+ if( aSuplSession->GetSUPLVersion() == 1 )
+ {
+ iOMASuplProtocolHandler1->RunSessionL(
+ aSuplSession,
aStatus,
aHslpAddress,
aFallBack,
aFirstReq,
aAllowedCapabilities,
aRequestID);
- }
+ }
+ else if( aSuplSession->GetSUPLVersion() == 2 )
+ {
+ iOMASuplProtocolHandler2->RunSessionL(
+ aSuplSession,
+ aStatus,
+ aHslpAddress,
+ aFallBack,
+ aFirstReq,
+ aAllowedCapabilities,
+ aRequestID);
+ }
+ }
else
{
User::RequestComplete(status,KErrOMASuplUnInitilized);
@@ -281,7 +296,9 @@
aStatus = KRequestPending;
TRequestStatus *status = &aStatus;
- if( iIsInitilized && iOMASuplProtocolHandler1 )
+ if( iIsInitilized )
+ {
+ if( aSuplSession->GetSUPLVersion() == 1 )
{
iOMASuplProtocolHandler1->RunSessionL(
aSuplSession,
@@ -292,7 +309,20 @@
aAllowedCapabilities,
aQop,
aRequestID);
- }
+ }
+ else if( aSuplSession->GetSUPLVersion() == 2 )
+ {
+ iOMASuplProtocolHandler2->RunSessionL(
+ aSuplSession,
+ aStatus,
+ aHslpAddress,
+ aFallBack,
+ aFirstReq,
+ aAllowedCapabilities,
+ aQop,
+ aRequestID);
+ }
+ }
else
{
User::RequestComplete(status,KErrOMASuplUnInitilized);
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletelnotifier.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletelnotifier.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -115,10 +115,13 @@
//
void COMASuplETelNotifier::CheckForRoaming()
{
- iCellMode = EOMASuplCellIdHome;
- iTrace->Trace(_L("COMASuplETelNotifier::CheckForRoaming..."),KTraceFileName, __LINE__);
- iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPkg);
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::CheckForRoaming..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdHome;
+ iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPkg);
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
@@ -128,10 +131,13 @@
//
void COMASuplETelNotifier::GetCurrentNetwork()
{
- iCellMode = EOMASuplCellIdCurrent;
- iTrace->Trace(_L("COMASuplETelNotifier::GetCurrentNetwork..."),KTraceFileName, __LINE__);
- iPhone.GetCurrentNetwork( iStatus, iNetworkInfoPkg, iLocationInfo );
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::GetCurrentNetwork..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdCurrent;
+ iPhone.GetCurrentNetwork( iStatus, iNetworkInfoPkg, iLocationInfo );
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
@@ -141,10 +147,13 @@
//
void COMASuplETelNotifier::NotifyCurrentNetworkChange()
{
- iCellMode = EOMASuplCellIdNotify;
- iTrace->Trace(_L("COMASuplETelNotifier::NotifyCurrentNetworkChange..."),KTraceFileName, __LINE__);
- iPhone.NotifyCurrentNetworkChange( iStatus, iNetworkInfoPkg, iLocationInfo );
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::NotifyCurrentNetworkChange..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdNotify;
+ iPhone.NotifyCurrentNetworkChange( iStatus, iNetworkInfoPkg, iLocationInfo );
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -219,6 +219,7 @@
CSuplSessionBase* SuplSession = COMASuplSession::NewL(*iCommManager, iMobilePhone, iSuplSettings,
iSuplStorageSettings, aRequestType, *this, iPosHandler, iIMSI,
*this, aIpcSessionId,iOMASuplAsnHandlerBaseImpl);
+ SuplSession->SetSUPLVersion(1);
User::LeaveIfError(iSuplSessions.Append(SuplSession));
return SuplSession;
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletelnotifier.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletelnotifier.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -115,10 +115,13 @@
//
void COMASuplETelNotifier::CheckForRoaming()
{
- iCellMode = EOMASuplCellIdHome;
- iTrace->Trace(_L("COMASuplETelNotifier::CheckForRoaming..."),KTraceFileName, __LINE__);
- iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPkg);
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::CheckForRoaming..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdHome;
+ iPhone.GetHomeNetwork( iStatus, iHomeNetworkInfoPkg);
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
@@ -128,10 +131,13 @@
//
void COMASuplETelNotifier::GetCurrentNetwork()
{
- iCellMode = EOMASuplCellIdCurrent;
- iTrace->Trace(_L("COMASuplETelNotifier::GetCurrentNetwork..."),KTraceFileName, __LINE__);
- iPhone.GetCurrentNetwork( iStatus, iNetworkInfoPkg, iLocationInfo );
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::GetCurrentNetwork..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdCurrent;
+ iPhone.GetCurrentNetwork( iStatus, iNetworkInfoPkg, iLocationInfo );
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
@@ -141,10 +147,13 @@
//
void COMASuplETelNotifier::NotifyCurrentNetworkChange()
{
- iCellMode = EOMASuplCellIdNotify;
- iTrace->Trace(_L("COMASuplETelNotifier::NotifyCurrentNetworkChange..."),KTraceFileName, __LINE__);
- iPhone.NotifyCurrentNetworkChange( iStatus, iNetworkInfoPkg, iLocationInfo );
- SetActive();
+ iTrace->Trace(_L("COMASuplETelNotifier::NotifyCurrentNetworkChange..."),KTraceFileName, __LINE__);
+ if( !IsActive() )
+ {
+ iCellMode = EOMASuplCellIdNotify;
+ iPhone.NotifyCurrentNetworkChange( iStatus, iNetworkInfoPkg, iLocationInfo );
+ SetActive();
+ }
}
// -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -226,7 +226,7 @@
*this,
aIpcSessionId,
iOMASuplAsnHandlerBaseImpl);
-
+ SuplSession->SetSUPLVersion(2);
User::LeaveIfError(iSuplSessions.Append(SuplSession));
return SuplSession;
}
@@ -256,7 +256,10 @@
iTrace->Trace(_L("NotifyOnPlugInUnInstallation starting"), KTraceFileName, __LINE__);
iSuplEcomEventWatcher->NotifyOnPlugInUnInstallation();
}
- iNotifier = COMASuplETelNotifier::NewL(*this,iMobilePhone);
+ if(!iNotifier)
+ {
+ iNotifier = COMASuplETelNotifier::NewL(*this,iMobilePhone);
+ }
iTrace->Trace(_L("ETEL Notifier created"), KTraceFileName, __LINE__);
iTrace->Trace(_L("COMASUPLProtocolManager2::InitializeL completed"), KTraceFileName, __LINE__);
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -5554,6 +5554,7 @@
// -----------------------------------------------------------------------------
void COMASuplSession::RemoveActiveSession()
{
+ if (iTrace)
iTrace->Trace(_L("Removing Trigger Session from DB..."), KTraceFileName, __LINE__);
//may need to reset the iActiveSessionId to 0 so that self deletion event will not come to same session...
TInt err = iSuplStorageSettings->DeleteSessionRecord(iSETSessionUniqueId);
--- a/supl/locationsuplfw/settingsapi/src/epos_csettingsdatabasehandler.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationsuplfw/settingsapi/src/epos_csettingsdatabasehandler.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -516,9 +516,19 @@
OtherProperties |= KEditable;
}
- TBuf<KGenericStringLen> tempBuf;
+ TBuf<KMaxHSLPAddrLen> tempBuf;
+ TBuf<KMaxIAPLen> tempIapBuf;
tempBuf.Copy(*SLPAddress);
- tempBuf.Trim();
+ tempIapBuf.Copy(*IAPName);
+ tempBuf.TrimAll();
+ tempIapBuf.TrimAll();
+
+ if( tempBuf.Length() == 0 )
+ {
+ CleanupStack::PopAndDestroy(3); //SLPAddress,IAPName,manuName
+ User::Leave(KErrArgument);
+ }
+
iSQLString.Copy(KInsertIntoTable);
iSQLString.Append(KCreateTableName);
@@ -594,7 +604,7 @@
iSQLString.Append(KCommaSeparator);
iSQLString.Append(KQuotes);
- iSQLString.Append(*IAPName);
+ iSQLString.Append(tempIapBuf);
iSQLString.Append(KQuotes);
iSQLString.Append(KCommaSeparator);
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -284,9 +284,12 @@
//--------------------------------------------------------------------------------------
EXPORT_C TInt CSuplSettings::SetServerAddress( const TInt64 aSlpId, const TDesC& aServerAddress)
{
- if(aServerAddress.Length() <= 0)
+ TBuf<KMaxHSLPAddrLen> serveraddr;
+ serveraddr.Copy(aServerAddress);
+ serveraddr.TrimAll();
+ if(serveraddr.Length() <= 0)
return KErrArgument;
- return iSettingsEngine->SetServerAddress(aSlpId,aServerAddress);
+ return iSettingsEngine->SetServerAddress(aSlpId,serveraddr);
}
//-------------------------------------------------------------------------------------
//CSuplSettings::GetServerAddress()
@@ -304,10 +307,12 @@
//--------------------------------------------------------------------------------------
EXPORT_C TInt CSuplSettings::SetIapName( const TInt64 aSlpId, const TDesC& aIapName)
{
-
- if(aIapName.Length() <= 0)
+ TBuf<KMaxIAPLen> iapname;
+ iapname.Copy(aIapName);
+ iapname.TrimAll();
+ if(iapname.Length() <= 0)
return KErrArgument;
- return iSettingsEngine->SetIapName(aSlpId,aIapName);
+ return iSettingsEngine->SetIapName(aSlpId,iapname);
}
//-------------------------------------------------------------------------------------
//CSuplSettings::GetIapName()
--- a/supl/locationsuplfw/terminalinitiationapi/src/epos_suplterminalapi.cpp Tue Feb 02 10:12:24 2010 +0200
+++ b/supl/locationsuplfw/terminalinitiationapi/src/epos_suplterminalapi.cpp Fri Feb 19 23:14:27 2010 +0200
@@ -840,6 +840,8 @@
if (!serverAddress || !iapName)
{
+ delete serverAddress;
+ delete iapName;
return KErrNoMemory;
}
delete iSuplStorageSettings;