Binary file locationsystemui/locationsysui/help/data/xhtml.zip has changed
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss Wed Sep 15 12:40:28 2010 +0300
@@ -70,10 +70,6 @@
},
MENU_ITEM
{
- command = ELocServerEditorChange; txt = qtn_loc_server_options_change; flags = EEikMenuItemAction;
- },
- MENU_ITEM
- {
command = ELocServerEditorRemove; txt = qtn_loc_detail_options_delete; flags = EEikMenuItemSpecific;
},
MENU_ITEM
@@ -108,6 +104,21 @@
form = r_suplserver_editor_form;
}
+//----------------------------------------------------
+// RESOURCE DIALOG r_suplserver_editor_form_dialog_noap
+// Form dialog to create an event
+//----------------------------------------------------
+//
+RESOURCE DIALOG r_suplserver_editor_form_dialog_noap
+ {
+ flags = EEikDialogFlagNoDrag | EEikDialogFlagFillAppClientRect |
+ EEikDialogFlagNoTitleBar | EEikDialogFlagButtonsRight |
+ EEikDialogFlagCbaButtons | EEikDialogFlagNoBorder |
+ EEikDialogFlagWait;
+ buttons = r_suplserver_editor_options_edit_back;
+ form = r_suplserver_editor_form_noap;
+ }
+
//----------------------------------------------------
// RESOURCE CBA r_suplserver_editor_options_nomsk_back
// CBA for SUPL Settings UI view.
@@ -193,7 +204,7 @@
type = EEikCtEdwin;
prompt = qtn_loc_server_iap;
id = ELocSuplServerIdAccessPoint;
- itemflags = EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
+ itemflags = EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel | EEikEdwinReadOnly;
control = EDWIN
{
flags = EEikEdwinResizable | EEikEdwinReadOnly | EEikEdwinAvkonDisableCursor | EEikEdwinNoAutoSelection ;
@@ -230,6 +241,57 @@
}
//----------------------------------------------------
+// RESOURCE DIALOG r_suplserver_editor_form_noap
+// Form to create/view a server
+//----------------------------------------------------
+//
+RESOURCE FORM r_suplserver_editor_form_noap
+ {
+ flags = EEikFormUseDoubleSpacedFormat;
+ items =
+ {
+ DLG_LINE
+ {
+ type = EEikCtEdwin;
+ prompt = qtn_loc_server_address_name;
+ id = ELocSuplServerIdServerAddr;
+ itemflags = EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys;
+ control = EDWIN
+ {
+ flags = EEikEdwinJustAutoCurEnd | EEikEdwinResizable | EEikEdwinNoLineOrParaBreaks ;
+ width = 16;
+ maxlength = 255;
+ lines = 10;
+ };
+ },
+
+ DLG_LINE
+ {
+ type = EEikCtEdwin;
+ prompt = qtn_loc_server_usage;
+ id = ELocSuplServerIdUsageInHomeNw;
+ itemflags = EEikDlgItemTakesEnterKey;
+ control = EDWIN
+ {
+ flags = EEikEdwinNoHorizScrolling | EEikEdwinResizable |
+ EEikEdwinNoAutoSelection | EEikEdwinReadOnly|
+ EEikEdwinAvkonDisableCursor|EEikEdwinAvkonNotEditable |EEikEdwinDisplayOnly;
+ // maxlength = ECalenAbsoluteMaxTextEditorLength;
+ default_case = EAknEditorTextCase;
+ allowed_case_modes = EAknEditorAllCaseModes;
+ numeric_keymap = EAknEditorStandardNumberModeKeymap;
+ special_character_table = R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG;
+ avkon_flags = EAknEditorFlagUseSCTNumericCharmap |
+ EAknEditorFlagDefault |
+ EAknEditorFlagEnablePictographInput;
+ // let Avkon decide which is maximum number of lines
+ // It's based on layout.
+ max_view_height_in_lines = 0;
+ };
+ }
+ };
+ }
+//----------------------------------------------------
// RESOURCE ARRAY r_suplserver_editor_usageinhomenw_array
// array for usage in homw nw pop-up dialog
//----------------------------------------------------
@@ -271,33 +333,6 @@
};
}
-//----------------------------------------------------
-// RESOURCE CBA r_suplserver_editor_options_define_back
-// CBA for SUPL Editor UI view.
-//----------------------------------------------------
-//
-RESOURCE CBA r_suplserver_editor_options_define_done
- {
- flags = 0;
- buttons =
- {
- CBA_BUTTON
- {
- id = EAknSoftkeyOptions;
- txt = text_softkey_option;
- },
- CBA_BUTTON
- {
- id = EAknSoftkeyDone;
- txt = text_softkey_done;
- },
- CBA_BUTTON
- {
- id = ELocServerEditorMSKDefine;
- txt = qtn_msk_define;
- }
- };
- }
//----------------------------------------------------
// RESOURCE CBA r_suplserver_editor_options_change_done
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss Wed Sep 15 12:40:28 2010 +0300
@@ -43,15 +43,6 @@
{
}
-//----------------------------------------------------
-// r_loc_supl_iap_query
-// Confirmation Query prompt text for SUPL Settings
-//----------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_iap_query
- {
- buf = qtn_loc_supl_iap_query;
- }
//----------------------------------------------------
// r_suplsettings_caption
@@ -183,12 +174,12 @@
{
items =
{
- MENU_ITEM
- {
- command = ELocSuplChange;
- txt = qtn_loc_server_options_change;
- flags = EEikMenuItemAction;
- },
+ MENU_ITEM
+ {
+ command = ELocSuplOpen;
+ txt = qtn_loc_supl_options_open;
+ flags = EEikMenuItemAction;
+ },
MENU_ITEM
{
command = ELocSuplClearSession;
@@ -230,16 +221,7 @@
buf = qtn_loc_supl_title;
}
-//------------------------------------------------------------------------------
-// r_loc_supl_use
-// List settings item description for SUPL settings usage.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_use
- {
- buf = qtn_loc_supl_server_use;
- }
-
+
//------------------------------------------------------------------------------
// r_loc_supl_server_detail
// List settings item caption for multiple SUPL servers
@@ -280,76 +262,6 @@
buf = qtn_loc_supl_multiple_services;
}
-//------------------------------------------------------------------------------
-// r_loc_supl_usage_settings
-// Settings page for manipulating SUPL settings usage.
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_loc_suplusage_settings
- {
- label = qtn_loc_supl_lbl_server_use;
- softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
- type = EAknSetListBox;
- editor_resource_id = r_loc_suplusage_settings_listbox;
- }
-
-//------------------------------------------------------------------------------
-// r_loc_suplusage_settings_listbox
-// Set Settings text
-//------------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_loc_suplusage_settings_listbox
- {
- flags = EEikListBoxMultipleSelection;
- }
-
-//------------------------------------------------------------------------------
-// r_loc_supl_automatic
-// Settings Item for SUPL usage
-// This value denotes that SUPL would be used automatically when the user is in his
-// home network. When the user is roaming he would be prompted with a query for
-// using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_automatic
- {
- buf = qtn_loc_supl_automatic;
- }
-
-//------------------------------------------------------------------------------
-// r_loc_supl_automatic
-// Settings Item for SUPL usage
-// This value denotes that SUPL would be used automatically when the user is in his
-// home network. When the user is roaming he would be prompted with a query for
-// using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_home_automatic
- {
- buf = qtn_loc_supl_home_automatic;
- }
-
-//------------------------------------------------------------------------------
-// r_loc_supl_ask
-// Settings Item for SUPL usage
-// This value denotes that the user would always be prompted before using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_ask
- {
- buf = qtn_loc_supl_ask;
- }
-
-//------------------------------------------------------------------------------
-// r_loc_supl_disabled
-// Settings Item for SUPL usage
-// This value denotes that SUPL would not be used at all.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_disabled
- {
- buf = qtn_loc_supl_disabled;
- }
//------------------------------------------------------------------------------
// r_loc_supl_server_detail_title
@@ -401,43 +313,7 @@
buf = qtn_loc_server_iap;
}
-//------------------------------------------------------------------------------
-// r_loc_no_ap_defined
-// No IAP defined text
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_no_ap_defined
- {
- buf = qtn_netw_info_no_iap_defined;
- }
-
-//------------------------------------------------------------------------------
-// r_general_note
-// Note to be displayed when no IAPs are defined
-//------------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_general_note
- {
- flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
- EEikDialogFlagCbaButtons | EEikDialogFlagWait;
- buttons = R_AVKON_SOFTKEYS_EMPTY;
- items =
- {
- DLG_LINE
- {
- type = EAknCtNote;
- id = EGeneralNote;
- control = AVKON_NOTE
- {
- layout = EGeneralLayout;
- singular_label = "";
- plural_label = "";
- animation = R_QGN_NOTE_INFO_ANIM;
- };
- }
- };
- }
-
+
//------------------------------------------------------------------------------
// r_suplsettings_server_view
// SUPL Settings Server view
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservereditor.h Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservereditor.h Wed Sep 15 12:40:28 2010 +0300
@@ -98,7 +98,13 @@
* Executes the Dialog
*/
TInt ExecuteLD();
-
+
+ /**
+ * Sets the value of iIsAccessPointDefined based on whether the
+ * access point is preconfigured for a server
+ * @param[in] aEnabled - Value to be set for the variable iIsAccessPointDefined
+ */
+ void SetAccessPointEnabled(TBool aEnabled);
public: // from MSuplServerEditorObserver
/*
@@ -282,6 +288,11 @@
* It determines if form is modified by user
*/
TBool iIsModified;
+
+ /**
+ * Determines whether the access point is preconfigured for the server
+ */
+ TBool iIsAccessPointDefined;
};
#endif // __LOCSUPLSERVER_EDITOR_H__
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapter.h Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapter.h Wed Sep 15 12:40:28 2010 +0300
@@ -45,17 +45,6 @@
public MSuplSessionObserver
{
public:
- /**
- * SUPL Usage enumerations which display the order of display
- * in the User interface
- */
- enum TLocSuplUsage
- {
- ELocSuplAutomatic = 0,
- ELocSuplAutomaticatHome,
- ELocSuplAlwaysAsk,
- ELocSuplDisable
- };
public:
/**
* Static Two phase contructor that instantiates the CLocSUPLSettingsAdapter
@@ -94,33 +83,6 @@
*/
void CancelInitialize();
- /**
- * Sets the SUPL Settings usage.
- *
- * @param aIndex Index of the SUPL settings usage item.
- */
- void SetSuplUsageL( const TLocSuplUsage aIndex );
-
- /**
- * Obtains the SUPL Settings usage.
- *
- * @param aSuplUsage SUPL settings usage string.
- */
- void GetSuplUsageL( TDes& aSuplUsage );
-
- /**
- * Obtains the SUPL usage
- *
- * @return The SUPL usage
- */
- TInt GetSuplUsage();
-
- /**
- * Obtains the Supl Settings usage index
- *
- * @return TLocSuplUsage SUPL settings usage index
- */
- TLocSuplUsage GetSuplUsageIndex();
/***************************************************************************
@@ -432,16 +394,13 @@
*
*/
void RemoveSessionObserver( );
+
+ /**
+ * Generates IMSI address
+ */
+ void GenerateHslpAddressFromImsi(TDes& aIMSIAddress );
- public: // Accessor functions for SUPL settings usage strings
- const TDesC& Automatic();
-
- const TDesC& AutomaticAtHome();
-
- const TDesC& AlwaysAsk();
-
- const TDesC& Disable();
public:
@@ -485,29 +444,6 @@
*/
CSuplSettings* iSUPLSettings;
- /**
- * SUPL settings usage is automatic
- * Owns
- */
- HBufC* iAutomatic;
-
- /**
- * SUPL settings usage is automatic in home network
- * Owns
- */
- HBufC* iAutomaticatHome;
-
- /**
- * SUPL settings usage needs a user confirmation
- * Owns
- */
- HBufC* iAsk;
-
- /**
- * SUPL is disabled.
- * Owns.
- */
- HBufC* iDisable;
/**
* Observer for the specific SUPL session.
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingslbmodel.h Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingslbmodel.h Wed Sep 15 12:40:28 2010 +0300
@@ -45,8 +45,7 @@
*/
enum TSUPLSettingsItemId
{
- ESUPLSettingsUsage = 0,
- ESUPLSettingsServersDetail,
+ ESUPLSettingsServersDetail = 0,
ESUPLSettingsActiveSessions
};
@@ -112,13 +111,6 @@
*/
void ConstructL();
- /**
- * Packs the SUPL settings usage to the end of the buffer passed.
- *
- * @param aPtr Buffer to which the Supl settings usage point needs to be
- * appended.
- */
- void AppendSuplUsage( TDes16& aPtr ) const;
/**
* Packs the Server Address to the end of the buffer passed.
@@ -149,11 +141,6 @@
*/
HBufC16* iServerDetailTitle;
- /**
- * Title text for SUPL usage.
- * Owns.
- */
- HBufC16* iSuplUsageTitle;
/**
* SUPL Active Sessions count.
@@ -166,22 +153,12 @@
*/
HBufC16* iSuplServerDetail;
- /**
- * Default SUPL usage.
- * Owns.
- */
- HBufC16* iDefaultSuplUsage;
/**
* Reference the SUPL Settings Engine
*/
CLocSUPLSettingsUiEngine& iEngine;
- /**
- * Boolean value to indicate whethere SUPL settings usage
- * is present.
- */
- TBool iSuplUsagePresent;
/**
* Boolean value to indicate whether SUPL address field
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Wed Sep 15 12:40:28 2010 +0300
@@ -50,8 +50,7 @@
* It further observers the SUPL Settings UI for any changes to the Settings
* values.
*/
-class CLocSUPLSettingsUiEngine : public CActive,
- public MLocSUPLSettingsAdapterObserver
+class CLocSUPLSettingsUiEngine : public MLocSUPLSettingsAdapterObserver
{
public:
/**
@@ -84,18 +83,7 @@
*/
virtual ~CLocSUPLSettingsUiEngine();
- /**
- * Launches the confirmation query to select IAP
- *
- */
- void SelectConnectionL();
- /**
- * Launches the Access Point Configurator dialog
- *
- */
- void LaunchApConfiguratorL( TInt64 aSlpId,
- MSuplServerEditorObserver* aEditorObserver );
/**
* Opens the exisitng server with its attributes
@@ -109,29 +97,12 @@
*/
TInt SlpCount();
- /**
- * Launches the SUPL Usage configurator
- */
- void LaunchSuplUsageConfiguratorL();
/**
* Closes the running Settings UI prematurely.
*/
void Close();
- /**
- * Obtains the SUPL Settings usage.
- *
- * @return TPtr16 SUPL settings usage.
- */
- TPtr16 GetSuplUsageL();
-
- /**
- * Obtains the SUPL usage
- *
- * @return The SUPL Usage value
- */
- TInt GetSuplUsage();
/**
* Creates a new server entry in Supl Settings.
@@ -316,22 +287,16 @@
*/
void SetTempAPValue( TUint32 aAccessPoint);
+ /**
+ * Generates IMSI address
+ */
+ void GenerateHslpAddressFromImsi(TDes& aIMSIAddress );
public:
/**
* Inherited from MLocSUPLSettingsAdapterObserver
*/
void HandleSuplSettingsChangeL( TLocSUPLSettingsEvent aEvent );
- protected:
- /**
- * Inherited from CActive
- */
- void RunL();
-
- /**
- * Inherited from CActive
- */
- void DoCancel();
private:
/**
@@ -360,12 +325,6 @@
*/
void DisplayErrorL( TInt aError );
- /**
- * Displays an Info note
- *
- * @param None
- */
- TInt ShowNoteL();
/**
* Returns value of last highlighted AP
@@ -384,12 +343,6 @@
*/
CLocSUPLSettingsAdapter* iSUPLSettingsAdapter;
- /**
- * Flag to denote whether any dialog is currently active
- * Used in the Cancel method. If there are any requests
- * outstanding then they have to be cancelled
- */
- TBool iDialogActive;
/**
* Temporary Buffer for returning values to the Accessor
@@ -410,10 +363,6 @@
*/
HBufC* iSettingsBuffer;
- /**
- * Pointer to the Settings Buffer
- */
- TPtr iSettingsBufferPtr;
/**
* Standard Text resolver for converting Error codes to
@@ -432,22 +381,12 @@
*/
TInt iLaunchParams;
- /**
- * Akn Global confirmation query
- * Owns
- */
- CAknGlobalConfirmationQuery* iConfirmQuery;
/**
* Flag to denote whether access point selection requested or not
*/
TBool iRequestIapSelect;
- /**
- * SUPL Servers SLP ID to get and set the server attributes.
- * Owns.
- */
- TInt64 iCurrentSlpId;
/**
* Supl Server Editor
@@ -455,11 +394,6 @@
*/
CLocSUPLServerEditor* iEditorDlg;
- /**
- * Editor Observer
- * Owns
- */
- MSuplServerEditorObserver* iEditorObserver;
/*
* Current highlighted AP
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -69,7 +69,7 @@
TBool aIsEditable,
CLocSUPLSettingsUiEngine& aEngine,
TInt64 aSlpId
- ):iIsEditMode( aIsEditable ), iEngine( aEngine ), iSlpId( aSlpId )
+ ):iIsEditMode( aIsEditable ), iEngine( aEngine ), iSlpId( aSlpId ), iIsAccessPointDefined(EFalse)
{
if( aIsEditable )
{
@@ -184,28 +184,10 @@
case ELocSuplServerIdServerAddr:
{
aMenuPane->SetItemDimmed( ELocServerEditorDefine, ETrue );
- aMenuPane->SetItemDimmed( ELocServerEditorChange, ETrue );
break;
}
case ELocSuplServerIdAccessPoint:
{
- TInt isIapChanged = EFalse;
- CEikEdwin* apSelector =
- static_cast < CEikEdwin* > ( ControlOrNull( IdOfFocusControl() ) );
- if( apSelector )
- {
- if( iIap->Length() > 0 )
- isIapChanged = ETrue;
- }
-
- if( isIapChanged )
- {
- aMenuPane->SetItemDimmed( ELocServerEditorDefine, ETrue );
- }
- else
- {
- aMenuPane->SetItemDimmed( ELocServerEditorChange, ETrue );
- }
break;
}
case ELocSuplServerIdUsageInHomeNw:
@@ -215,8 +197,6 @@
TBool editableFlag = ETrue;
if( iSlpId )
TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );
- if( editableFlag == EFalse )
- aMenuPane->SetItemDimmed( ELocServerEditorChange, ETrue );
break;
}
@@ -254,7 +234,6 @@
}
aMenuPane->SetItemDimmed( ELocServerEditorDefine, ETrue );
- aMenuPane->SetItemDimmed( ELocServerEditorChange, ETrue );
aMenuPane->SetItemDimmed( ELocServerEditorRemove, ETrue );
}
}
@@ -300,27 +279,18 @@
TRAP_IGNORE( iEngine.SetServerEnabledFlagL( iSlpId, ETrue ) );
break;
}
- case ELocServerEditorDefine:
- {
- TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
- break;
- }
- case ELocServerEditorChange:
case ELocServerEditorMSKChange:
{
CEikEdwin* usageInHomeNWPopupFieldText = (CEikEdwin*) Control(
ELocSuplServerIdUsageInHomeNw);
- if (IdOfFocusControl() == ELocSuplServerIdAccessPoint)
- {
- TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
- }
- else
- {
+ HBufC* string;
+ string = StringLoader::LoadLC(
+ R_LOC_SERVER_USAGEINHOMENETWORK_NO, iCoeEnv);
if (iIsNewServer)
{
TBuf<KMaxUsageTextSize> des;
usageInHomeNWPopupFieldText->GetText(des);
- if (!des.Compare(KNoUsageInHomeNetork))
+ if (!des.CompareC(string->Des()))
{
SetUsageinHomeNetwork(ETrue);
}
@@ -337,7 +307,7 @@
{
TBuf<KMaxUsageTextSize> des;
usageInHomeNWPopupFieldText->GetText(des);
- if (!des.Compare(KNoUsageInHomeNetork))
+ if (!des.CompareC(string->Des()))
{
SetUsageinHomeNetwork(ETrue);
}
@@ -346,8 +316,8 @@
SetUsageinHomeNetwork(EFalse);
}
}
+ CleanupStack::PopAndDestroy(string);
}
- }
break;
}
case EAknCmdHelp:
@@ -459,13 +429,6 @@
retVal = EFalse;
break;
}
- case ELocServerEditorMSKDefine:
- {
- TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
- //dont close editor
- retVal = EFalse;
- break;
- }
case ELocServerEditorMSKChange:
{
ProcessCommandL( ELocServerEditorMSKChange );
@@ -491,9 +454,11 @@
{
if( iIsNewServer )
{
+ // iap name is always set as KNullDesC since defining the access point is
+ // not allowed while creating a new server manually
TRAPD( err, iEngine.AddNewServerL(
iServerAddress->Des(),
- iIap->Des(),
+ KNullDesC,
iUsageInHomeNw ) );
if( err == KErrNone )
{
@@ -627,7 +592,7 @@
delete apText;
HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE );
- if( apString->Compare( iIap->Des() ) == 0 )
+ if (apString->CompareC(iIap->Des()) == 0)
{
iIap->Des().Copy( KNullDesC );
}
@@ -640,15 +605,19 @@
if (usageInHomeNWPopupFieldText)
{
TBuf<KMaxUsageTextSize> des;
+ HBufC* string;
+ string = StringLoader::LoadLC(
+ R_LOC_SERVER_USAGEINHOMENETWORK_NO, iCoeEnv);
usageInHomeNWPopupFieldText->GetText(des);
- if (!des.Compare(KNoUsageInHomeNetork))
+ if (!des.CompareC(string->Des()))
+ {
+ iUsageInHomeNw = EFalse;
+ }
+ else
{
iUsageInHomeNw = ETrue;
}
- else
- {
- iUsageInHomeNw = EFalse;
- }
+ CleanupStack::PopAndDestroy(string);
}
if( iServerAddress->Length() > 0 )
@@ -752,10 +721,18 @@
// -----------------------------------------------------------------------------
//
TInt CLocSUPLServerEditor::ExecuteLD()
- {
- return CAknForm::ExecuteLD( R_SUPLSERVER_EDITOR_FORM_DIALOG );
+ {
+ if (!iIsAccessPointDefined)
+ {
+ return CAknForm::ExecuteLD(R_SUPLSERVER_EDITOR_FORM_DIALOG_NOAP);
+ }
+ else
+ {
+ return CAknForm::ExecuteLD(R_SUPLSERVER_EDITOR_FORM_DIALOG);
+ }
}
+
// -----------------------------------------------------------------------------
// CLocSUPLServerEditor::HandleControlStateChangeL
// -----------------------------------------------------------------------------
@@ -808,15 +785,6 @@
DEBUG( + CLocSUPLServerEditor::LoadFormValuesFromDataL );
if( IsEditable() && iIsNewServer ) //if create new server
{
- CEikEdwin* apSelector =
- static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );
- if( apSelector )
- {
- HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE );
- apSelector->SetTextL( apString );
- delete apString;
- }
- apSelector->DrawNow();
CEikEdwin* usageInHNWPopupFieldText = (CEikEdwin*) Control(
ELocSuplServerIdUsageInHomeNw);
@@ -862,7 +830,7 @@
{
// Error has occured
}
-
+
CEikEdwin* serverAddress =
static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdServerAddr ) );
if( serverAddress )
@@ -873,31 +841,24 @@
serverAddress->DrawDeferred();
iServerAddress->Des().Copy( hslpAddr->Des() );
}
-
- CEikEdwin* apSelector =
- static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );
- if( apSelector )
- {
- if( iapName->Length() > 0 )
- {
- apSelector->SetTextL( iapName );
- }
- else
- {
- HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE );
- apSelector->SetTextL( apString );
- delete apString;
- }
-
- apSelector->DrawNow();
- iIap->Des().Copy( iapName->Des() );
- }
-
+
+ if (iIsAccessPointDefined)
+ {
+ CEikEdwin* apSelector = static_cast<CEikEdwin*> (ControlOrNull(
+ ELocSuplServerIdAccessPoint));
+ if (apSelector)
+ {
+ apSelector->SetTextL(iapName);
+ apSelector->DrawNow();
+ iIap->Des().Copy(iapName->Des());
+ }
+ }
+
CEikEdwin* usageInHNWPopupFieldText = (CEikEdwin*) Control(
ELocSuplServerIdUsageInHomeNw);
if (usageInHNWPopupFieldText)
{
- if (usageInHomeNwFlag)
+ if (!usageInHomeNwFlag)
SetUsageinHomeNetwork(EFalse);
else
SetUsageinHomeNetwork(ETrue);
@@ -982,22 +943,6 @@
}
case ELocSuplServerIdAccessPoint:
{
- TInt isIapChanged = EFalse;
- CEikEdwin* apSelector =
- static_cast < CEikEdwin* > ( ControlOrNull( IdOfFocusControl() ) );
- if( apSelector && iIap )
- {
- if( iIap->Length() > 0 )
- isIapChanged = ETrue;
- }
- if( isIapChanged )
- {
- cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_CHANGE_DONE );
- }
- else
- {
- cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_DEFINE_DONE );
- }
break;
}
case ELocSuplServerIdUsageInHomeNw:
@@ -1139,10 +1084,12 @@
if (!IsEditable())
{
if (focusControl == ELocSuplServerIdUsageInHomeNw
- || ELocSuplServerIdServerAddr || ELocSuplServerIdAccessPoint)
+ || focusControl == ELocSuplServerIdServerAddr)
{
ProcessCommandL(EAknFormCmdEdit);
}
+ else
+ return;
}
else if (aEventID == MEikDialogPageObserver::EDialogPageTapped)
{
@@ -1150,9 +1097,12 @@
{
if (usageInHomeNWPopupFieldText)
{
+ HBufC* string;
+ string = StringLoader::LoadLC(
+ R_LOC_SERVER_USAGEINHOMENETWORK_NO, iCoeEnv);
TBuf<KMaxUsageTextSize> des;
usageInHomeNWPopupFieldText->GetText(des);
- if (!des.Compare(KNoUsageInHomeNetork))
+ if (!des.CompareC(string->Des()))
{
SetUsageinHomeNetwork(ETrue);
}
@@ -1164,17 +1114,10 @@
{
iIsModified = ETrue;
}
+ CleanupStack::PopAndDestroy(string);
}
return;
}
- if (focusControl == ELocSuplServerIdAccessPoint)
- {
- if (iapEditor)
- {
- //Launch IAP Dialog
- TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
- }
- }
}DEBUG( -CLocSUPLServerEditor::HandleDialogPageEventL );
}
@@ -1205,4 +1148,15 @@
CleanupStack::PopAndDestroy(string);
}
+// -----------------------------------------------------------------------------
+// CLocSUPLServerEditor::SetAccessPointEnabled
+//
+// -----------------------------------------------------------------------------
+//
+void CLocSUPLServerEditor::SetAccessPointEnabled (TBool aEnabled)
+ {
+ iIsAccessPointDefined = aEnabled;
+ }
+
+
// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverlbmodel.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverlbmodel.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -23,6 +23,8 @@
#include <epos_csuplsettings.h>
#include <epos_csuplsettingparams.h>
#include <epos_csuplsettingsconstants.h>
+#include <bldvariant.hrh>
+#include <featmgr.h>
// User Include
#include "locsuplserverlbmodel.h"
@@ -33,6 +35,7 @@
const TInt KMaxConversionBufferLength = 0x200;
const TInt KServerEntryGranularity = 10;
+const TInt KMaxServerAddressLength = 255;
// ========================= MEMBER FUNCTIONS ================================
@@ -204,12 +207,15 @@
//
void CLocSUPLServerLBModel::UpdateSlpIdsL()
{
- DEBUG( + CLocSUPLServerLBModel::CollectSlpIdsL );
+ DEBUG( + CLocSUPLServerLBModel::UpdateSlpIdsL );
iSlpIdList.Reset();
iSlpAddressList.ResetAndDestroy();
iEnableFlagList.Reset();
+ TBool displayImsiAddress = FeatureManager::FeatureSupported(KFeatureIdFfSuplImsiGeneratedAddressDisplay);
+
+
if( iEngine.SlpCount() > 0 )
{
RPointerArray< CServerParams > serverList;
@@ -217,11 +223,16 @@
// Get all server entries
iEngine.GetAllSlpL( serverList );
- for( TInt i = 0; i < serverList.Count() ; i++ )
+ TBuf<KMaxServerAddressLength> imsiAddress;
+ iEngine.GenerateHslpAddressFromImsi(imsiAddress);
+
+ TInt serverCount = serverList.Count();
+
+ for( TInt i = 0; i < serverCount ; i++ )
{
TInt64 slpId;
- HBufC* hslpAddr = HBufC::NewL( KMaxHSLPAddrLen );
- HBufC* iapName = HBufC::NewL( KMaxIAPLen );
+ HBufC* hslpAddr = HBufC::NewLC( KMaxHSLPAddrLen );
+ HBufC* iapName = HBufC::NewLC( KMaxIAPLen );
TBool enabledFlag, simChangeFlag, usageInHomeNwFlag, editFlag;
TInt errParams = serverList[i]->Get(
@@ -233,22 +244,27 @@
usageInHomeNwFlag,
editFlag
);
+
+
+
if ( errParams != KErrNone )
{
- // Error has occured
- }
-
+ User::Leave(errParams);
+ }
+
+ if ( displayImsiAddress || imsiAddress.Compare(hslpAddr->Des()) ) // Flag is true->Show IMSI server too, not otherwise!
+ {
iSlpIdList.Append( slpId );
iSlpAddressList.Append( hslpAddr->AllocL() );
iEnableFlagList.Append( enabledFlag );
+ }
- delete hslpAddr;
- delete iapName;
+ CleanupStack::PopAndDestroy(2);
}
serverList.ResetAndDestroy();
serverList.Close();
}
- DEBUG( - CLocSUPLServerLBModel::CollectSlpIdsL );
+ DEBUG( - CLocSUPLServerLBModel::UpdateSlpIdsL );
}
// ---------------------------------------------------------------------------
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettings.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettings.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -543,9 +543,8 @@
iAppUi.ActivateLocalViewL( iSettingsViewId );
}
else if( ELocSUPLIAPSelection == iLaunchParams )
- {
- // Check if the User intended to Launch IAP Selection
- iSettingsEngine->SelectConnectionL();
+ {
+ // Do nothing,since there is no access point selection
}
else
{
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -58,17 +58,6 @@
delete iSUPLSettings;
iSUPLSettings = NULL;
- delete iAutomatic;
- iAutomatic = NULL;
-
- delete iAutomaticatHome;
- iAutomaticatHome = NULL;
-
- delete iAsk;
- iAsk = NULL;
-
- delete iDisable;
- iDisable = NULL;
DEBUG( - CLocSUPLSettingsAdapter::~CLocSUPLSettingsAdapter );
}
@@ -110,11 +99,6 @@
// Set the Observer for SUPL Sessions
iSUPLSettings->SetSessionObserverL( *this );
- // Load the SUPL settings usage strings
- iAutomatic = StringLoader::LoadL( R_LOC_SUPL_AUTOMATIC );
- iAutomaticatHome = StringLoader::LoadL( R_LOC_SUPL_HOME_AUTOMATIC );
- iAsk = StringLoader::LoadL( R_LOC_SUPL_ASK );
- iDisable = StringLoader::LoadL( R_LOC_SUPL_DISABLED );
CActiveScheduler::Add( this );
DEBUG( - CLocSUPLSettingsAdapter::ConstructL );
@@ -147,210 +131,7 @@
Cancel();
}
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetSuplUsageL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::SetSuplUsageL(
- const CLocSUPLSettingsAdapter::TLocSuplUsage aIndex )
- {
- DEBUG( + CLocSUPLSettingsAdapter::SetSuplUsageL );
- CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
- switch ( aIndex )
- {
- case ELocSuplAutomatic:
- {
- value = CSuplSettings::ESuplUsageAutomatic;
- break;
- }
- case ELocSuplAutomaticatHome:
- {
- value = CSuplSettings::ESuplUsageHomeAutomatic;
- break;
- }
- case ELocSuplAlwaysAsk:
- {
- value = CSuplSettings::ESuplUsageAlwaysAsk;
- break;
- }
- case ELocSuplDisable:
- {
- value = CSuplSettings::ESuplUsageDisabled;
- break;
- }
- default:
- {
- User::Leave( KErrNotFound );
- break;
- }
- }
- // Write back to the SUPL settings API
- TInt ret = iSUPLSettings->SetSuplUsage( value );
-
- // If the Set failed, then Leave with the corresponding Error code
- if( ret )
- {
- User::Leave ( ret );
- }
- DEBUG( - CLocSUPLSettingsAdapter::SetSuplUsageL );
- }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetSuplUsageL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::GetSuplUsageL( TDes& aSuplUsage )
- {
- DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsageL );
- CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
- User::LeaveIfError( iSUPLSettings->GetSuplUsage( value ));
-
- switch ( value )
- {
- case CSuplSettings::ESuplUsageAutomatic:
- {
- if ( aSuplUsage.MaxLength() < iAutomatic->Des().Length())
- {
- User::Leave( KErrNoMemory );
- }
- aSuplUsage.Copy( *iAutomatic );
- break;
- }
- case CSuplSettings::ESuplUsageHomeAutomatic:
- {
- if ( aSuplUsage.MaxLength() < iAutomaticatHome->Des().Length())
- {
- User::Leave( KErrNoMemory );
- }
- aSuplUsage.Copy( *iAutomaticatHome );
- break;
- }
- case CSuplSettings::ESuplUsageAlwaysAsk:
- {
- if ( aSuplUsage.MaxLength() < iAsk->Des().Length())
- {
- User::Leave( KErrNoMemory );
- }
- aSuplUsage.Copy( *iAsk );
- break;
- }
- case CSuplSettings::ESuplUsageDisabled:
- {
- if ( aSuplUsage.MaxLength() < iDisable->Des().Length())
- {
- User::Leave( KErrNoMemory );
- }
- aSuplUsage.Copy( *iDisable );
- break;
- }
- default:
- {
- User::Leave( KErrNotSupported );
- break;
- }
- }
- DEBUG( - CLocSUPLSettingsAdapter::GetSuplUsageL );
- }
-
-// ---------------------------------------------------------------------------
-// TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsAdapter::GetSuplUsage()
- {
- DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsage TInt );
- CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
- TInt error = iSUPLSettings->GetSuplUsage( value );
- if ( error )
- {
- // If there is an error then return the default value
- return CSuplSettings::ESuplUsageAlwaysAsk;
- }
- DEBUG( - CLocSUPLSettingsAdapter::GetSuplUsage TInt );
- return value;
- }
-
-// ---------------------------------------------------------------------------
-// TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsageIndex
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsAdapter::TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsageIndex()
- {
- DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsageIndex );
- TLocSuplUsage index = ELocSuplAutomatic;
- CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
- if ( iSUPLSettings->GetSuplUsage( value ))
- {
- // If there is an error then return the default value.
- return index;
- }
-
- switch ( value )
- {
- case CSuplSettings::ESuplUsageAutomatic:
- {
- index = ELocSuplAutomatic;
- break;
- }
- case CSuplSettings::ESuplUsageHomeAutomatic:
- {
- index = ELocSuplAutomaticatHome;
- break;
- }
- case CSuplSettings::ESuplUsageAlwaysAsk:
- {
- index = ELocSuplAlwaysAsk;
- break;
- }
- case CSuplSettings::ESuplUsageDisabled:
- {
- index = ELocSuplDisable;
- break;
- }
- default:
- {
- break;
- }
- }
- return index;
- }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::Automatic
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::Automatic()
- {
- return *iAutomatic;
- }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::AutomaticAtHome
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::AutomaticAtHome()
- {
- return *iAutomaticatHome;
- }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::AlwaysAsk
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::AlwaysAsk()
- {
- return *iAsk;
- }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::Disable
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::Disable()
- {
- return *iDisable;
- }
// ---------------------------------------------------------------------------
// void CLocSUPLSettingsAdapter::HandleSuplSettingsChangeL
@@ -488,6 +269,18 @@
User::LeaveIfError( iSUPLSettings->GetAllSlp( aParamValues ) );
DEBUG( - CLocSUPLSettingsAdapter::GetAllSlpL );
}
+
+// ---------------------------------------------------------------------------
+// void CLocSUPLSettingsAdapter::GenerateHslpAddressFromImsi()
+//
+// ---------------------------------------------------------------------------
+//
+void CLocSUPLSettingsAdapter::GenerateHslpAddressFromImsi(TDes& aIMSIAddress)
+ {
+ DEBUG( + CLocSUPLSettingsAdapter::GenerateHslpAddressFromImsi );
+ iSUPLSettings->GenerateHslpAddressFromImsi(aIMSIAddress);
+ DEBUG( - CLocSUPLSettingsAdapter::GenerateHslpAddressFromImsi );
+ }
// ---------------------------------------------------------------------------
// void CLocSUPLSettingsAdapter::GetSlpInfoFromIdL
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingscontainer.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingscontainer.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -283,16 +283,7 @@
case EEventEnterKeyPressed:
case EEventItemSingleClicked: //case EEventItemDoubleClicked:
{
- // Settings element has been selected. Command has to be issued to
- // change the settings configuration
- if ( SelectedItemIndex() == 0 )
- {
- iSettingsView.HandleCommandL( ELocSuplMSKChange );
- }
- else if ( SelectedItemIndex() == 1 || SelectedItemIndex() == 2 )
- {
- iSettingsView.HandleCommandL( ELocSuplMSKOpen );
- }
+ iSettingsView.HandleCommandL(ELocSuplMSKOpen);
break;
}
default:
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingslbmodel.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingslbmodel.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -68,14 +68,10 @@
delete iServerDetailTitle;
iServerDetailTitle = NULL;
- delete iSuplUsageTitle;
- iSuplUsageTitle = NULL;
delete iSuplServerDetail;
iSuplServerDetail = NULL;
- delete iDefaultSuplUsage;
- iDefaultSuplUsage = NULL;
DEBUG( - CLocSUPLSettingsLBModel::~CLocSUPLSettingsLBModel );
}
@@ -148,32 +144,7 @@
ptr.Copy( KDefaultServerIPAddress );
}
- // Reinitializing the flag value
- flagValue = 0;
- TRAPD( error, repository = CRepository::NewL( KCRUidOMASuplConfiguration ) );
- if ( !error )
- {
- error = repository->Get( KOMASuplConfigurationSuplPermissionQueryUsage, flagValue );
- if ( error || flagValue < 0 )
- {
- flagValue = 0;
- }
- delete repository;
- repository = NULL;
- }
-
- // Check for SUPL Setting usage variationing.
- if( flagValue )
- {
- iSuplUsagePresent = ETrue;
-
- // Allocate and set the server ip address title field
- iSuplUsageTitle = StringLoader::LoadL( R_LOC_SUPL_USE );
-
- iDefaultSuplUsage = StringLoader::LoadL( R_AVKON_SELEC_SETT_VAL_FIELD_NONE );
- // Default value can be used for this field as well
- // So no need to have another variable.
- }
+
DEBUG( - CLocSUPLSettingsLBModel::ConstructL );
}
@@ -189,21 +160,16 @@
CLocSUPLSettingsLBModel::ResolveSettingsItem( TInt aListboxIndex ) const
{
DEBUG( + CLocSUPLSettingsLBModel::ResolveSettingsItem );
- TSUPLSettingsItemId selectedItem = ESUPLSettingsUsage;
+ TSUPLSettingsItemId selectedItem = ESUPLSettingsServersDetail;
switch ( aListboxIndex )
{
case 0:
{
- selectedItem = ESUPLSettingsUsage;
- break;
- }
- case 1:
- {
selectedItem = ESUPLSettingsServersDetail;
break;
}
- case 2:
+ case 1:
{
selectedItem = ESUPLSettingsActiveSessions;
break;
@@ -227,27 +193,15 @@
//
TInt CLocSUPLSettingsLBModel::MdcaCount() const
{
- DEBUG( + CLocSUPLSettingsLBModel::MdcaCount );
- // Initialize the count to 0
- TInt itemCount = 0;
-
- // Check for SUPL usage.
- if ( iSuplUsagePresent )
- {
- itemCount++;
- // Check if the usage value is disabled
- if ( iEngine.GetSuplUsage() == CSuplSettings::ESuplUsageDisabled )
- {
- return itemCount;
- }
- // Check for Server address
- iServerAddressPresent ? itemCount++ : itemCount;
- }
- itemCount++; // For the third entry "Active sessions"
- // Check if the SUPL Usage value is Disabled
- // If that is the case then only SUPL usage will be displayed
- DEBUG( - CLocSUPLSettingsLBModel::MdcaCount );
- return itemCount;
+ DEBUG( + CLocSUPLSettingsLBModel::MdcaCount );
+ // Initialize the count to 0
+ TInt itemCount = 0;
+
+ // Check for Server address
+ iServerAddressPresent ? itemCount++ : itemCount;
+ itemCount++; // For the third entry "Active sessions"
+ DEBUG( - CLocSUPLSettingsLBModel::MdcaCount );
+ return itemCount;
}
// ---------------------------------------------------------------------------
@@ -275,11 +229,6 @@
TSUPLSettingsItemId index = ResolveSettingsItem( aIndex );
switch( index )
{
- case ESUPLSettingsUsage:
- {
- AppendSuplUsage( ptr );
- break;
- }
case ESUPLSettingsServersDetail:
{
AppendSuplServerDetail( ptr );
@@ -303,41 +252,7 @@
return iBuffer->Des();
}
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSettingsLBModel::AppendSuplServerDetail()
-// Packs the server address to the end of the buffer passed.
-//
-// @param aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsLBModel::AppendSuplUsage( TDes& aPtr ) const
- {
- DEBUG( + CLocSUPLSettingsLBModel::AppendSuplUsage );
- // Append the Title text
- aPtr.Append( iSuplUsageTitle->Des() );
-
- // Append the second tab
- aPtr.Append( EKeyTab );
-
- // Append the third tab
- aPtr.Append( EKeyTab );
-
- // Obtain the SUPL usage from the SUPL Settings Engine. If
- // the settings is not set then a Not defined value would be
- // displayed to the user
- TPtr16 suplUsagePtr( NULL, 0 );
- TRAPD( error, suplUsagePtr.Set( iEngine.GetSuplUsageL() ) );
- if( error || !suplUsagePtr.Length() )
- {
- // Using the same string as SUPL settings AP
- aPtr.Append( iDefaultSuplUsage->Des() );
- }
- else
- {
- aPtr.Append( suplUsagePtr );
- }
- DEBUG( - CLocSUPLSettingsLBModel::AppendSuplUsage );
- }
+
// ---------------------------------------------------------------------------
// TPtrC16 CLocSUPLSettingsLBModel::AppendSuplServerDetail()
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsuiengine.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsuiengine.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -63,12 +63,9 @@
//
CLocSUPLSettingsUiEngine::CLocSUPLSettingsUiEngine(
MLocSUPLSettingsUiEngObserver& aObserver )
- : CActive( EPriorityStandard ),
- iObserver( aObserver ),
+ : iObserver( aObserver ),
iConversionBufferPtr( NULL, 0 ),
- iSettingsBufferPtr( NULL, 0),
- iCurrentSlpId( -1 ),
- iEditorObserver( NULL ),
+ iEditorDlg(NULL),
iTempAP(-1)
{
// No implementation
@@ -82,11 +79,7 @@
CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine()
{
DEBUG( + CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine );
- Cancel();
- // Delete the Confirmation query
- delete iConfirmQuery;
- iConfirmQuery = NULL;
delete iSUPLSettingsAdapter;
iSUPLSettingsAdapter = NULL;
@@ -95,8 +88,6 @@
delete iConversionBuffer;
iConversionBuffer = NULL;
- delete iSettingsBuffer;
- iSettingsBuffer = NULL;
// Delete the Error handling utilities
delete iTextResolver;
@@ -151,15 +142,12 @@
iConversionBuffer = HBufC16::NewL( KMaxBufferLength );
iConversionBufferPtr.Set( iConversionBuffer->Des() );
- iSettingsBuffer = HBufC::NewL( KMaxBufferLength );
- iSettingsBufferPtr.Set( iSettingsBuffer->Des());
iTextResolver = CTextResolver::NewL( *( CCoeEnv::Static() ) );
// Create the SUPL Settings API adapter.
iSUPLSettingsAdapter = CLocSUPLSettingsAdapter::NewL( *this );
- CActiveScheduler::Add( this );
DEBUG( - CLocSUPLSettingsUiEngine::ConstructL );
}
@@ -177,215 +165,8 @@
DEBUG( - CLocSUPLSettingsUiEngine::Initalize );
}
-void CLocSUPLSettingsUiEngine::SelectConnectionL()
- {
- DEBUG( + CLocSUPLSettingsUiEngine::SelectConnectionL );
- if( iDialogActive || IsActive() || iConfirmQuery )
- {
- User::Leave( KErrInUse );
- }
-
- // In the case of a framework launching SUPL UI, the user is ignorant
- // of the action. Hence, a confirmation dialog is popped up to intimate
- // the user that he needs to configure SUPL settings.
-
- iConfirmQuery = CAknGlobalConfirmationQuery::NewL();
-
- CAknSDData* secondaryData = CAknSDData::NewL( KCatUidLocationSuplSettingsUi,
- ECmdSuplSettingsMissing,
- KNullDesC8 );
-
- // Send the Confirmation query information to the Secondary display
- // The ownership of 'secondaryData' is taken up by the Global confirmation query
- iConfirmQuery->SetSecondaryDisplayData( secondaryData );
-
- // Load the SUPL IAP confirmation query prompt text from the resource file
- HBufC* promptText = StringLoader::LoadL( R_LOC_SUPL_IAP_QUERY );
-
- // Display the Confirmation query.
- iConfirmQuery->ShowConfirmationQueryL( iStatus,
- *promptText,
- R_AVKON_SOFTKEYS_YES_NO__YES,
- R_QGN_NOTE_QUERY_ANIM );
-
- SetActive();
- delete promptText; //
- promptText = NULL;
- DEBUG( - CLocSUPLSettingsUiEngine::SelectConnectionL );
- }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::LaunchApConfiguratorL
-// Launches the Access Point Configurator dialog
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::LaunchApConfiguratorL( TInt64 aSlpId,
- MSuplServerEditorObserver* aEditorObserver )
- {
- DEBUG( + CLocSUPLSettingsUiEngine::LaunchApConfiguratorL );
- iCurrentSlpId = aSlpId;
- iEditorObserver = aEditorObserver;
-
- if( iDialogActive )
- {
- User::Leave( KErrInUse );
- }
-
- // Zeroing the Temporary buffers so that it doesn't contain any
- // left over value from the previous access
- iSettingsBufferPtr.Zero();
-
- // Obtain the UID for the selected Access point so that the configurator
- // can be highlighted
- TUint32 highlightUid( 0 );
-
- // if AP value is NULL, or zero, no temp AP, all previous changes have been frozen.
- TInt32 tempAP = GetTempAPValue();
- if ( tempAP == -1)
- {
- // Obtain the Server address value from the SUPL settings
- // API. If the value is set then it has to be shown to the user
- // as the existing value when he tries to configure the UI
- TRAP_IGNORE( iSUPLSettingsAdapter->GetIapNameL( iCurrentSlpId, iSettingsBufferPtr ) );
-
- TRAPD( error, highlightUid = ConvertIAPNameToIdL( iSettingsBufferPtr ) );
-
- if( error == KErrNotFound )
- {
- highlightUid = 0;
- }
- }
- else
- {
- highlightUid = tempAP;
- }
-
- CCmApplicationSettingsUi* apHandler = CCmApplicationSettingsUi::NewLC();
-
- iDialogActive = ETrue;
- TBool ret = EFalse;
- TCmSettingSelection selectionUid;
- selectionUid.iId = highlightUid;
- selectionUid.iResult = CMManager::EConnectionMethod ;
- TBearerFilterArray filter;
- CleanupClosePushL( filter );
-
- // Need access points for bearer type CSD and Packet data only
- filter.AppendL( KUidCSDBearerType );
- filter.AppendL( KUidPacketDataBearerType );
- // Run CCmApplicationSettingsUi dialog only for Access points (Connection methods)
- // selectionUid contains UID to be highlighted, on return it will contain UID of selected CM
- TRAPD( error, ret =
- apHandler->RunApplicationSettingsL(
- selectionUid , CMManager::EShowConnectionMethods, filter
- ) ); // | CMManager::EShowAlwaysAsk
-
- iDialogActive = EFalse;
- if( error == CMManager::KErrConnectionNotFound )
- {
- // No AP defined, Show Note
- ShowNoteL();
- //User::Leave( error );
- }
- CleanupStack::PopAndDestroy( &filter );
- CleanupStack::PopAndDestroy( apHandler );
-
- if( ret )
- {
- SetTempAPValue(selectionUid.iId);
- RCmManager cmManager;
- cmManager.OpenLC();
-
- RArray< TUint32 > cmArray;
- HBufC* cmName = NULL;
- RCmConnectionMethod method;
- // Get all the CMs into cmArray
- cmManager.ConnectionMethodL( cmArray, ETrue, EFalse );
- CleanupClosePushL( cmArray );
-
- // Get name of selected CM
- TInt count = cmArray.Count();
- for ( TInt i = 0; i < count; i++ )
- {
- if (selectionUid.iId == cmArray[i] )
- {
- method = cmManager.ConnectionMethodL( cmArray[i] );
- CleanupClosePushL( method );
- cmName = method.GetStringAttributeL( CMManager::ECmName );
- CleanupStack::PushL( cmName );
- iSettingsBufferPtr.Copy( cmName->Des() );
- CleanupStack::PopAndDestroy( cmName );
- CleanupStack::PopAndDestroy( &method );
- break;
- }
- }
- CleanupStack::PopAndDestroy( &cmArray );
- CleanupStack::PopAndDestroy( &cmManager );
- if( iEditorObserver )
- {
- iEditorObserver->UpdateIapL( iSettingsBufferPtr );
- }
- }
-
- DEBUG( - CLocSUPLSettingsUiEngine::LaunchApConfiguratorL );
- }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL
-// Launches the SUPL Usage Configurator
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL()
- {
- DEBUG( + CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL );
- if( iDialogActive )
- {
- User::Leave( KErrInUse );
- }
-
- // Allocate the descriptor array for Text settings for System
- // of measurement
- CDesCArrayFlat* items = new( ELeave ) CDesCArrayFlat( KNoofUsageSettings );
- CleanupStack::PushL( items );
-
- // Allocate all the Settings usage string
-
- // Append the radio-button list items
- items->AppendL( iSUPLSettingsAdapter->Automatic() );
- items->AppendL( iSUPLSettingsAdapter->AutomaticAtHome() );
- items->AppendL( iSUPLSettingsAdapter->AlwaysAsk() );
- items->AppendL( iSUPLSettingsAdapter->Disable() );
-
- // Obtain the current value for SUPL settings usage
- // This would be used for setting the default value for
- // the text settings page
- TInt currentSettings = iSUPLSettingsAdapter->GetSuplUsageIndex();
-
- CAknRadioButtonSettingPage* dlg =
- new ( ELeave )CAknRadioButtonSettingPage( R_LOC_SUPLUSAGE_SETTINGS,
- currentSettings,
- items );
- // Settings Outstanding flag is marked True to enable dismissal incase
- // of a Cancel event
- iDialogActive = ETrue;
- if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
- {
- CLocSUPLSettingsAdapter::TLocSuplUsage newValue =
- static_cast<CLocSUPLSettingsAdapter::TLocSuplUsage>( currentSettings );
-
- iSUPLSettingsAdapter->SetSuplUsageL( newValue );
- }
-
- iDialogActive = EFalse;
-
- // Free the items resource
- CleanupStack::PopAndDestroy( items );
- DEBUG( - CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL );
- }
// ---------------------------------------------------------------------------
// void CLocSUPLSettingsUiEngine::Close
@@ -395,59 +176,14 @@
void CLocSUPLSettingsUiEngine::Close()
{
DEBUG( + CLocSUPLSettingsUiEngine::Close );
- Cancel();
// Cancel the Initalization request. This call Cancels if there is an
// outstanding request. If not, does nothing
iSUPLSettingsAdapter->CancelInitialize();
- // If any of the dialogs are active then issue a cancel event on the
- // dialogs
- if( iDialogActive )
- {
- TKeyEvent keyEvent;
- keyEvent.iCode = EKeyCBA2;
- keyEvent.iScanCode = EStdKeyDevice1;
- keyEvent.iModifiers = EAllModifiers;
- keyEvent.iRepeats = 0;
- CCoeEnv* cCoeEnv = CCoeEnv::Static();
-
- // Simulate a Cancel event on the running dialogs. The Simulated event
- // is for the Left Soft Key.
- // Ignore the error incase of a leave
-
- TRAP_IGNORE( cCoeEnv->SimulateKeyEventL( keyEvent, EEventKey ) );
- }
DEBUG( - CLocSUPLSettingsUiEngine::Close );
}
-// ---------------------------------------------------------------------------
-// TPtr16 CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-//
-TPtr16 CLocSUPLSettingsUiEngine::GetSuplUsageL()
- {
- DEBUG( + CLocSUPLSettingsUiEngine::GetSuplUsageL );
- // Zeroing the Temporary buffers so that it doesn't contain any
- // left over value from the previous access
- iSettingsBufferPtr.Zero();
- iConversionBufferPtr.Zero();
-
- // Obtain the Settings values from the SUPL settings API
- iSUPLSettingsAdapter->GetSuplUsageL( iSettingsBufferPtr );
- iConversionBufferPtr.Copy( iSettingsBufferPtr );
- DEBUG( - CLocSUPLSettingsUiEngine::GetSuplUsageL );
- return iConversionBufferPtr;
- }
-
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsUiEngine::GetSuplUsage()
- {
- return iSUPLSettingsAdapter->GetSuplUsage();
- }
// ---------------------------------------------------------------------------
// void CLocSUPLSettingsUiEngine::HandleSuplSettingsChangeL
@@ -465,57 +201,18 @@
}
// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RunL()
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::RunL()
- {
- DEBUG( + CLocSUPLSettingsUiEngine::RunL );
- // If the Confirmation query is present then we have to Pop up the
- // IAP Selection dialog based on User Action
- if( iConfirmQuery )
- {
- // Incase there has been a response from the User then the Key pressed
- // is present in the iStatus variable
- if( EAknSoftkeyYes == iStatus.Int() )
- {
- iObserver.HandleSettingsEventL(
- MLocSUPLSettingsUiEngObserver::EIAPSelectionComplete );
- }
- else
- {
- iObserver.HandleSettingsEventL(
- MLocSUPLSettingsUiEngObserver::EIAPSelectionCancelled );
- }
-
- // Destroy the IAP confirmation query handle
- delete iConfirmQuery;
- iConfirmQuery = NULL;
- }
- DEBUG( - CLocSUPLSettingsUiEngine::RunL );
- }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::DoCancel()
+// void CLocSUPLSettingsUiEngine::GenerateHslpAddressFromImsi()
//
// ---------------------------------------------------------------------------
//
-void CLocSUPLSettingsUiEngine::DoCancel()
+void CLocSUPLSettingsUiEngine::GenerateHslpAddressFromImsi(TDes& aIMSIAddress)
{
DEBUG( + CLocSUPLSettingsUiEngine::DoCancel );
- if( iConfirmQuery )
- {
- // If the confirmation query is running Cancel the query
- iConfirmQuery->CancelConfirmationQuery();
-
- delete iConfirmQuery;
- iConfirmQuery = NULL;
-
- }
+ iSUPLSettingsAdapter->GenerateHslpAddressFromImsi(aIMSIAddress);
DEBUG( - CLocSUPLSettingsUiEngine::DoCancel );
}
+
// ---------------------------------------------------------------------------
// TUint CLocSUPLSettingsUiEngine::ConvertIAPNameToIdL()
// Obtains the index UID corresponding to the Access point name
@@ -592,33 +289,6 @@
DEBUG( - CLocSUPLSettingsUiEngine::DisplayErrorL );
}
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::ShowNoteL()
-// Displays No access point defined note
-//
-// @param None
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsUiEngine::ShowNoteL()
- {
- DEBUG( + CLocSUPLSettingsUiEngine::ShowNoteL );
- // Show Info Note "No Access Points Defined"
- HBufC* tmp = StringLoader::LoadL( R_LOC_NO_AP_DEFINED );
- CleanupStack::PushL( tmp );
- CAknNoteDialog* dlg =
- new ( ELeave ) CAknNoteDialog
- (
- REINTERPRET_CAST( CEikDialog**, &dlg ),
- CAknNoteDialog::ENoTone,
- CAknNoteDialog::EShortTimeout
- );
- dlg->PrepareLC( R_GENERAL_NOTE );
- dlg->SetTextL( *tmp );
- TInt retval = dlg->RunLD();
- CleanupStack::PopAndDestroy( tmp ); // temp
- DEBUG( - CLocSUPLSettingsUiEngine::ShowNoteL );
- return retval;
- }
// ---------------------------------------------------------------------------
// void CLocSUPLSettingsUiEngine::EditServerL()
@@ -630,21 +300,43 @@
//
void CLocSUPLSettingsUiEngine::EditServerL( TBool iIsEditable, TInt64 aSlpId )
{
- DEBUG( + CLocSUPLSettingsUiEngine::EditServerL );
- if( iEditorDlg )
- {
- delete iEditorDlg;
- iEditorDlg = NULL;
- }
- iEditorDlg = CLocSUPLServerEditor::NewL( iIsEditable, *this, aSlpId );
+ DEBUG( + CLocSUPLSettingsUiEngine::EditServerL );
+ if (iEditorDlg)
+ {
+ delete iEditorDlg;
+ iEditorDlg = NULL;
+ }
+ iEditorDlg = CLocSUPLServerEditor::NewL(iIsEditable, *this, aSlpId);
+ if (aSlpId > 0)
+ {
+ CServerParams *params = CServerParams::NewL();
+ CleanupStack::PushL(params);
+ GetSlpInfoFromIdL(aSlpId, params);
+
+ HBufC* hslpAddr = HBufC::NewLC(KMaxHSLPAddrLen);
+ HBufC* iapName = HBufC::NewLC(KMaxIAPLen);
+ TInt64 slpId;
+ TBool enabledFlag, simChangeFlag, usageInHomeNwFlag, editFlag;
+
+ TInt errParams = params->Get(slpId, hslpAddr->Des(), iapName->Des(),
+ enabledFlag, simChangeFlag, usageInHomeNwFlag, editFlag);
+ if (iapName->Length() > 0)
+ {
+ iEditorDlg->SetAccessPointEnabled(ETrue);
+ }
+
+ CleanupStack::PopAndDestroy(3, params);
+ }
+
TInt error = iEditorDlg->ExecuteLD();
- if ( EEikCmdExit == error )
+ if (EEikCmdExit == error)
{
- ( ( CAknViewAppUi* ) CEikonEnv::Static()->EikAppUi())->HandleCommandL( EEikCmdExit );
- }
- iEditorDlg = NULL;
-
- DEBUG( - CLocSUPLSettingsUiEngine::EditServerL );
+ ((CAknViewAppUi*) CEikonEnv::Static()->EikAppUi())->HandleCommandL(
+ EEikCmdExit);
+ }
+ iEditorDlg = NULL;
+
+ DEBUG( - CLocSUPLSettingsUiEngine::EditServerL );
}
// ---------------------------------------------------------------------------
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -292,42 +292,33 @@
ChangeMSKL();
break;
}
- // Handle all the internal view specific commands here
- case ELocSuplChange:
- case ELocSuplMSKChange:
- {
- // Launch the SUPL Settings usage configurator.
- // The error code is ignored since the necessary UI
- // notification would be convveyed by the Engine
- TRAP_IGNORE( iEngine.LaunchSuplUsageConfiguratorL() );
- break;
- }
+
case ELocSuplOpen:
case ELocSuplMSKOpen:
{
TInt index = SelectedItemIndex();
switch( index )
{
- case 1:
- {
- // Launch the Supl Server List.
- // The error code is ignored since the necessary UI
- // notification would be convveyed by the Engine
- iViewLaunched = 1;
- TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLServerUiViewId ) );
- break;
- }
- case 2:
- {
- TInt sessionCount = iContainer->ActiveSessionCount();
- if( sessionCount )
- {
- iViewLaunched = 2;
- // Launch the Supl sessions view.
- TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSessionUiViewId ) );
- }
- break;
- }
+ case 0:
+ {
+ // Launch the Supl Server List.
+ // The error code is ignored since the necessary UI
+ // notification would be convveyed by the Engine
+ iViewLaunched = 0;
+ TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLServerUiViewId ) );
+ break;
+ }
+ case 1:
+ {
+ TInt sessionCount = iContainer->ActiveSessionCount();
+ if (sessionCount)
+ {
+ iViewLaunched = 1;
+ // Launch the Supl sessions view.
+ TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSessionUiViewId ) );
+ }
+ break;
+ }
default:
break;
}
@@ -444,37 +435,27 @@
{
case 0:
{
- //aMenuPane->SetItemDimmed( ELocSuplChange, EFalse );
- //aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue );
+ aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
break;
}
case 1:
{
- //aMenuPane->SetItemDimmed( ELocSuplChange, ETrue );
- //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
- aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
- aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
- break;
- }
- case 2:
- {
- aMenuPane->SetItemDimmed( ELocSuplChange, ETrue );
TInt sessionCount = iContainer->ActiveSessionCount();
switch( sessionCount )
{
case 0:
{
- //aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue );
+ aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue );
aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
break;
}
case 1:
{
- //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
+ aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
aMenuPane->SetItemDimmed( ELocSuplClearSession, EFalse );
aMenuPane->SetItemSpecific(ELocSuplClearSession, ETrue);
aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
@@ -482,7 +463,7 @@
}
default:
{
- //aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
+ aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
aMenuPane->SetItemDimmed( ELocSuplClearSessions, EFalse );
aMenuPane->SetItemSpecific(ELocSuplClearSessions, ETrue);
--- a/supl/locationomasuplprotocolhandler/group/bld.inf Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/group/bld.inf Wed Sep 15 12:40:28 2010 +0300
@@ -44,6 +44,5 @@
#include "../waplistener/group/bld.inf"
#include "../syncmlprovhandler/group/bld.inf"
#include "../provisioninghandler/group/bld.inf"
-#include "../notifier/group/bld.inf"
// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandler/bwins/eposomasuplprotocolhandleru.def Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/bwins/eposomasuplprotocolhandleru.def Wed Sep 15 12:40:28 2010 +0300
@@ -25,18 +25,16 @@
?SetIAPId@COMASuplSettings@@QAEXH@Z @ 24 NONAME ; void COMASuplSettings::SetIAPId(int)
?ReadOMASuplSettingsL@COMASuplCommonConfig@@QAEXXZ @ 25 NONAME ; void COMASuplCommonConfig::ReadOMASuplSettingsL(void)
?CancelRunSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 26 NONAME ; void COMASUPLProtocolManager::CancelRunSession(class CSuplSessionBase *)
- ?SetSUPLUsage@COMASuplSettings@@QAEXAAW4TSuplSettingsUsage@CSuplSettings@@@Z @ 27 NONAME ; void COMASuplSettings::SetSUPLUsage(enum CSuplSettings::TSuplSettingsUsage &)
- ??1COMASUPLProtocolManager@@UAE@XZ @ 28 NONAME ; COMASUPLProtocolManager::~COMASUPLProtocolManager(void)
- ?HandleSuplMessageL@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@AAVTRequestStatus@@PAVHBufC8@@@Z @ 29 NONAME ; void COMASUPLProtocolManager::HandleSuplMessageL(class CSuplSessionBase *, class TRequestStatus &, class HBufC8 *)
- ?GetSUPLMessageVersionL@COMASUPLProtocolManager@@UAEHAAHABVTDesC8@@@Z @ 30 NONAME ; int COMASUPLProtocolManager::GetSUPLMessageVersionL(int &, class TDesC8 const &)
- ?ConstructL@COMASuplSettings@@AAEXXZ @ 31 NONAME ; void COMASuplSettings::ConstructL(void)
- ?NewL@COMASUPLProtocolManager@@SAPAV1@XZ @ 32 NONAME ; class COMASUPLProtocolManager * COMASUPLProtocolManager::NewL(void)
- ?HandlePacket@COMASUPLProtocolManager@@UAEXABVTDesC8@@I@Z @ 33 NONAME ; void COMASUPLProtocolManager::HandlePacket(class TDesC8 const &, unsigned int)
- ?CancelSuplTriggerSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 34 NONAME ; void COMASUPLProtocolManager::CancelSuplTriggerSession(class CSuplSessionBase *)
- ?InitializeL@COMASUPLProtocolManager@@UAEXPAVCSuplCommunicationManager@@AAVTRequestStatus@@@Z @ 35 NONAME ; void COMASUPLProtocolManager::InitializeL(class CSuplCommunicationManager *, class TRequestStatus &)
- ?SUPLUsage@COMASuplSettings@@QBE?AW4TSuplSettingsUsage@CSuplSettings@@XZ @ 36 NONAME ; enum CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage(void) const
- ?NewL@COMASuplCommonConfig@@SAPAV1@XZ @ 37 NONAME ; class COMASuplCommonConfig * COMASuplCommonConfig::NewL(void)
- ?SLPAddress@COMASuplSettings@@QBEABVTDesC8@@XZ @ 38 NONAME ; class TDesC8 const & COMASuplSettings::SLPAddress(void) const
- ?HandlePacketError@COMASUPLProtocolManager@@UAEXH@Z @ 39 NONAME ; void COMASUPLProtocolManager::HandlePacketError(int)
- ?NewL@COMASuplSettings@@SAPAV1@XZ @ 40 NONAME ; class COMASuplSettings * COMASuplSettings::NewL(void)
+ ??1COMASUPLProtocolManager@@UAE@XZ @ 27 NONAME ; COMASUPLProtocolManager::~COMASUPLProtocolManager(void)
+ ?HandleSuplMessageL@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@AAVTRequestStatus@@PAVHBufC8@@@Z @ 28 NONAME ; void COMASUPLProtocolManager::HandleSuplMessageL(class CSuplSessionBase *, class TRequestStatus &, class HBufC8 *)
+ ?GetSUPLMessageVersionL@COMASUPLProtocolManager@@UAEHAAHABVTDesC8@@@Z @ 29 NONAME ; int COMASUPLProtocolManager::GetSUPLMessageVersionL(int &, class TDesC8 const &)
+ ?ConstructL@COMASuplSettings@@AAEXXZ @ 30 NONAME ; void COMASuplSettings::ConstructL(void)
+ ?NewL@COMASUPLProtocolManager@@SAPAV1@XZ @ 31 NONAME ; class COMASUPLProtocolManager * COMASUPLProtocolManager::NewL(void)
+ ?HandlePacket@COMASUPLProtocolManager@@UAEXABVTDesC8@@I@Z @ 32 NONAME ; void COMASUPLProtocolManager::HandlePacket(class TDesC8 const &, unsigned int)
+ ?CancelSuplTriggerSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 33 NONAME ; void COMASUPLProtocolManager::CancelSuplTriggerSession(class CSuplSessionBase *)
+ ?InitializeL@COMASUPLProtocolManager@@UAEXPAVCSuplCommunicationManager@@AAVTRequestStatus@@@Z @ 34 NONAME ; void COMASUPLProtocolManager::InitializeL(class CSuplCommunicationManager *, class TRequestStatus &)
+ ?NewL@COMASuplCommonConfig@@SAPAV1@XZ @ 35 NONAME ; class COMASuplCommonConfig * COMASuplCommonConfig::NewL(void)
+ ?SLPAddress@COMASuplSettings@@QBEABVTDesC8@@XZ @ 36 NONAME ; class TDesC8 const & COMASuplSettings::SLPAddress(void) const
+ ?HandlePacketError@COMASUPLProtocolManager@@UAEXH@Z @ 37 NONAME ; void COMASUPLProtocolManager::HandlePacketError(int)
+ ?NewL@COMASuplSettings@@SAPAV1@XZ @ 38 NONAME ; class COMASuplSettings * COMASuplSettings::NewL(void)
--- a/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def Wed Sep 15 12:40:28 2010 +0300
@@ -3,54 +3,52 @@
_ZN16COMASuplSettings10ConstructLEv @ 2 NONAME
_ZN16COMASuplSettings10IsHslpNullEv @ 3 NONAME
_ZN16COMASuplSettings11SetUIActiveEi @ 4 NONAME
- _ZN16COMASuplSettings12SetSUPLUsageERN13CSuplSettings18TSuplSettingsUsageE @ 5 NONAME
- _ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 6 NONAME
- _ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 7 NONAME
- _ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 8 NONAME
- _ZN16COMASuplSettings4NewLEv @ 9 NONAME
- _ZN16COMASuplSettings8SetIAPIdEi @ 10 NONAME
- _ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 11 NONAME
- _ZN20COMASuplCommonConfig4NewLEv @ 12 NONAME
- _ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 13 NONAME
- _ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 14 NONAME
- _ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 15 NONAME
- _ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 16 NONAME
- _ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 17 NONAME
- _ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 18 NONAME
- _ZN23COMASUPLProtocolManager16CancelInitializeEv @ 19 NONAME
- _ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 20 NONAME
- _ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 21 NONAME
- _ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 22 NONAME
- _ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 23 NONAME
- _ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 24 NONAME
- _ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 25 NONAME
- _ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 26 NONAME
- _ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 27 NONAME
- _ZN23COMASUPLProtocolManager30MakeLocationConversionRequestLEP16CSuplSessionBaseR12TGeoCellInfoR14TRequestStatus @ 28 NONAME
- _ZN23COMASUPLProtocolManager31CancelLocationConversionRequestEP16CSuplSessionBase @ 29 NONAME
- _ZN23COMASUPLProtocolManager4NewLEv @ 30 NONAME
- _ZN23COMASUPLProtocolManagerC1Ev @ 31 NONAME
- _ZN23COMASUPLProtocolManagerC2Ev @ 32 NONAME
- _ZN23COMASUPLProtocolManagerD0Ev @ 33 NONAME
- _ZN23COMASUPLProtocolManagerD1Ev @ 34 NONAME
- _ZN23COMASUPLProtocolManagerD2Ev @ 35 NONAME
- _ZNK16COMASuplSettings10IsUIActiveEv @ 36 NONAME
- _ZNK16COMASuplSettings10SLPAddressEv @ 37 NONAME
- _ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 38 NONAME
- _ZNK16COMASuplSettings5IAPIdEv @ 39 NONAME
- _ZNK16COMASuplSettings9SUPLUsageEv @ 40 NONAME
- _ZTI13COMASuplTrace @ 41 NONAME
- _ZTI16COMASuplSettings @ 42 NONAME
- _ZTI20COMASuplCommonConfig @ 43 NONAME
- _ZTI20COMASuplDeInitilizer @ 44 NONAME
- _ZTI23COMASUPLProtocolManager @ 45 NONAME
- _ZTI26COMASuplInitilizeRequestor @ 46 NONAME
- _ZTV13COMASuplTrace @ 47 NONAME
- _ZTV16COMASuplSettings @ 48 NONAME
- _ZTV20COMASuplCommonConfig @ 49 NONAME
- _ZTV20COMASuplDeInitilizer @ 50 NONAME
- _ZTV23COMASUPLProtocolManager @ 51 NONAME
- _ZTV26COMASuplInitilizeRequestor @ 52 NONAME
- _ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 53 NONAME
- _ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 54 NONAME
+ _ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 5 NONAME
+ _ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 6 NONAME
+ _ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 7 NONAME
+ _ZN16COMASuplSettings4NewLEv @ 8 NONAME
+ _ZN16COMASuplSettings8SetIAPIdEi @ 9 NONAME
+ _ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 10 NONAME
+ _ZN20COMASuplCommonConfig4NewLEv @ 11 NONAME
+ _ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 12 NONAME
+ _ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 13 NONAME
+ _ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 14 NONAME
+ _ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 15 NONAME
+ _ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 16 NONAME
+ _ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 17 NONAME
+ _ZN23COMASUPLProtocolManager16CancelInitializeEv @ 18 NONAME
+ _ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 19 NONAME
+ _ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 20 NONAME
+ _ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 21 NONAME
+ _ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 22 NONAME
+ _ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 23 NONAME
+ _ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 24 NONAME
+ _ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 25 NONAME
+ _ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 26 NONAME
+ _ZN23COMASUPLProtocolManager30MakeLocationConversionRequestLEP16CSuplSessionBaseR12TGeoCellInfoR14TRequestStatus @ 27 NONAME
+ _ZN23COMASUPLProtocolManager31CancelLocationConversionRequestEP16CSuplSessionBase @ 28 NONAME
+ _ZN23COMASUPLProtocolManager4NewLEv @ 29 NONAME
+ _ZN23COMASUPLProtocolManagerC1Ev @ 30 NONAME
+ _ZN23COMASUPLProtocolManagerC2Ev @ 31 NONAME
+ _ZN23COMASUPLProtocolManagerD0Ev @ 32 NONAME
+ _ZN23COMASUPLProtocolManagerD1Ev @ 33 NONAME
+ _ZN23COMASUPLProtocolManagerD2Ev @ 34 NONAME
+ _ZNK16COMASuplSettings10IsUIActiveEv @ 35 NONAME
+ _ZNK16COMASuplSettings10SLPAddressEv @ 36 NONAME
+ _ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 37 NONAME
+ _ZNK16COMASuplSettings5IAPIdEv @ 38 NONAME
+ _ZTI13COMASuplTrace @ 39 NONAME
+ _ZTI16COMASuplSettings @ 40 NONAME
+ _ZTI20COMASuplCommonConfig @ 41 NONAME
+ _ZTI20COMASuplDeInitilizer @ 42 NONAME
+ _ZTI23COMASUPLProtocolManager @ 43 NONAME
+ _ZTI26COMASuplInitilizeRequestor @ 44 NONAME
+ _ZTV13COMASuplTrace @ 45 NONAME
+ _ZTV16COMASuplSettings @ 46 NONAME
+ _ZTV20COMASuplCommonConfig @ 47 NONAME
+ _ZTV20COMASuplDeInitilizer @ 48 NONAME
+ _ZTV23COMASUPLProtocolManager @ 49 NONAME
+ _ZTV26COMASuplInitilizeRequestor @ 50 NONAME
+ _ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 51 NONAME
+ _ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 52 NONAME
--- a/supl/locationomasuplprotocolhandler/protocolhandler/group/omasuplprotocolhandler.mmp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/group/omasuplprotocolhandler.mmp Wed Sep 15 12:40:28 2010 +0300
@@ -72,7 +72,7 @@
LIBRARY insock.lib
LIBRARY lbs.lib
LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+
LIBRARY hash.lib
LIBRARY bafl.lib //logging
LIBRARY flogger.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h Wed Sep 15 12:40:28 2010 +0300
@@ -90,13 +90,7 @@
*/
IMPORT_C void SetIAPId(TInt aIAPId);
- /**
- * SetSUPLUsage Method.
- * @since S60 v3.2
- * @param aSUPLUsage
- * @return None
- */
- IMPORT_C void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
+
/**
* SetUIActive Method.
@@ -131,13 +125,7 @@
*/
IMPORT_C TInt IAPId() const;
- /**
- * SUPL Usage Method.
- * @since S60 v3.2
- * @param None
- * @return SUPL Usage
- */
- IMPORT_C CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
+
/**
* IAPId Method.
@@ -165,8 +153,7 @@
// IAP Id
TInt iIAPId;
- // SUPL Usage
- CSuplSettings::TSuplSettingsUsage iSUPLUsage;
+
// Flag indicating the activation of settings UI
TBool iSettingsUIActive;
};
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplsettings.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplsettings.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -127,27 +127,6 @@
return iIAPId;
}
-// -----------------------------------------------------------------------------
-// COMASuplSettings::SetSUPLUsage
-// Sets the SUPL Usage
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage )
- {
- iSUPLUsage = aSUPLUsage;
- }
-
-// -----------------------------------------------------------------------------
-// COMASuplSettings::SUPLUsage()
-// Gets the SUPL Usage
-//
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
- {
- return iSUPLUsage;
- }
// -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/eabi/eposomasuplprotocolhandler1u.def Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/eabi/eposomasuplprotocolhandler1u.def Wed Sep 15 12:40:28 2010 +0300
@@ -36,29 +36,27 @@
_ZTI23COMASuplFallBackHandler @ 35 NONAME
_ZTI24COMASUPLProtocolManager1 @ 36 NONAME
_ZTI24COMASuplEcomEventWatcher @ 37 NONAME
- _ZTI24COMASuplSettingsLauncher @ 38 NONAME
- _ZTI29COMASuplCompleteSelfRequestor @ 39 NONAME
- _ZTV12COMASuplETel @ 40 NONAME
- _ZTV13COMASuplState @ 41 NONAME
- _ZTV13COMASuplTrace @ 42 NONAME
- _ZTV15COMASuplSession @ 43 NONAME
- _ZTV16COMASuplEndState @ 44 NONAME
- _ZTV16COMASuplPosState @ 45 NONAME
- _ZTV17COMASuplInitState @ 46 NONAME
- _ZTV18COMASuplStartState @ 47 NONAME
- _ZTV19COMASuplDialogTimer @ 48 NONAME
- _ZTV19COMASuplIapNotifier @ 49 NONAME
- _ZTV20COMASuplETelNotifier @ 50 NONAME
- _ZTV20COMASuplPOSRequestor @ 51 NONAME
- _ZTV20COMASuplPosInitState @ 52 NONAME
- _ZTV20COMASuplTimeoutTimer @ 53 NONAME
- _ZTV21COMASuplConnRequestor @ 54 NONAME
- _ZTV21COMASuplResponseState @ 55 NONAME
- _ZTV23COMASuplFallBackHandler @ 56 NONAME
- _ZTV24COMASUPLProtocolManager1 @ 57 NONAME
- _ZTV24COMASuplEcomEventWatcher @ 58 NONAME
- _ZTV24COMASuplSettingsLauncher @ 59 NONAME
- _ZTV29COMASuplCompleteSelfRequestor @ 60 NONAME
- _ZThn4_N24COMASUPLProtocolManager112HandlePacketERK6TDesC8j @ 61 NONAME
- _ZThn4_N24COMASUPLProtocolManager117HandlePacketErrorEi @ 62 NONAME
+ _ZTI29COMASuplCompleteSelfRequestor @ 38 NONAME
+ _ZTV12COMASuplETel @ 39 NONAME
+ _ZTV13COMASuplState @ 40 NONAME
+ _ZTV13COMASuplTrace @ 41 NONAME
+ _ZTV15COMASuplSession @ 42 NONAME
+ _ZTV16COMASuplEndState @ 43 NONAME
+ _ZTV16COMASuplPosState @ 44 NONAME
+ _ZTV17COMASuplInitState @ 45 NONAME
+ _ZTV18COMASuplStartState @ 46 NONAME
+ _ZTV19COMASuplDialogTimer @ 47 NONAME
+ _ZTV19COMASuplIapNotifier @ 48 NONAME
+ _ZTV20COMASuplETelNotifier @ 49 NONAME
+ _ZTV20COMASuplPOSRequestor @ 50 NONAME
+ _ZTV20COMASuplPosInitState @ 51 NONAME
+ _ZTV20COMASuplTimeoutTimer @ 52 NONAME
+ _ZTV21COMASuplConnRequestor @ 53 NONAME
+ _ZTV21COMASuplResponseState @ 54 NONAME
+ _ZTV23COMASuplFallBackHandler @ 55 NONAME
+ _ZTV24COMASUPLProtocolManager1 @ 56 NONAME
+ _ZTV24COMASuplEcomEventWatcher @ 57 NONAME
+ _ZTV29COMASuplCompleteSelfRequestor @ 58 NONAME
+ _ZThn4_N24COMASUPLProtocolManager112HandlePacketERK6TDesC8j @ 59 NONAME
+ _ZThn4_N24COMASUPLProtocolManager117HandlePacketErrorEi @ 60 NONAME
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp Wed Sep 15 12:40:28 2010 +0300
@@ -51,7 +51,7 @@
SOURCE epos_comasuplinitstate.cpp
SOURCE epos_comasuplposrequestor.cpp
SOURCE epos_comasuplecomeventwatcher.cpp
-SOURCE epos_comasuplsettingslauncher.cpp
+
SOURCE epos_comasupltrace.cpp
SOURCE epos_comasupldialogtimer.cpp
SOURCE epos_comasuplfallbackhandler.cpp
@@ -83,7 +83,7 @@
LIBRARY insock.lib
LIBRARY lbs.lib
LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+
LIBRARY hash.lib
LIBRARY bafl.lib //logging
LIBRARY flogger.lib
@@ -98,7 +98,7 @@
LIBRARY epos_suplsettings.lib
LIBRARY epos_suplterminitiation.lib
LIBRARY eposomasuplprotocolhandler.lib
-LIBRARY featmgr.lib
+LIBRARY featmgr.lib
#if USE_E_CELL_ID_STUB_FILES
LIBRARY estor.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Wed Sep 15 12:40:28 2010 +0300
@@ -41,9 +41,7 @@
* @since S60 v3.1
*/
-class COMASuplConnRequestor : public CActive,
- public MOMASuplUICompletionObserver,
- public MOMASuplDialogTimeOutNotifier
+class COMASuplConnRequestor : public CActive
{
enum TConnState
@@ -185,9 +183,7 @@
void GetUsedServerAddress(TDes& aHSLPAddressUsed);
- void SettingsUICompletedL(TInt aError);
- void SettingsUsageUICompletedL(TInt /*aError*/) {}
- void SettingsTimeOutUICompletedL(TInt /*aError*/) {}
+
TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId);
void UpdateNetInfo(const TTime& aLastTimeUsed,TInt& aMcc,TInt& aMnc,
TInt& aCid,TInt& aLac,TInt& aType,TInt& aErrorCode);
@@ -221,13 +217,7 @@
void SaveAccessPoint(const TDesC& aIapName);
- /**
- * Dialog Timeout Notifier Method.
- * @since Series 60 9.1 TB
- * @param None
- * @return None
- */
- virtual void DialogTimerExpiredL();
+
protected : // Functions from CActive
/**
* From CActive
@@ -301,15 +291,6 @@
TBool iIsSettingInitilized;
TInt64 iCurrentSLPId;
-
- COMASuplDialogTimer* iDialogTimer;
-
- TBool iIapDialogShown;
-
- TBool iIapDlgTimerExpired;
-
- TBool iIsTimeoutDialogTimerStarted;
-
TBool iPrompt;
TBool iWlanOnly;
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h Wed Sep 15 12:40:28 2010 +0300
@@ -81,7 +81,6 @@
public MSuplEcomEventObserver,
public MSuplSettingsObserver,
public MOMASuplTimeOutNotifier,
- public MOMASuplUISettingsObserver,
public MOMASuplETelNotifierObserver
{
@@ -272,40 +271,12 @@
public:
- // For setting UI observer
- TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
- TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
- TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
+
void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
-
- void CancelUiLaunch();
void SettingsChanged();
- TInt GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId);
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUsageUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI completion
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsTimeOutUICompletedL(TInt aError);
+
public: //From base class MSuplSettingsObserver
@@ -458,13 +429,7 @@
void ProcessInvalidSessionL(COMASuplAsnMessageBase* aDecodedMsg);
- /**
- * ReadSuplUsage, Reads OMA Supl Usage.
- * @since S60 v3.1u
- * @param None.
- * @return None.
- */
- void ReadSuplUsage();
+
/**
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Wed Sep 15 12:40:28 2010 +0300
@@ -95,15 +95,13 @@
class COMASuplSession : public CSuplSessionBase,
public MOMASuplConnObserver,
- public MOMASuplUICompletionObserver,
public MCompleteSelfRequest,
public MOMASuplMsgStateObserver,
public MOMASuplObserver,
public MOMASuplPrivacyObserver,
public MOMASuplTimeOutNotifier,
public MOMASuplEtelCompletionObserver,
- public MOMASuplIapChangeNotifierObserver,
- public MOMASuplDialogTimeOutNotifier
+ public MOMASuplIapChangeNotifierObserver
{
public: // Constructors and destructor
@@ -209,27 +207,6 @@
*/
void GetPositionComplete(TInt aError);
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI
- * @return None
- */
- void SettingsUsageUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI
- * @return None
- */
- void SettingsTimeOutUICompletedL(TInt aError);
public:
/**
@@ -256,7 +233,7 @@
* @param aSessionIdSeed, seed value of session
* @param aRequestID, Request Identification number.
* @param aIsStaleCellId, indicates if this session is for a stale cell id conversion
- * @param aLocationId , contains cell id parameters for which position is to be retrieved
+ * @param aLocationId , contains cell id parameters for which position is to be retrieved,ownership is transferred to this object
* @param aPrompt indicates if the user is to be prompted when making location requests
* @param aWlanOnly ,request to connect server using wlan connection only using OCC Api's
* @return None
@@ -929,13 +906,7 @@
*/
virtual void TimerExpiredL();
- /**
- * Dialog Timeout Notifier Method.
- * @since Series 60 9.1 TB
- * @param None
- * @return None
- */
- virtual void DialogTimerExpiredL();
+
public: // Usage dialog
void SetSuplUsageFlag();
void ReSetSuplUsageFlag();
@@ -1090,8 +1061,7 @@
//Timeout Timer
COMASuplTimeoutTimer* iTimer;
-
- COMASuplDialogTimer* iDialogTimer;
+
//Roaming indicator
TBool iRoaming;
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplconnrequestor.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplconnrequestor.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -50,10 +50,7 @@
iCommMgr(aCommMgr),
iProtocolManager(aProtoMgr),
iPort(aPort),
- iObserver( aObserver),
- iIapDialogShown(EFalse),
- iIapDlgTimerExpired(EFalse),
- iIsTimeoutDialogTimerStarted(EFalse),iPrompt(EFalse),iWlanOnly(EFalse),iIsStaleLocIdPresent(EFalse)
+ iObserver( aObserver),iPrompt(EFalse),iWlanOnly(EFalse),iIsStaleLocIdPresent(EFalse)
{
}
@@ -80,7 +77,6 @@
iCurrentSLPId = KErrNotFound;
- iDialogTimer = COMASuplDialogTimer::NewL(*this);
}
// -----------------------------------------------------------------------------
@@ -110,12 +106,7 @@
COMASuplConnRequestor::~COMASuplConnRequestor()
{
Cancel();
- if(iDialogTimer)
- {
- iDialogTimer->Cancel();
- delete iDialogTimer;
- iDialogTimer = NULL;
- }
+
delete iSuplSettings;
delete iTrace;
delete iFallBackHandler;
@@ -144,48 +135,36 @@
if(errorCode == KErrNone)
{
- TBool ret = ConvertIAPNameToIdL(iapName,iIAPId);
- if(!ret)
- {
- buffer.Copy(_L("No access point configured for "));
- buffer.Append(iHostAddress);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- if( isIapDialogShown )
- {
- TInt err = iProtocolManager.LaunchSettingsUI(this,iHostAddress);
- if(err != KErrNone)
- {
- buffer.Copy(_L("Error in launching UI : "));
- buffer.AppendNum(err);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- iHostAddress.Zero();
- iObserver.OperationCompleteL(err);
- }
- else
- iIapDialogShown = ETrue;
- }
-
-
- }
- else
- {
- iIsTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->Cancel();
- buffer.Copy(_L("Connecting to "));
- buffer.Append(iHostAddress);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
- OpenConnection();
- }
- }
- else
- {
- iHostAddress.Zero();
- iObserver.OperationCompleteL(errorCode);
- }
+ TBool ret = ConvertIAPNameToIdL(iapName,iIAPId);
+ if(!ret)
+ {
+ buffer.Copy(_L("No access point configured for "));
+ buffer.Append(iHostAddress);
+ iTrace->Trace(buffer,KTraceFileName, __LINE__);
+ buffer.Copy(_L("Calling CreateConnection with no IAP"));
+ iTrace->Trace(buffer,KTraceFileName, __LINE__);
+ iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,-1);
+ OpenConnection();
+
+ }
+ else
+ {
+ buffer.Copy(_L("Connecting to "));
+ buffer.Append(iHostAddress);
+ iTrace->Trace(buffer,KTraceFileName, __LINE__);
+ iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
+ OpenConnection();
+ }
+ }
+ else
+ {
+ iHostAddress.Zero();
+ iObserver.OperationCompleteL(errorCode);
+ }
}
}
-
+
+
// -----------------------------------------------------------------------------
// COMASuplConnRequestor::CreateConnection for OCC
// -----------------------------------------------------------------------------
@@ -199,9 +178,7 @@
iPrompt = aPrompt;
iWlanOnly = aWlanOnly;
iIsStaleLocIdPresent = ETrue;
- iIsTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->Cancel();
-
+
TInt err;
err = iRepository->Get(KSuplGeoInfoConvServerName, GeoTagServerName);
User::LeaveIfError(err);
@@ -222,12 +199,9 @@
// -----------------------------------------------------------------------------
// COMASuplConnRequestor::OpenConnection
// -----------------------------------------------------------------------------
-//
-void COMASuplConnRequestor::CreateConnectionL(TInt aDialogTimeOutDelay)
+
+void COMASuplConnRequestor::CreateConnectionL(TInt /*aDialogTimeOutDelay*/)
{
- iIsTimeoutDialogTimerStarted = ETrue;
-
- iDialogTimer->StartTimer(aDialogTimeOutDelay);
CreateConnectionL();
}
// -----------------------------------------------------------------------------
@@ -268,8 +242,7 @@
if(iIsSettingInitilized)
{
-
- if(iConnection)
+ if(iConnection)
{
iState = EConnecting;
if(iIsStaleLocIdPresent)
@@ -456,6 +429,7 @@
void COMASuplConnRequestor::InitilizeSetting()
{
iTrace->Trace(_L("Intilizing Setting API..."), KTraceFileName, __LINE__);
+
iSuplSettings->Initialize(iStatus);
SetActive();
}
@@ -480,7 +454,10 @@
TUint COMASuplConnRequestor::GetPortNumber()
{
- return iConnection->GetPortNumberUsed();
+ if(iConnection)
+ return iConnection->GetPortNumberUsed();
+ else
+ return 0;
}
// -----------------------------------------------------------------------------
@@ -530,57 +507,7 @@
return result;
}
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::SettingsUICompleted
-//
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::SettingsUICompletedL(TInt aError)
- {
- TBuf<128> buffer(_L("COMASuplConnRequestor:SettingsUICompleted Error: "));
- buffer.AppendNum(aError);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
-
- if (iIsTimeoutDialogTimerStarted)
- {
- iTrace->Trace(_L("COMASuplSession::SettingsUICompleted, stopping timer "), KTraceFileName, __LINE__);
- iIsTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->StopTimer();
- }
- if (iIapDlgTimerExpired)
- {
- iIapDlgTimerExpired = EFalse;
- iIapDialogShown = EFalse;
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- iObserver.OperationCompleteL(KErrNone);
- return;
- }
- if(aError == KErrNone)
- {
- TBuf<100> IapName;
- TInt err = iProtocolManager.GetLastUsedAccessPoint(IapName,iIAPId);
- if(err == KErrNone)
- {
- buffer.Copy(_L("Connecting to "));
- buffer.Append(iHostAddress);
- buffer.Append(_L(" using IAP "));
- buffer.Append(IapName);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
- SaveAccessPoint(IapName);
- OpenConnection();
- }
- else
- {
- iObserver.OperationCompleteL(err);
- }
- }
- else
- {
- iObserver.OperationCompleteL(aError);
- }
-
- }
// -----------------------------------------------------------------------------
// COMASuplConnRequestor::SaveAccessPoint
@@ -646,19 +573,5 @@
iFallBackHandler->UpdateSLPListForHomeUsage(aHomeNetwork);
}
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::DialogTimerExpiredL
-// Checks whether UI is displayed or not previously
-//
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::DialogTimerExpiredL()
- {
- iTrace->Trace(_L("COMASuplConnRequestor:Timer Expired for SUPL IAP Dialog"), KTraceFileName, __LINE__);
- if (!iIapDialogShown)
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- else
- iIapDlgTimerExpired = ETrue;
- return;
- }
// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletel.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletel.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Implementation of COMASuplEtel Class
-* Version : %version: 3 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 3.1.1 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -524,7 +524,7 @@
for(TInt k = 0; k < KOMASUPLMaxTimeSlotIscpAmount; k++ )
{
- iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
+ iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iCustomWCDMACellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
}
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplinitstate.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplinitstate.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -257,7 +257,7 @@
// Notify Network Privacy of the request information
// Synchronous call
TInt RequestId;
- iNetworkPrivacy->NotifyLocationRequestL(*suplReqInfo,RequestId);
+ TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*suplReqInfo,RequestId);)
if(iIsNotificationOnly)
{
@@ -304,7 +304,6 @@
if(!clientError)
{
// Set name of Client
-
if(client)
{
suplReqInfo->SetLCSClientL(*client,iIdType);
@@ -321,8 +320,12 @@
// what decision the GSM Network will make if the user won't answer before
// a timeout comes in from GSM Network. In this case verification will
// be rejected.
- iNetworkPrivacy->VerifyLocationRequestL(*suplReqInfo,
- iGSMRequestId, *this, aTimeOutStrategy);
+ iTrace->Trace(_L("Calling iNetworkPrivacy->VerifyLocationRequestL"), KTraceFileName, __LINE__);
+
+
+ TRAP_IGNORE(iNetworkPrivacy->VerifyLocationRequestL(*suplReqInfo,
+ iGSMRequestId, *this, aTimeOutStrategy);)
+
TBuf<64> msg;
msg.Copy(_L("1.0 Privacy Fw Generated Verification Request id:"));
msg.AppendNum(iGSMRequestId);
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -105,11 +105,7 @@
// Destructor.
EXPORT_C COMASUPLProtocolManager1::~COMASUPLProtocolManager1()
{
- if(iSettingsLauncher)
- {
- iSettingsLauncher->CancelLaunch();
- }
-
+
if(iSuplSettings)
{
iSuplSettings->SetUIActive( EFalse );
@@ -138,7 +134,7 @@
delete iSuplEcomEventWatcher;
- delete iSettingsLauncher;
+
delete iNotifier;
iMobilePhone.Close();
iTelServer.Close();
@@ -176,7 +172,7 @@
iSuplStorageSettings = CSuplSettingsInternal::NewL();
iSuplStorageSettings->SetObserverL(*this);
- iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
+
iIMSI.CreateL( KMaxIMSILen );
iIsPreviouslyDecodingFailed = EFalse;
@@ -253,7 +249,7 @@
//Connect to ETel
User::LeaveIfError(ConnectToETelL());
- ReadSuplUsage();
+
if(iSuplEcomEventWatcher)
{
@@ -1203,7 +1199,6 @@
if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange)
{
iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__);
- ReadSuplUsage();
}
else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange)
{
@@ -1630,68 +1625,6 @@
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::LaunchSettingsUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager1::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSettingsUI"), KTraceFileName, __LINE__);
-
- if(iUIRequestArray.Count() <= 0 )
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSettingsUI"), KTraceFileName, __LINE__);
- iUIRequestArray.Append(aObserver);
- iSuplSettings->SetUIActive(ETrue);
- iCurrentlyUsedHslp.Copy(aForHslp);
- return iSettingsLauncher->LaunchSettings();
- }
- else if(iCurrentlyUsedHslp.Compare(aForHslp) == KErrNone)
- {
- iUIRequestArray.Append(aObserver);
- }
- else
- {
- return KErrInUse;
- }
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::SettingsUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager1::SettingsUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
-
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- for(TInt i = 0; i < iUIRequestArray.Count(); i++)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL,Forwarding ConnRerquestor "), KTraceFileName, __LINE__);
- MOMASuplUICompletionObserver* observer = iUIRequestArray[i];
- observer->SettingsUICompletedL(aError);
- }
-
- }
-
- iCurrentlyUsedHslp.Copy(_L(""));
- iUIRequestArray.Reset();
- }
-
// -----------------------------------------------------------------------------
// COMASUPLProtocolManager1::DeInitialize
@@ -1745,72 +1678,11 @@
return networkMode;
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__);
- if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent)
- return KErrInUse;
- // If timeout dialog is present, close it
- if (iTimeOutDialogPresent)
- {
- iTimeOutDialogPresent = EFalse;
- iSuplSettings->SetUIActive(EFalse);
- iSettingsLauncher->Cancel();
- }
- iSessnUIObserver = aObserver;
- iSuplSettings->SetUIActive(ETrue);
- return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming);
- }
+
+
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::SettingsUsageUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager1::SettingsUsageUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUsageUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUsageUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- if (iSessnUIObserver)
- iSessnUIObserver->SettingsUsageUICompletedL(aError);
- }
- CheckOutstandingUsageUIRequestsL();
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::ReadSuplUsage
-// Reads Supl Usage from Central Repository
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager1::ReadSuplUsage()
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage start"), KTraceFileName, __LINE__);
- CSuplSettings::TSuplSettingsUsage suplUsage;
- TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage);
- if(err == KErrNone )
- {
- iSuplSettings->SetSUPLUsage(suplUsage);
- }
- iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage end"), KTraceFileName, __LINE__);
- }
void COMASUPLProtocolManager1::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId)
{
@@ -1850,8 +1722,7 @@
OMAsuplSession = static_cast<COMASuplSession*>(iSuplSessions[cnt]);
if (OMAsuplSession->GetSuplUsageFlag())
- {
- OMAsuplSession->StartUsageDialogLaunchL();
+ {
break;
}
}
@@ -1935,62 +1806,7 @@
}
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchTimeOutUI"), KTraceFileName, __LINE__);
-
- iSessnUIObserver = aObserver;
- if (iSuplSettings->IsUIActive())
- {
- iSuplSettings->SetUIActive(EFalse);
- iSettingsLauncher->Cancel();
- }
- iSuplSettings->SetUIActive(ETrue);
- iTimeOutDialogPresent = ETrue;
- return iSettingsLauncher->LaunchSessionTimeOutDialog();
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::SettingsTimeOutUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager1::SettingsTimeOutUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
- iTimeOutDialogPresent = EFalse;
-
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsTimeOutUICompletedL, Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- if (iSessnUIObserver)
- iSessnUIObserver->SettingsTimeOutUICompletedL(aError);
- }
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::GetLastUsedAccessPoint
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager1::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId)
- {
- return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
- }
// -----------------------------------------------------------------------------
// COMASUPLProtocolManager1::PrintHex
@@ -2184,16 +2000,4 @@
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager1::CancelUiLaunch
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager1::CancelUiLaunch()
- {
- iTrace->Trace(_L("COMASUPLProtocolManager1::CancelUiLaunch"), KTraceFileName, __LINE__);
- iSettingsLauncher->CancelLaunch();
- }
-
// end of file
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -193,8 +193,6 @@
iIapNotifier = COMASuplIapNotifier::NewL(*this);
-
- iDialogTimer = COMASuplDialogTimer::NewL(*this);
iIsQoPPresent = EFalse;
iIsFirstPOSMessage = ETrue;
@@ -253,7 +251,6 @@
SessionEnd();
CompleteSession(KErrCancel);
}
- iProtocolManager.CancelUiLaunch();
delete this;
}
@@ -313,7 +310,6 @@
delete iTimer;
delete iIapNotifier;
iIMSI.Close();
- delete iDialogTimer;
delete iNetworkPrivacy;
@@ -2060,15 +2056,7 @@
iTrace->Trace(msg,KTraceFileName, __LINE__);
}
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
- if (usage == CSuplSettings::ESuplUsageDisabled)
- {
- msg.Copy(_L("SUPL Usage is disabled"));
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
- }
+
COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
@@ -3820,16 +3808,6 @@
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsUICompleted
-//
-// -----------------------------------------------------------------------------
-
-void COMASuplSession::SettingsUICompletedL(TInt /*aError*/)
- {
-
- }
-
// -----------------------------------------------------------------------------
// COMASuplSession::HandleInvalidMessageL
@@ -4131,57 +4109,7 @@
OperationCompleteL(KErrTimedOut);
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsUsageUICompletedL
-//
-// -----------------------------------------------------------------------------
-void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
- {
- iUIFlag = EFalse;
- TBuf<64> msg;
- msg.Copy(_L("SUPL Usage UI completed with ... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iPrevUsageResult = aError;
- iIhaveLaunchedUsagedialog = EFalse;
-
-
- if (aError == KErrNone)
- {
- iProtocolManager.UpdateAllSubSessnsInSameSession(iIpcSessionId);
-
- if (isTimeoutDialogTimerStarted)
- {
- iTrace->Trace(_L("COMASuplSession::SettingsUsageUICompletedL, stopping timer "), KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->StopTimer();
-
- //Compute how log the dialog was on
- TTime nowTime;
- nowTime.HomeTime();
- nowTime.SecondsFrom(iDlgStartTime, iDiffTime);
- }
- if (iNwInitError)
- {
- iNwInitError = EFalse;
- HandleSuplInitErrorL(iNwInitCompletionCode);
- }
- else
- InitializeL(iRequestID);
- }
- else if (aError == KErrCompletion)
- CheckForSuplUsageL();
- else
- {
- TBuf<64> msg;
- msg.Copy(_L("Error after SUPL Usage Popup... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
- }
- }
// -----------------------------------------------------------------------------
// COMASuplSession::CheckForSuplUsageL
@@ -4190,37 +4118,23 @@
void COMASuplSession::CheckForSuplUsageL()
{
- if (iSuplUsage >= 1)
- {
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
- if (usage == CSuplSettings::ESuplUsageDisabled)
- {
- iSessionObserver.TerminateSession(this, KErrGeneral);
- }
- else if (usage == CSuplSettings::ESuplUsageAutomatic)
- {
+
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- InitializeL(iRequestID);
- }
-
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
- {
- if (iRoaming)
+ {
+ if (iRoaming)
HandleRoamingCheckCompleteL(KErrNone, EFalse);
else
{
iEtelRoamingCheck = ETrue;
iProtocolManager.CheckForRoaming();
}
- }
- }
- else
- InitializeL(iRequestID);
+ }
+
}
@@ -4303,87 +4217,7 @@
{
iUsageHomeNW = aHomeNw;
iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
- if (usage == CSuplSettings::ESuplUsageAlwaysAsk || iStaleLocIdPrompt)
- {
- TInt err;
- if (!iSuplSettings->IsUIActive() )
- {
- if (!aHomeNw)
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- iIhaveLaunchedUsagedialog = ETrue;
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
- }
- else
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
- iIhaveLaunchedUsagedialog = ETrue;
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);
- }
- }
- else
- err = KErrInUse;
-
- if(KErrNone != err && KErrInUse == err)
- {
- iTrace->Trace(_L("Dialog in use, setting flag"), KTraceFileName, __LINE__);
- SetSuplUsageFlag();
- }
- if( KErrNone == err && iRequestType == ESUPL_NETWORK )
- {
- iTrace->Trace(_L("Network Session , starting timer"), KTraceFileName, __LINE__);
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- iDlgStartTime.HomeTime();
- }
- else if (KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
-
- }
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
- {
- if (!aHomeNw)
- {
- TInt err;
- //if (!iSuplSettings->IsUIActive() )
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
+
if(iSuplMsgType == ESUPL_INIT)
{
@@ -4406,47 +4240,35 @@
msg.AppendNum(delay);
iTrace->Trace(msg, KTraceFileName, __LINE__);
isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
+
}
else
{
if (iSuplInitTimeOut > 0)
{
isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
+
}
else
iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
}
}
- }
-
- if(!iSuplSettings->IsUIActive() && KErrNone != err)
- {
- SetSuplUsageFlag();
- }
- else
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
- }
- else
- {
+
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- InitializeL(iRequestID);
- }
- }
+ {
+ iTrace->Trace(_L("COMASuplSession::InitializeL called after roaming check"), KTraceFileName, __LINE__);
+ InitializeL(iRequestID);
+ }
}
- else
- {
- iSessionObserver.TerminateSession(this, KErrGeneral);
- }
+ else
+ {
+ iSessionObserver.TerminateSession(this, KErrGeneral);
+ }
}
TInt COMASuplSession::SuplIpcSessionID()
{
@@ -4511,173 +4333,7 @@
return iUsageDialog;
}
-void COMASuplSession::StartUsageDialogLaunchL()
- {
- iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
- ReSetSuplUsageFlag();
- iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL, flag reset done"), KTraceFileName, __LINE__);
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
- if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
- {
- TInt err;
- if (!iUsageHomeNW)
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
-
- if(iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is "));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
- else
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);
-
- if( iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
-
- if(KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
- }
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
- {
- if (!iUsageHomeNW)
- {
- TInt err;
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
-
- if(KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
-
- if(iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
- else
- {
- if (iNwInitError)
- {
- iNwInitError = EFalse;
- HandleSuplInitErrorL(iNwInitCompletionCode);
- }
- else
- InitializeL(iRequestID);
- }
- }
- }
TBool COMASuplSession::IsEtelNotifySet()
{
@@ -4697,38 +4353,6 @@
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::DialogTimerExpiredL
-// Checks whether UI is displayed or not previously
-//
-// -----------------------------------------------------------------------------
-void COMASuplSession::DialogTimerExpiredL()
-{
- iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__);
-
- if (!iIapDialogShown)
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- else
- iIapDlgTimerExpired = ETrue;
-
- return;
-}
-
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsTimeOutUICompletedL
-//
-// -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt aError)
- {
-
- TBuf<64> msg;
- msg.Copy(_L("SUPL Timeout UI completed with ... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
-
- }
// -----------------------------------------------------------------------------
// COMASuplSession::StoreCurrentCellIDL
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/eabi/eposomasuplprotocolhandler2u.def Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/eabi/eposomasuplprotocolhandler2u.def Wed Sep 15 12:40:28 2010 +0300
@@ -41,37 +41,35 @@
_ZTI23COMASuplFallBackHandler @ 40 NONAME
_ZTI24COMASUPLProtocolManager2 @ 41 NONAME
_ZTI24COMASuplEcomEventWatcher @ 42 NONAME
- _ZTI24COMASuplSettingsLauncher @ 43 NONAME
- _ZTI24COMASuplTriggerStopState @ 44 NONAME
- _ZTI25COMASuplTriggerStartState @ 45 NONAME
- _ZTI28COMASuplTriggerResponseState @ 46 NONAME
- _ZTI29COMASuplCompleteSelfRequestor @ 47 NONAME
- _ZTV12COMASuplETel @ 48 NONAME
- _ZTV13COMASuplState @ 49 NONAME
- _ZTV13COMASuplTrace @ 50 NONAME
- _ZTV15COMASuplSession @ 51 NONAME
- _ZTV16COMASuplEndState @ 52 NONAME
- _ZTV16COMASuplPosState @ 53 NONAME
- _ZTV16COMASuplSettings @ 54 NONAME
- _ZTV17COMASuplInitState @ 55 NONAME
- _ZTV18COMASuplStartState @ 56 NONAME
- _ZTV19COMASuplDialogTimer @ 57 NONAME
- _ZTV19COMASuplIapNotifier @ 58 NONAME
- _ZTV19COMASuplReportState @ 59 NONAME
- _ZTV20COMASuplETelNotifier @ 60 NONAME
- _ZTV20COMASuplPOSRequestor @ 61 NONAME
- _ZTV20COMASuplPosInitState @ 62 NONAME
- _ZTV20COMASuplTimeoutTimer @ 63 NONAME
- _ZTV21COMASuplConnRequestor @ 64 NONAME
- _ZTV21COMASuplResponseState @ 65 NONAME
- _ZTV23COMASuplFallBackHandler @ 66 NONAME
- _ZTV24COMASUPLProtocolManager2 @ 67 NONAME
- _ZTV24COMASuplEcomEventWatcher @ 68 NONAME
- _ZTV24COMASuplSettingsLauncher @ 69 NONAME
- _ZTV24COMASuplTriggerStopState @ 70 NONAME
- _ZTV25COMASuplTriggerStartState @ 71 NONAME
- _ZTV28COMASuplTriggerResponseState @ 72 NONAME
- _ZTV29COMASuplCompleteSelfRequestor @ 73 NONAME
- _ZThn4_N24COMASUPLProtocolManager212HandlePacketERK6TDesC8j @ 74 NONAME
- _ZThn4_N24COMASUPLProtocolManager217HandlePacketErrorEi @ 75 NONAME
+ _ZTI24COMASuplTriggerStopState @ 43 NONAME
+ _ZTI25COMASuplTriggerStartState @ 44 NONAME
+ _ZTI28COMASuplTriggerResponseState @ 45 NONAME
+ _ZTI29COMASuplCompleteSelfRequestor @ 46 NONAME
+ _ZTV12COMASuplETel @ 47 NONAME
+ _ZTV13COMASuplState @ 48 NONAME
+ _ZTV13COMASuplTrace @ 49 NONAME
+ _ZTV15COMASuplSession @ 50 NONAME
+ _ZTV16COMASuplEndState @ 51 NONAME
+ _ZTV16COMASuplPosState @ 52 NONAME
+ _ZTV16COMASuplSettings @ 53 NONAME
+ _ZTV17COMASuplInitState @ 54 NONAME
+ _ZTV18COMASuplStartState @ 55 NONAME
+ _ZTV19COMASuplDialogTimer @ 56 NONAME
+ _ZTV19COMASuplIapNotifier @ 57 NONAME
+ _ZTV19COMASuplReportState @ 58 NONAME
+ _ZTV20COMASuplETelNotifier @ 59 NONAME
+ _ZTV20COMASuplPOSRequestor @ 60 NONAME
+ _ZTV20COMASuplPosInitState @ 61 NONAME
+ _ZTV20COMASuplTimeoutTimer @ 62 NONAME
+ _ZTV21COMASuplConnRequestor @ 63 NONAME
+ _ZTV21COMASuplResponseState @ 64 NONAME
+ _ZTV23COMASuplFallBackHandler @ 65 NONAME
+ _ZTV24COMASUPLProtocolManager2 @ 66 NONAME
+ _ZTV24COMASuplEcomEventWatcher @ 67 NONAME
+ _ZTV24COMASuplTriggerStopState @ 68 NONAME
+ _ZTV25COMASuplTriggerStartState @ 69 NONAME
+ _ZTV28COMASuplTriggerResponseState @ 70 NONAME
+ _ZTV29COMASuplCompleteSelfRequestor @ 71 NONAME
+ _ZThn4_N24COMASUPLProtocolManager212HandlePacketERK6TDesC8j @ 72 NONAME
+ _ZThn4_N24COMASUPLProtocolManager217HandlePacketErrorEi @ 73 NONAME
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp Wed Sep 15 12:40:28 2010 +0300
@@ -52,7 +52,6 @@
SOURCE epos_comasuplinitstate.cpp
SOURCE epos_comasuplposrequestor.cpp
SOURCE epos_comasuplecomeventwatcher.cpp
-SOURCE epos_comasuplsettingslauncher.cpp
SOURCE epos_comasupltrace.cpp
SOURCE epos_comasupldialogtimer.cpp
SOURCE epos_comasuplfallbackhandler.cpp
@@ -88,7 +87,7 @@
LIBRARY insock.lib
LIBRARY lbs.lib
LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+
LIBRARY hash.lib
LIBRARY bafl.lib //logging
LIBRARY flogger.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Wed Sep 15 12:40:28 2010 +0300
@@ -40,9 +40,7 @@
* @since S60 v3.1
*/
-class COMASuplConnRequestor : public CActive,
- public MOMASuplUICompletionObserver,
- public MOMASuplDialogTimeOutNotifier
+class COMASuplConnRequestor : public CActive
{
enum TConnState
@@ -172,9 +170,6 @@
void GetUsedServerAddress(TDes& aHSLPAddressUsed);
- void SettingsUICompletedL(TInt aError);
- void SettingsUsageUICompletedL(TInt /*aError*/) {}
- void SettingsTimeOutUICompletedL(TInt /*aError*/) {}
TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId);
void UpdateNetInfo(const TTime& aLastTimeUsed,TInt& aMcc,TInt& aMnc,
TInt& aCid,TInt& aLac,TInt& aType,TInt& aErrorCode);
@@ -214,13 +209,7 @@
void SaveAccessPoint(const TDesC& aIapName);
- /**
- * Dialog Timeout Notifier Method.
- * @since Series 60 9.1 TB
- * @param None
- * @return None
- */
- virtual void DialogTimerExpiredL();
+
protected : // Functions from CActive
/**
* From CActive
@@ -293,15 +282,7 @@
TInt64 iCurrentSLPId;
- COMASuplDialogTimer* iDialogTimer;
-
- TBool iIapDialogShown;
-
- TBool iIapDlgTimerExpired;
-
- TBool iIsTimeoutDialogTimerStarted;
-
- TBool iTriggerSession;
+ TBool iTriggerSession;
};
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h Wed Sep 15 12:40:28 2010 +0300
@@ -81,7 +81,6 @@
public MOMASuplSessionObserver,
public MSuplSettingsObserver,
public MOMASuplTimeOutNotifier,
- public MOMASuplUISettingsObserver,
public MOMASuplETelNotifierObserver,
public MSuplSessionObserver
{
@@ -276,39 +275,14 @@
*/
virtual void TerminateSession(CSuplSessionBase *aSession, TInt aErrorCode);
-public: // For setting UI observer
- TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
- TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
- TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
+public:
+
void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
void SettingsChanged();
- TInt GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId);
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUsageUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI completion
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsTimeOutUICompletedL(TInt aError);
-
+
+
public: //From base class MSuplSettingsObserver
/**
@@ -471,13 +445,7 @@
*/
void ReadOMASuplSettingsL();
- /**
- * ReadSuplUsage, Reads OMA Supl Usage.
- * @since S60 v3.1u
- * @param None.
- * @return None.
- */
- void ReadSuplUsage();
+
/**
* ReadOMASuplConfigurationL, Reads OMA Supl Configuration.
@@ -503,7 +471,7 @@
TInt GetNetworkModeL();
- void CheckOutstandingUsageUIRequestsL();
+
/**
* LoadOMASUPLPluginsL, Loads supl protocolhandler plugins
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h Wed Sep 15 12:40:28 2010 +0300
@@ -97,7 +97,6 @@
class COMASuplSession : public CSuplSessionBase,
public MOMASuplConnObserver,
- public MOMASuplUICompletionObserver,
public MCompleteSelfRequest,
public MOMASuplMsgStateObserver,
public MOMASuplObserver,
@@ -216,27 +215,7 @@
*/
void GetPositionCompleteL(TInt aError);
- /**
- * This callback method is used to notify the client about
- * the completion of UI launch
- * @param aError - Error during Launch
- * @return None
- */
- void SettingsUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI
- * @return None
- */
- void SettingsUsageUICompletedL(TInt aError);
-
- /**
- * This callback method is used to notify the client about
- * the completion of UI
- * @return None
- */
- void SettingsTimeOutUICompletedL(TInt aError);
+
public:
/**
@@ -383,13 +362,6 @@
*/
TInt SuplIpcSessionID();
- /**
- * UpdateSuplUsage Method. Updates SUPL usage
- * @since S60 v3.2
- * @param None
- * @return None
- */
- void UpdateSuplUsage();
/**
* SettingsChanged Method. Updates flag to indicate that
@@ -1032,10 +1004,8 @@
*/
virtual void DialogTimerExpiredL();
public: // Usage dialog
- void SetSuplUsageFlag();
- void ReSetSuplUsageFlag();
- TBool GetSuplUsageFlag();
- void StartUsageDialogLaunchL();
+
+
TBool IsEtelNotifySet();
TBool IsEtelRoamingSet();
TUint GetPortNumUsed();
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h Wed Sep 15 12:40:28 2010 +0300
@@ -90,13 +90,7 @@
*/
void SetIAPId(TInt aIAPId);
- /**
- * SetSUPLUsage Method.
- * @since S60 v3.2
- * @param aSUPLUsage
- * @return None
- */
- void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
+
/**
* SetUIActive Method.
@@ -131,13 +125,7 @@
*/
TInt IAPId() const;
- /**
- * SUPL Usage Method.
- * @since S60 v3.2
- * @param None
- * @return SUPL Usage
- */
- CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
+
/**
* IAPId Method.
@@ -165,8 +153,7 @@
// IAP Id
TInt iIAPId;
- // SUPL Usage
- CSuplSettings::TSuplSettingsUsage iSUPLUsage;
+
// Flag indicating the activation of settings UI
TBool iSettingsUIActive;
};
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplconnrequestor.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplconnrequestor.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -47,11 +47,8 @@
iCommMgr(aCommMgr),
iProtocolManager(aProtoMgr),
iPort(aPort),
- iObserver( aObserver),
- iIapDialogShown(EFalse),
- iIapDlgTimerExpired(EFalse),
- iIsTimeoutDialogTimerStarted(EFalse),
- iTriggerSession(EFalse)
+ iObserver( aObserver),
+ iTriggerSession(EFalse)
{
}
@@ -78,7 +75,7 @@
iCurrentSLPId = KErrNotFound;
- iDialogTimer = COMASuplDialogTimer::NewL(*this);
+
}
// -----------------------------------------------------------------------------
@@ -108,13 +105,8 @@
COMASuplConnRequestor::~COMASuplConnRequestor()
{
Cancel();
- if(iDialogTimer)
- {
- iDialogTimer->Cancel();
- delete iDialogTimer;
- iDialogTimer = NULL;
- }
- delete iSuplSettings;
+
+ delete iSuplSettings;
delete iTrace;
delete iFallBackHandler;
}
@@ -155,27 +147,14 @@
buffer.Copy(_L("No access point configured for "));
buffer.Append(iHostAddress);
iTrace->Trace(buffer,KTraceFileName, __LINE__);
- if( isIapDialogShown )
- {
- TInt err = iProtocolManager.LaunchSettingsUI(this,iHostAddress);
- if(err != KErrNone)
- {
- buffer.Copy(_L("Error in launching UI : "));
- buffer.AppendNum(err);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- iHostAddress.Zero();
- iObserver.OperationCompleteL(err);
- }
- else
- iIapDialogShown = ETrue;
- }
-
+ buffer.Copy(_L("Calling CreateConnection with no IAP"));
+ iTrace->Trace(buffer,KTraceFileName, __LINE__);
+ iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,-1);
+ OpenConnection();
}
else
{
- iIsTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->Cancel();
buffer.Copy(_L("Connecting to "));
buffer.Append(iHostAddress);
iTrace->Trace(buffer,KTraceFileName, __LINE__);
@@ -195,11 +174,8 @@
// COMASuplConnRequestor::OpenConnection
// -----------------------------------------------------------------------------
//
-void COMASuplConnRequestor::CreateConnectionL(TInt aDialogTimeOutDelay, TBool aTriggerSession)
+void COMASuplConnRequestor::CreateConnectionL(TInt /*aDialogTimeOutDelay*/, TBool aTriggerSession)
{
- iIsTimeoutDialogTimerStarted = ETrue;
-
- iDialogTimer->StartTimer(aDialogTimeOutDelay);
CreateConnectionL(aTriggerSession);
}
// -----------------------------------------------------------------------------
@@ -476,57 +452,7 @@
return result;
}
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::SettingsUICompleted
-//
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::SettingsUICompletedL(TInt aError)
- {
- TBuf<128> buffer(_L("COMASuplConnRequestor:SettingsUICompleted Error: "));
- buffer.AppendNum(aError);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
-
- if (iIsTimeoutDialogTimerStarted)
- {
- iTrace->Trace(_L("COMASuplSession::SettingsUICompleted, stopping timer "), KTraceFileName, __LINE__);
- iIsTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->StopTimer();
- }
- if (iIapDlgTimerExpired)
- {
- iIapDlgTimerExpired = EFalse;
- iIapDialogShown = EFalse;
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- iObserver.OperationCompleteL(KErrNone);
- return;
- }
- if(aError == KErrNone)
- {
- TBuf<100> IapName;
- TInt err = iProtocolManager.GetLastUsedAccessPoint(IapName,iIAPId);
- if(err == KErrNone)
- {
- buffer.Copy(_L("Connecting to "));
- buffer.Append(iHostAddress);
- buffer.Append(_L(" using IAP "));
- buffer.Append(IapName);
- iTrace->Trace(buffer,KTraceFileName, __LINE__);
- iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
- SaveAccessPoint(IapName);
- OpenConnection();
- }
- else
- {
- iObserver.OperationCompleteL(err);
- }
- }
- else
- {
- iObserver.OperationCompleteL(aError);
- }
-
- }
// -----------------------------------------------------------------------------
// COMASuplConnRequestor::SaveAccessPoint
@@ -594,25 +520,13 @@
iFallBackHandler->UpdateSLPListForHomeUsage(aHomeNetwork);
}
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::DialogTimerExpiredL
-// Checks whether UI is displayed or not previously
-//
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::DialogTimerExpiredL()
-{
- iTrace->Trace(_L("COMASuplConnRequestor:Timer Expired for SUPL IAP Dialog"), KTraceFileName, __LINE__);
-
- if (!iIapDialogShown)
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- else
- iIapDlgTimerExpired = ETrue;
- return;
-}
TUint COMASuplConnRequestor::GetPortNumber()
{
- return iConnection->GetPortNumberUsed();
+ if(iConnection)
+ return iConnection->GetPortNumberUsed();
+ else
+ return 0;
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletel.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletel.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -12,7 +12,7 @@
* Contributors:
*
* Description: Implementation of COMASuplEtel Class
-* Version : %version: 3 % << Don't touch! Updated by Synergy at check-out.
+* Version : %version: 3.1.1 % << Don't touch! Updated by Synergy at check-out.
*
*/
@@ -520,7 +520,7 @@
for(TInt k = 0; k < KOMASUPLMaxTimeSlotIscpAmount; k++ )
{
- iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
+ iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iCustomWCDMACellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
}
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplinitstate.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplinitstate.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -383,8 +383,8 @@
// what decision the GSM Network will make if the user won't answer before
// a timeout comes in from GSM Network. In this case verification will
// be rejected.
- iNetworkPrivacy->VerifyLocationRequestL(*suplReqInfo,
- iGSMRequestId, *this, aTimeOutStrategy);
+ TRAP_IGNORE(iNetworkPrivacy->VerifyLocationRequestL(*suplReqInfo,
+ iGSMRequestId, *this, aTimeOutStrategy);)
TBuf<64> msg;
msg.Copy(_L("Privacy Fw Generated Verification Request id : "));
msg.AppendNum(iGSMRequestId);
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -104,10 +104,7 @@
// Destructor.
EXPORT_C COMASUPLProtocolManager2::~COMASUPLProtocolManager2()
{
- if(iSettingsLauncher)
- {
- iSettingsLauncher->CancelLaunch();
- }
+
if(iSuplSettings)
{
@@ -136,7 +133,7 @@
}
delete iSuplStorageSettings;
- delete iSettingsLauncher;
+
delete iNotifier;
iMobilePhone.Close();
iTelServer.Close();
@@ -169,7 +166,7 @@
iSuplStorageSettings->SetObserverL(*this);
iSuplStorageSettings->SetSessionObserverL(*this);
- iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
+
TRAPD(err,iOMASuplAsnHandlerBaseImpl = COMASuplAsnHandlerBase::NewL(2);)
TBuf<64> buf(_L("ASN Plugin 2.0 loaded with error : "));
@@ -257,7 +254,7 @@
//Connect to ETel
User::LeaveIfError(ConnectToETelL());
- ReadSuplUsage();
+
if(iSuplEcomEventWatcher)
{
@@ -1251,7 +1248,7 @@
if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange)
{
iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__);
- ReadSuplUsage();
+
}
else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange)
{
@@ -1260,6 +1257,9 @@
}
}
+
+
+
// -----------------------------------------------------------------------------
// COMASUPLProtocolManager2::LogPacket
// Logs
@@ -1742,72 +1742,6 @@
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::LaunchSettingsUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager2::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSettingsUI"), KTraceFileName, __LINE__);
-
- if (iSuplSettings->IsUIActive())
- return KErrInUse;
- iSessnUIObserver = aObserver;
- iSuplSettings->SetUIActive(ETrue);
-
- if(iUIRequestArray.Count() <= 0 )
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSettingsUI"), KTraceFileName, __LINE__);
- iUIRequestArray.Append(aObserver);
- iSuplSettings->SetUIActive(ETrue);
- iCurrentlyUsedHslp.Copy(aForHslp);
- return iSettingsLauncher->LaunchSettings();
- }
- else if(iCurrentlyUsedHslp.Compare(aForHslp) == KErrNone)
- {
- iUIRequestArray.Append(aObserver);
- }
- else
- {
- return KErrInUse;
- }
-
- return KErrNone;
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::SettingsUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager2::SettingsUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
-
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- for(TInt i = 0; i < iUIRequestArray.Count(); i++)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL,Forwarding ConnRerquestor "), KTraceFileName, __LINE__);
- MOMASuplUICompletionObserver* observer = iUIRequestArray[i];
- observer->SettingsUICompletedL(aError);
- }
- }
-
- iCurrentlyUsedHslp.Copy(_L(""));
- iUIRequestArray.Reset();
- }
-
// -----------------------------------------------------------------------------
// COMASUPLProtocolManager2::DeInitialize
@@ -1864,73 +1798,10 @@
return networkMode;
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__);
- if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent)
- return KErrInUse;
- // If timeout dialog is present, close it
- if (iTimeOutDialogPresent)
- {
- iTimeOutDialogPresent = EFalse;
- iSuplSettings->SetUIActive(EFalse);
- iSettingsLauncher->Cancel();
- }
- iSessnUIObserver = aObserver;
- iSuplSettings->SetUIActive(ETrue);
- return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming);
- }
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::SettingsUsageUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager2::SettingsUsageUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUsageUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUsageUICompletedL, de-init done. Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- if (iSessnUIObserver)
- iSessnUIObserver->SettingsUsageUICompletedL(aError);
- }
- CheckOutstandingUsageUIRequestsL();
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::ReadSuplUsage
-// Reads Supl Usage from Central Repository
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager2::ReadSuplUsage()
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage start"), KTraceFileName, __LINE__);
- CSuplSettings::TSuplSettingsUsage suplUsage;
- TInt err = iSuplStorageSettings->GetSuplUsage(suplUsage);
- if(err == KErrNone )
- {
- iSuplSettings->SetSUPLUsage(suplUsage);
- }
- iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage end"), KTraceFileName, __LINE__);
- }
void COMASUPLProtocolManager2::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId)
{
@@ -1942,8 +1813,6 @@
OMAsuplSession = static_cast<COMASuplSession*>(iSuplSessions[cnt]);
TInt ipcSessnId = OMAsuplSession->SuplIpcSessionID();
- if (ipcSessnId > 0 && ipcSessnId == aIpcSessionId)
- OMAsuplSession->UpdateSuplUsage();
}
}
@@ -1959,23 +1828,7 @@
OMAsuplSession->SettingsChanged();
}
}
-
-void COMASUPLProtocolManager2::CheckOutstandingUsageUIRequestsL()
- {
- TInt TotalSession = iSuplSessions.Count();
- COMASuplSession* OMAsuplSession = NULL;
-
- for(TInt cnt = 0; cnt < TotalSession; ++cnt)
- {
- OMAsuplSession = static_cast<COMASuplSession*>(iSuplSessions[cnt]);
-
- if (OMAsuplSession->GetSuplUsageFlag())
- {
- OMAsuplSession->StartUsageDialogLaunchL();
- break;
- }
- }
- }
+
void COMASUPLProtocolManager2::CheckForRoaming()
{
@@ -2055,63 +1908,7 @@
}
}
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchTimeOutUI"), KTraceFileName, __LINE__);
-
- iSessnUIObserver = aObserver;
- if (iSuplSettings->IsUIActive())
- {
- iSuplSettings->SetUIActive(EFalse);
- iSettingsLauncher->Cancel();
- }
- iSuplSettings->SetUIActive(ETrue);
- iTimeOutDialogPresent = ETrue;
- return iSettingsLauncher->LaunchSessionTimeOutDialog();
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::SettingsTimeOutUICompletedL
-//
-//
-// -----------------------------------------------------------------------------
-//
-void COMASUPLProtocolManager2::SettingsTimeOutUICompletedL(TInt aError)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__);
- iSuplSettings->SetUIActive(EFalse);
- iTimeOutDialogPresent = EFalse;
-
- if (iDeInitDone)
- {
- iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsTimeOutUICompletedL, Completing request"), KTraceFileName, __LINE__);
- iDeInitDone = EFalse;
- User::RequestComplete(iDeInitRequestStatus,KErrNone);
- }
- else
- {
- if (iSessnUIObserver)
- iSessnUIObserver->SettingsTimeOutUICompletedL(aError);
- }
- }
-
-// -----------------------------------------------------------------------------
-// COMASUPLProtocolManager2::GetLastUsedAccessPoint
-//
-//
-// -----------------------------------------------------------------------------
-//
-TInt COMASUPLProtocolManager2::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId)
- {
- return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
- }
// -----------------------------------------------------------------------------
// COMASUPLProtocolManager2::PrintHex
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -2177,15 +2177,7 @@
iTrace->Trace(msg,KTraceFileName, __LINE__);
}
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
- if (usage == CSuplSettings::ESuplUsageDisabled)
- {
- msg.Copy(_L("SUPL Usage is disabled"));
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
- }
+
COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
@@ -4352,17 +4344,6 @@
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsUICompleted
-//
-// -----------------------------------------------------------------------------
-
-void COMASuplSession::SettingsUICompletedL(TInt /*aError*/)
- {
- iTrace->Trace(_L("COMASuplSession::SettingsUICompleted ..."), KTraceFileName, __LINE__);
-
- }
-
// -----------------------------------------------------------------------------
// COMASuplSession::HandleInvalidMessageL
@@ -4694,57 +4675,7 @@
OperationCompleteL(KErrTimedOut);
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsUsageUICompletedL
-//
-// -----------------------------------------------------------------------------
-void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
- {
- iUIFlag = EFalse;
- TBuf<64> msg;
- msg.Copy(_L("SUPL Usage UI completed with ... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
-
- iPrevUsageResult = aError;
-
-
-
- if (aError == KErrNone)
- {
- iProtocolManager.UpdateAllSubSessnsInSameSession(iIpcSessionId);
-
- if (isTimeoutDialogTimerStarted)
- {
- iTrace->Trace(_L("COMASuplSession::SettingsUsageUICompletedL, stopping timer "), KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = EFalse;
- iDialogTimer->StopTimer();
-
- //Compute how log the dialog was on
- TTime nowTime;
- nowTime.HomeTime();
- nowTime.SecondsFrom(iDlgStartTime, iDiffTime);
- }
- if (iNwInitError)
- {
- iNwInitError = EFalse;
- HandleSuplInitErrorL(iNwInitCompletionCode);
- }
- else
- InitializeL(iRequestID);
- }
- else if (aError == KErrCompletion)
- CheckForSuplUsageL();
- else
- {
- TBuf<64> msg;
- msg.Copy(_L("Error after SUPL Usage Popup... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
- }
- }
+
// -----------------------------------------------------------------------------
// COMASuplSession::CheckForSuplUsageL
@@ -4753,42 +4684,24 @@
void COMASuplSession::CheckForSuplUsageL()
{
iTrace->Trace(_L("COMASuplSession::CheckForSuplUsageL Start"), KTraceFileName, __LINE__);
-
- if (iSuplUsage >= 1)
- {
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
- if (usage == CSuplSettings::ESuplUsageDisabled)
- {
- iTrace->Trace(_L("CheckForSuplUsageL, SUPL disabled"), KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- }
- else if (usage == CSuplSettings::ESuplUsageAutomatic)
- {
+
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- {
- iTrace->Trace(_L("CheckForSuplUsageL, Initializing"), KTraceFileName, __LINE__);
- InitializeL(iRequestID);
- }
- }
-
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
- {
- if (iRoaming)
- HandleRoamingCheckCompleteL(KErrNone, EFalse);
- else
- {
- iEtelRoamingCheck = ETrue;
- iProtocolManager.CheckForRoaming();
- }
- }
- }
- else
- InitializeL(iRequestID);
+ {
+ if (iRoaming)
+ HandleRoamingCheckCompleteL(KErrNone, EFalse);
+ else
+ {
+ iEtelRoamingCheck = ETrue;
+ iProtocolManager.CheckForRoaming();
+ }
+
+ }
+
}
@@ -4871,80 +4784,10 @@
{
iUsageHomeNW = aHomeNw;
iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
- if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
- {
- TInt err;
- if (!aHomeNw)
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
- }
- else
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);
- }
-
- if(KErrNone != err && KErrInUse == err)
- {
- iTrace->Trace(_L("Dialog in use, setting flag"), KTraceFileName, __LINE__);
- SetSuplUsageFlag();
- }
- if( KErrNone == err && iRequestType == ESUPL_NETWORK )
- {
- iTrace->Trace(_L("Network Session , starting timer"), KTraceFileName, __LINE__);
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
+
+
+
{
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- iDlgStartTime.HomeTime();
- }
- else if (KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
-
- }
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
- {
- if (!aHomeNw)
- {
- TInt err;
- //if (!iSuplSettings->IsUIActive() )
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
if(iSuplMsgType == ESUPL_INIT)
{
@@ -4983,27 +4826,15 @@
}
- if(!iSuplSettings->IsUIActive() && KErrNone != err)
- {
- SetSuplUsageFlag();
- }
- else
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
- }
- else
- {
+
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- InitializeL(iRequestID);
- }
- }
+ InitializeL(iRequestID);
+
}
else
{
@@ -5013,12 +4844,7 @@
TInt COMASuplSession::SuplIpcSessionID()
{
return iIpcSessionId;
- }
-
-void COMASuplSession::UpdateSuplUsage()
- {
- iPrevUsageResult = KErrNone;
- }
+ }
void COMASuplSession::SettingsChanged()
{
@@ -5057,189 +4883,9 @@
iIapNotifier->NotifyIapSettingsChange();
}
}
- }
-void COMASuplSession::SetSuplUsageFlag()
- {
- iUsageDialog = ETrue;
- }
-
-void COMASuplSession::ReSetSuplUsageFlag()
- {
- iUsageDialog = EFalse;
- }
-
-TBool COMASuplSession::GetSuplUsageFlag()
- {
- return iUsageDialog;
- }
-
-void COMASuplSession::StartUsageDialogLaunchL()
- {
- iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
- ReSetSuplUsageFlag();
- iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL, flag reset done"), KTraceFileName, __LINE__);
-
- CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
- if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
- {
- TInt err;
- if (!iUsageHomeNW)
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
-
- if(iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is "));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
- else
- {
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);
-
- if( iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
-
- if(KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
- }
- else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
- {
- if (!iUsageHomeNW)
- {
- TInt err;
- iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
- err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
-
- if(KErrNone != err)
- {
- iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
- HandleSuplErrorL(err);
- }
-
- if(iRequestType == ESUPL_NETWORK && err == KErrNone)
- {
- iTrace->Trace(_L("starting Dialog timer "), KTraceFileName, __LINE__);
-
- COMASuplInit* suplInit = static_cast <COMASuplInit*> (iDecodedAsnMessage);
- TOMASuplQop qop;
- TInt retVal = suplInit->Qop(qop);
- TInt delay;
- qop.Delay(delay);
- //if delay is > 7, it is not valid
- if (delay > 7)
- delay = 0;
- if(retVal == KErrNone && delay > 0)
- {
- TReal delayReal;
- Math::Pow(delayReal, 2, (TReal)delay);
- delay = (TInt) delayReal;
- TBuf<128> msg(_L("Delay present in message, value is = "));
- msg.AppendNum(delay);
- iTrace->Trace(msg, KTraceFileName, __LINE__);
- isTimeoutDialogTimerStarted = ETrue;
- iDialogTimer->StartTimer(delay);
- }
- else
- {
- if (iSuplInitTimeOut > 0)
- {
- iTrace->Trace(_L("Delay not present in message"), KTraceFileName, __LINE__);
- TBuf<256> msg(_L("Delay value in CR is"));
- msg.AppendNum(iSuplInitTimeOut);
- iDialogTimer->StartTimer(iSuplInitTimeOut * KSecond);
- isTimeoutDialogTimerStarted = ETrue;
- }
- else
- iTrace->Trace(_L("Timeout is <= 0"), KTraceFileName, __LINE__);
- }
- }
- }
- else
- {
- if (iNwInitError)
- {
- iNwInitError = EFalse;
- HandleSuplInitErrorL(iNwInitCompletionCode);
- }
- else
- InitializeL(iRequestID);
- }
- }
- }
+ }
+
+
TBool COMASuplSession::IsEtelNotifySet()
{
@@ -5279,30 +4925,12 @@
iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__);
- if (!iIapDialogShown)
- iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- else
- iIapDlgTimerExpired = ETrue;
+
}
return;
}
-// -----------------------------------------------------------------------------
-// COMASuplSession::SettingsTimeOutUICompletedL
-//
-// -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt aError)
- {
-
- TBuf<64> msg;
- msg.Copy(_L("SUPL Timeout UI completed with ... "));
- msg.AppendNum(aError);
- iTrace->Trace(msg,KTraceFileName, __LINE__);
- iSessionObserver.TerminateSession(this, KErrGeneral);
- return;
-
- }
// -----------------------------------------------------------------------------
// COMASuplSession::StoreCurrentCellIDL
@@ -5678,7 +5306,7 @@
//Inform UI that ,trigger session has started...
InsertActiveSessionL();
TInt privacyId;
- iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, privacyId);
+ TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, privacyId); )
iTrace->Trace(_L(" Calling InsertActiveSessionL"), KTraceFileName, __LINE__);
}
@@ -5715,7 +5343,7 @@
- iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);
+ TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);)
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettings.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettings.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -125,27 +125,7 @@
return iIAPId;
}
-// -----------------------------------------------------------------------------
-// COMASuplSettings::SetSUPLUsage
-// Sets the SUPL Usage
-//
-// -----------------------------------------------------------------------------
-//
-void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage )
-{
- iSUPLUsage = aSUPLUsage;
-}
-// -----------------------------------------------------------------------------
-// COMASuplSettings::SUPLUsage()
-// Gets the SUPL Usage
-//
-// -----------------------------------------------------------------------------
-//
-CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
- {
- return iSUPLUsage;
- }
// -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler.iby Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler.iby Wed Sep 15 12:40:28 2010 +0300
@@ -64,9 +64,7 @@
ECOM_PLUGIN(epos_omasuplsyncmldm.dll,epos_omasuplsyncmldm.rsc)
#endif // __SYNCML_DM
-// Notifier
-ECOM_PLUGIN(epos_omasuplnotifierplugin.dll,epos_omasuplnotifierplugin.rsc)
-file=ABI_DIR\BUILD_DIR\epos_omasuplnotifier.dll SHARED_LIB_DIR\epos_omasuplnotifier.dll
+
// Storage Db Backup Registration File
data=DATAZ_\private\1027509E\backup_registration.xml \private\1027509E\backup_registration.xml
#endif //__OMA_SUPL_PLUGINS
--- a/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler_resource.iby Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler_resource.iby Wed Sep 15 12:40:28 2010 +0300
@@ -28,8 +28,8 @@
#ifdef __OMA_SUPL_PLUGINS
-//Resource file for notifier
-data=DATAZ_\resource\epos_omasuplnotifier.rsc resource\epos_omasuplnotifier.rsc
+
+
#endif //__OMA_SUPL_PLUGINS
#endif // OMASUPLPROTOCOLHANDLER_RESOURCE_IBY
--- a/supl/locationsuplfw/protocolhandlerapi/src/epos_csuplconnection.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/protocolhandlerapi/src/epos_csuplconnection.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -319,8 +319,10 @@
// Cancel Any outstanding request
Cancel();
- iTrace->Trace(_L("CSuplConnection::Destructor...Deleting Socket Reader"),
- KTraceFileName, __LINE__);
+ if (iTrace)
+ iTrace->Trace(_L(
+ "CSuplConnection::Destructor...Deleting Socket Reader"),
+ KTraceFileName, __LINE__);
//Delete the Socket Reader
delete iSocketReader;
@@ -967,7 +969,12 @@
{
aStatus = KRequestPending;
TRequestStatus *reqStatus = &aStatus;
- iConnArray.Append(reqStatus);
+ TInt error = iConnArray.Append(reqStatus);
+ if (error != KErrNone)
+ {
+ User::RequestComplete(reqStatus, error);
+ return;
+ }
}
if (!iConnectStarted)
@@ -983,14 +990,40 @@
iConnectStarted = ETrue;
#ifndef __WINS__
- TCommDbConnPref prefs;
- prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
- prefs.SetDirection(ECommDbConnectionDirectionOutgoing);
- prefs.SetIapId(iIAPId);
+ TExtendedConnPref OCCPrefs;
+ TConnPrefList prefList;
+
+ OCCPrefs.SetForcedRoaming(EFalse); //do not switch networks during an ongoing connection
+ OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
+
+ if(iIAPId != -1) //if a IAP was configured
+
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect : IAP configured"), KTraceFileName, __LINE__);
+ OCCPrefs.SetIapId(iIAPId);
+ // since IAP Id is set SNAP purpose should not be set - set to unknown
+ OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeUnknown);
+ OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerUnknown);
+ }
+ else
+ {
+ OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
+ //WLAN and Cellular Networks allowed for connection
+ OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN | TExtendedConnPref::EExtendedConnBearerCellular);
+
+ //if SNAP purpose is set IAP Id should be zero - zero by default not explicitly set
+ iTrace->Trace(_L("CSuplConnection::Connect : IAP not configured"), KTraceFileName, __LINE__);
+ }
+
+ TRAP_IGNORE(prefList.AppendL(&OCCPrefs));
TInt ret = iConnection.Open(iSocketServ);
+ if(ret != KErrNone)
+ iTrace->Trace(_L("RConnection Open returned error"), KTraceFileName, __LINE__);
+
+ iTrace->Trace(_L("RConnection Start Called, State is ERetriveIAP"), KTraceFileName, __LINE__);
// Start an Outgoing Connection with overrides
- iConnection.Start(prefs,iStatus);
+ iConnection.Start(prefList,iStatus);
// Set state to ERetriveIAP
iState = ERetriveIAP;
SetActive();
@@ -1019,92 +1052,99 @@
EXPORT_C void CSuplConnection::Connect(TRequestStatus &aStatus,
TBool aPrompt, TBool aWlanOnly)
{
+
// Log
- iTrace->Trace(_L("CSuplConnection::Connect"), KTraceFileName, __LINE__);
- iPrompt = aPrompt;
- iWlanOnly = aWlanOnly;
-
- if (iState == EConnected)
- {
- aStatus = KRequestPending;
- TRequestStatus *reqStatus = &aStatus;
- User::RequestComplete(reqStatus, KErrNone);
- iConnectClients++;
- return;
- }
+ iTrace->Trace(_L("CSuplConnection::Connect"), KTraceFileName, __LINE__);
+ iPrompt = aPrompt;
+ iWlanOnly = aWlanOnly;
+
+ aStatus = KRequestPending;
+ TRequestStatus *reqStatus = &aStatus;
+
+ if (iState == EConnected)
+ {
+ User::RequestComplete(reqStatus, KErrNone);
+ iConnectClients++;
+ return;
+ }
- // Check if Connect() is started. If started, add status to Q
- //if (iConnectStarted)
- // {
- aStatus = KRequestPending;
- TRequestStatus *reqStatus = &aStatus;
- iConnArray.Append(reqStatus);
- // }
-
- if (!iConnectStarted)
- {
- iTrace->Trace(_L("CSuplConnection::Connect : Connection not started"), KTraceFileName, __LINE__);
+ TInt error = iConnArray.Append(reqStatus);
+ if (error != KErrNone)
+ {
+ User::RequestComplete(reqStatus, error);
+ return;
+ }
+
+ if (!iConnectStarted)
+ {
+ iTrace->Trace(
+ _L("CSuplConnection::Connect : Connection not started"),
+ KTraceFileName, __LINE__);
// Connect only if not already connected
- if(iState == ENotConnected || iState == EFailure)
- {
- iTrace->Trace(_L("CSuplConnection::Connect : ENotConnected"), KTraceFileName, __LINE__);
+ if (iState == ENotConnected || iState == EFailure)
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect : ENotConnected"),
+ KTraceFileName, __LINE__);
iConnectStarted = ETrue;
#ifndef __WINS__
-
+
iTrace->Trace(_L("CSuplConnection::Connect ExtendedConnPref"), KTraceFileName, __LINE__);
-
+
TExtendedConnPref OCCPrefs;
TConnPrefList prefList;
- if(iWlanOnly)
- {
- iTrace->Trace(_L("CSuplConnection::Connect : iWLANOnly used"), KTraceFileName, __LINE__);
- OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN);
- OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
- }
- else
- {
- iTrace->Trace(_L("CSuplConnection::Connect using OCC"), KTraceFileName, __LINE__);
- iTrace->Trace(_L("CSuplConnection::Connect OCC GPRS Connection.."), KTraceFileName, __LINE__);
- OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerCellular);
- OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
- }
-
- if(!iPrompt)
- {
- iTrace->Trace(_L("CSuplConnection::Connect : silent connection"), KTraceFileName, __LINE__);
- OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
- }
- else
- {
- iTrace->Trace(_L("CSuplConnection::Connect : Dialog prompt"), KTraceFileName, __LINE__);
- OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
- }
-
-
-
+ if(iWlanOnly)
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect : iWLANOnly used"), KTraceFileName, __LINE__);
+ OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN);
+ }
+ else
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect OCC GPRS Connection.."), KTraceFileName, __LINE__);
+ OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerCellular);
+ }
+ OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
+
+ if(!iPrompt)
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect : silent connection"), KTraceFileName, __LINE__);
+ OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourConnSilent);
+ }
+ else
+ {
+ iTrace->Trace(_L("CSuplConnection::Connect : Dialog prompt"), KTraceFileName, __LINE__);
+ OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
+ }
+
TRAP_IGNORE(prefList.AppendL(&OCCPrefs));
-
-
+
TInt ret = iConnection.Open(iSocketServ);
+ if( ret != KErrNone )
+ {
+ TRequestStatus* statusPtr = &aStatus;
+ User::RequestComplete( statusPtr,ret );
+ return;
+ }
// Start an Outgoing Connection with overrides
iConnection.Start(prefList,iStatus);
// Set state to ERetriveIAP
- iState = ERetriveIAP;
- SetActive();
-
-
-
+ iState = ERetriveIAP;
+ SetActive();
+
#else
ConnectIAP();
#endif
+ }
}
- }
- else
- iTrace->Trace(_L("CSuplConnection::Connect : Conn in progress, request queued"), KTraceFileName, __LINE__);
+ else
+ iTrace->Trace(
+ _L(
+ "CSuplConnection::Connect : Conn in progress, request queued"),
+ KTraceFileName, __LINE__);
// Log
- iTrace->Trace(_L("CSuplConnection::Connect:Exit"), KTraceFileName, __LINE__);
+ iTrace->Trace(_L("CSuplConnection::Connect:Exit"), KTraceFileName,
+ __LINE__);
}
// -----------------------------------------------------------------------------
@@ -1324,6 +1364,7 @@
SetActive();
}
}
+
// -----------------------------------------------------------------------------
// CSuplConnection::ConnectIAP
// Makes a socket connection to Network
--- a/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsinternalcrkeys.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsinternalcrkeys.h Wed Sep 15 12:40:28 2010 +0300
@@ -26,7 +26,7 @@
const TUint32 KSuplSettingsFallBack = 0x00000002;
const TUint32 KSuplSettingsFallBackTimer = 0x00000003;
const TUint32 KSuplSettingsIMSI = 0x00000004;
-const TUint32 KSuplSettingsUsage = 0x00000005;
+
const TUint32 KSuplSettingsDBEvent = 0x00000006;
const TUint32 KSuplSettingsDBChangedSLPId = 0x00000007;
const TUint32 KSuplSettigsDBPath = 0x00000008;
--- a/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsnotifier.h Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsnotifier.h Wed Sep 15 12:40:28 2010 +0300
@@ -107,7 +107,6 @@
TBool iStopObserve;
- CSuplSettings::TSuplSettingsUsage iUsage;
TInt iFallBackValue;
TInt iFallBackTimerValue;
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -235,35 +235,20 @@
//-------------------------------------------------------------------------------------
//CSuplSettings::GetSuplUsage()
//
-//This method is used to retrieve SUPL usage from settings storage.
+//Deprecated Since S60 5.2.
//--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& aUsage) const
+EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& /* aUsage */ ) const
{
- TInt usage, ret;
- ret = iSettingsEngine->GetSuplUsage(usage);
-
- if (ret == KErrNone)
- {
- aUsage = (TSuplSettingsUsage)usage;
- return KErrNone;
- }
- else
- return ret;
+ return KErrNotSupported;
}
//-------------------------------------------------------------------------------------
//CSuplSettings::SetSuplUsage()
//
-//This method is used to change SUPL usage.
+//Deprecated Since S60 5.2.
//--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage aUsage)
+EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage /* aUsage */ )
{
- TInt usage = aUsage;
-
- if (usage < CSuplSettings::ESuplUsageAlwaysAsk ||
- usage > CSuplSettings::ESuplUsageDisabled)
- return KErrArgument;
-
- return iSettingsEngine->SetSuplUsage(aUsage);
+ return KErrNotSupported;
}
//-------------------------------------------------------------------------------------
//CSuplSettings::AddNewServer()
@@ -274,6 +259,7 @@
{
if(aParamValues == NULL)
return KErrGeneral;
+
return iSettingsEngine->AddNewServer(aParamValues,aSlpId );
}
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsengine.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsengine.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -274,52 +274,6 @@
return KErrNone;
}
-/*TInt CSuplSettingsEngine::Set(const TDesC& aHslpAddress, const TDesC& aIapName,
- const TInt aChangedBy)
- {
- TInt err;
-
- err = iRepository->Set(KSuplSettingsHSLPAddress, aHslpAddress);
- if (err != KErrNone)
- return err;
-
- err = iRepository->Set(KSuplSettingsIAP, aIapName);
- if (err != KErrNone)
- return err;
-
- err = iRepository->Set(KSuplSettingsChangedBy, aChangedBy);
- if (err != KErrNone)
- return err;
-
- err = iRepository->Set(KSuplSettingsIMSI, iImsi);
- if (err != KErrNone)
- return err;
-
- return KErrNone;
- }
-
-
-TInt CSuplSettingsEngine::Get(TDes& aHslpAddress, TDes& aIapName,
- TDes& aImsi, TInt& aChangedBy)
- {
- TInt err;
-
- err = iRepository->Get(KSuplSettingsHSLPAddress, aHslpAddress);
- if (err != KErrNone)
- return err;
- err = iRepository->Get(KSuplSettingsIAP, aIapName);
- if (err != KErrNone)
- return err;
- err = iRepository->Get(KSuplSettingsIMSI, aImsi);
- if (err != KErrNone)
- return err;
- err = iRepository->Get(KSuplSettingsChangedBy, aChangedBy);
- if (err != KErrNone)
- return err;
-
- return KErrNone;
- }
-*/
//-------------------------------------------------------------------------------------
//CSuplSettingsEngine::IsInitDone()
//
@@ -447,37 +401,6 @@
return KErrNone;
}
-//-------------------------------------------------------------------------------------
-//CSuplSettingsEngine::GetSuplUsage()
-//
-//This method is used to retrieve SUPL usage from settings storage.
-//--------------------------------------------------------------------------------------
-TInt CSuplSettingsEngine::GetSuplUsage(TInt& aUsage)
- {
- TInt err;
-
- err = iRepository->Get(KSuplSettingsUsage, aUsage);
- if (err != KErrNone)
- return err;
-
- return KErrNone;
- }
-
-//-------------------------------------------------------------------------------------
-//CSuplSettingsEngine::SetSuplUsage()
-//
-//This method is used to change SUPL usage.
-//--------------------------------------------------------------------------------------
-TInt CSuplSettingsEngine::SetSuplUsage(const TInt aUsage)
- {
- TInt err;
-
- err = iRepository->Set(KSuplSettingsUsage, aUsage);
- if (err != KErrNone)
- return err;
-
- return KErrNone;
- }
/*
* GetMccLen
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsnotifier.cpp Tue Sep 14 22:09:33 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsnotifier.cpp Wed Sep 15 12:40:28 2010 +0300
@@ -95,15 +95,7 @@
iObserver.HandleSuplSettingsChangeL(eventType,slpID);
}
else
- {
- TInt usage;
-
- iRepository->Get(KSuplSettingsUsage, usage);
-
- if (iUsage != usage) //check if there was a change in the Supl usage value in the cen rep
- iObserver.HandleSuplSettingsChangeL(MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange);
- else //else check if any of the other config parameters changed
- {
+ {
TInt fallBackValue;
TInt fallBackTimerValue;
TBuf<KMaxStrlen> imsi;
@@ -112,7 +104,7 @@
iRepository->Get(KSuplSettingsIMSI,imsi);
if(fallBackValue != iFallBackValue || fallBackTimerValue != iFallBackTimerValue || imsi.Compare(*iImsi))
iObserver.HandleSuplSettingsChangeL(MSuplSettingsObserver::ESuplSettingsEventCommParameterChange);
- }
+
}
StartListening();
}
@@ -159,15 +151,15 @@
}
else
{
- TInt usage;
+
TBuf<KMaxStrlen> imsi;
- iRepository->Get(KSuplSettingsUsage, usage);
+
iRepository->Get(KSuplSettingsFallBack,iFallBackValue);
iRepository->Get(KSuplSettingsFallBackTimer,iFallBackTimerValue);
iRepository->Get(KSuplSettingsIMSI,imsi);
if(iImsi)
iImsi->Des() = imsi;
- iUsage = (CSuplSettings::TSuplSettingsUsage) usage;
+
// Request for notification for any field change
iRepository->NotifyRequest(0x00000000, 0x00000000, iStatus);