--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Tue Aug 31 15:37:04 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp Wed Sep 01 12:24:21 2010 +0100
@@ -187,7 +187,7 @@
if( aIMSI.Length() )
{
- User::LeaveIfError(iIMSI.Create( aIMSI ));
+ iIMSI.Create( aIMSI );
}
if(iPosHandler)
@@ -1719,8 +1719,8 @@
TOMASuplUtcTime UtcTime;
TOMASuplPositionEstimate PosEstimate;
TDateTime TimeStamp;
- //coverity[var_decl]
- TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
+ TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
+ TInt AltitudeUncertainty = 0;
TOMASuplAltitudeInfo AltitudeInfo;
TInt latitude,longitude;
TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
@@ -1776,7 +1776,6 @@
msg.AppendNum(altitude);
iTrace->Trace(msg,KTraceFileName, __LINE__);
msg.Copy(_L("Altitude uncertainty "));
- //coverity[uninit_use_in_call]
msg.AppendNum(AltitudeUncertainty);
iTrace->Trace(msg,KTraceFileName, __LINE__);
@@ -1905,8 +1904,8 @@
TOMASuplUtcTime UtcTime;
TOMASuplPositionEstimate PosEstimate;
TDateTime TimeStamp;
- //coverity[var_decl]
- TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
+ TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
+ TInt AltitudeUncertainty = 0;
TOMASuplAltitudeInfo AltitudeInfo;
TInt latitude,longitude;
TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
@@ -1931,7 +1930,6 @@
TReal pwrMjr, pwrMnr, pwrAlt;
Math::Pow(pwrMjr, 1.1, UncertaintySemiMajor);
Math::Pow(pwrMnr, 1.1, UncertaintySemiMinor);
- //coverity[uninit_use]
Math::Pow(pwrAlt, 1.070000, AltitudeUncertainty);
UncertaintySemiMajorReal = 10 * (pwrMjr -1);
UncertaintySemiMinorReal = 10 * (pwrMnr -1);
@@ -2179,7 +2177,7 @@
iTrace->Trace(msg,KTraceFileName, __LINE__);
}
- /*CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+ CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
if (usage == CSuplSettings::ESuplUsageDisabled)
{
@@ -2187,7 +2185,7 @@
iTrace->Trace(msg,KTraceFileName, __LINE__);
iSessionObserver.TerminateSession(this, KErrGeneral);
return;
- }*/
+ }
COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
@@ -2199,6 +2197,10 @@
{
CreateCloneMessageL(aDecodedAsnMessage);
UpdateSuplSessionIDL();
+ if (iRequestType == ESUPL_NETWORK && messageType == COMASuplAsnMessageBase::ESUPL_INIT)
+ {
+ ServerAddressCheckForSuplInitL();
+ }
iSuplSessionState = ESUPL_INITIALIZED;
iSuplMsgType = ESUPL_END;
@@ -3622,9 +3624,6 @@
return;
}
}
- //Comment to ignore coverity missing break error
- //coverity[MISSING_BREAK :FALSE]
-
case COMASuplState::ESUPL_POS_INIT:
{
cancelSendRequestor = EFalse;
@@ -4699,7 +4698,7 @@
// COMASuplSession::SettingsUsageUICompletedL
//
// -----------------------------------------------------------------------------
-/*void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
+void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
{
iUIFlag = EFalse;
TBuf<64> msg;
@@ -4745,7 +4744,7 @@
iSessionObserver.TerminateSession(this, KErrGeneral);
return;
}
- }*/
+ }
// -----------------------------------------------------------------------------
// COMASuplSession::CheckForSuplUsageL
@@ -4755,7 +4754,7 @@
{
iTrace->Trace(_L("COMASuplSession::CheckForSuplUsageL Start"), KTraceFileName, __LINE__);
- /*if (iSuplUsage >= 1)
+ if (iSuplUsage >= 1)
{
CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
if (usage == CSuplSettings::ESuplUsageDisabled)
@@ -4764,24 +4763,18 @@
iSessionObserver.TerminateSession(this, KErrGeneral);
}
else if (usage == CSuplSettings::ESuplUsageAutomatic)
- { */
+ {
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- {
- if (iRoaming)
- HandleRoamingCheckCompleteL(KErrNone, EFalse);
- else
- {
- iEtelRoamingCheck = ETrue;
- iProtocolManager.CheckForRoaming();
- }
- //InitializeL(iRequestID);
- }
- /*}
+ {
+ iTrace->Trace(_L("CheckForSuplUsageL, Initializing"), KTraceFileName, __LINE__);
+ InitializeL(iRequestID);
+ }
+ }
else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
{
@@ -4795,7 +4788,7 @@
}
}
else
- InitializeL(iRequestID); */
+ InitializeL(iRequestID);
}
@@ -4878,9 +4871,9 @@
{
iUsageHomeNW = aHomeNw;
iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);
- //CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
- /*if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
+ CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+
+ if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
{
TInt err;
if (!aHomeNw)
@@ -4942,16 +4935,16 @@
HandleSuplErrorL(err);
}
- }*/
- //else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
- //{
- //if (!aHomeNw)
- // {
- //TInt err = KErrNone;
+ }
+ 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);
+ {
+ iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
+ err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
if(iSuplMsgType == ESUPL_INIT)
{
@@ -4990,7 +4983,7 @@
}
- /* if(!iSuplSettings->IsUIActive() && KErrNone != err)
+ if(!iSuplSettings->IsUIActive() && KErrNone != err)
{
SetSuplUsageFlag();
}
@@ -4998,18 +4991,19 @@
{
iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
HandleSuplErrorL(err);
- }*/
-
-
-
+ }
+ }
+ else
+ {
if (iNwInitError)
{
iNwInitError = EFalse;
HandleSuplInitErrorL(iNwInitCompletionCode);
}
else
- InitializeL(iRequestID);
-
+ InitializeL(iRequestID);
+ }
+ }
}
else
{
@@ -5079,7 +5073,7 @@
return iUsageDialog;
}
-/*void COMASuplSession::StartUsageDialogLaunchL()
+void COMASuplSession::StartUsageDialogLaunchL()
{
iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
ReSetSuplUsageFlag();
@@ -5245,7 +5239,7 @@
InitializeL(iRequestID);
}
}
- }*/
+ }
TBool COMASuplSession::IsEtelNotifySet()
{
@@ -5285,10 +5279,10 @@
iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__);
- //if (!iIapDialogShown)
- // iProtocolManager.LaunchSuplDialogTimeoutUI(this);
- // else
- // iIapDlgTimerExpired = ETrue;
+ if (!iIapDialogShown)
+ iProtocolManager.LaunchSuplDialogTimeoutUI(this);
+ else
+ iIapDlgTimerExpired = ETrue;
}
return;
@@ -5298,14 +5292,14 @@
// COMASuplSession::SettingsTimeOutUICompletedL
//
// -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt /*aError*/)
+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);
+ TBuf<64> msg;
+ msg.Copy(_L("SUPL Timeout UI completed with ... "));
+ msg.AppendNum(aError);
+ iTrace->Trace(msg,KTraceFileName, __LINE__);
+ iSessionObserver.TerminateSession(this, KErrGeneral);
return;
}
@@ -5484,15 +5478,11 @@
void COMASuplSession::GetPeriodicTriggerParams()
{
- iTrace->Trace(_L("COMASuplSession::GetPeriodicTriggerParams"),
- KTraceFileName, __LINE__);
- TInt ret = iTriggerParams.Get(iNumFixes, iInterval, iStartTime);
- if (KErrNone == ret)
- {
- iTotalNoOfFixes = iNumFixes;
- iStartTimeCopy = iStartTime;
- }
- }
+ iTrace->Trace(_L("COMASuplSession::GetPeriodicTriggerParams"), KTraceFileName, __LINE__);
+ iTriggerParams.Get(iNumFixes, iInterval, iStartTime);
+ iTotalNoOfFixes = iNumFixes;
+ iStartTimeCopy = iStartTime;
+ }
void COMASuplSession::StartPeriodicTriggerTimer()
{
@@ -5623,14 +5613,7 @@
}
CTriggerParams* activeSessionParam = CTriggerParams::NewLC();
- TTime endTime;
- endTime.HomeTime();
- TTimeIntervalSeconds period;
- period = iNumFixes * iInterval;
- endTime = endTime + period;
activeSessionParam->Set(iSETSessionUniqueId,iRequestorName,ETrue,ETrue,CTriggerParams::EPeriodic,requestType,iNumFixes,iInterval);
- activeSessionParam->SetTriggerEndTime(endTime);
-
iTrace->Trace(_L("Session Id : "), KTraceFileName, __LINE__);
TBuf<64> sessionId;
sessionId.AppendNum(iSETSessionUniqueId);
@@ -5695,7 +5678,7 @@
//Inform UI that ,trigger session has started...
InsertActiveSessionL();
TInt privacyId;
- TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, privacyId); )
+ iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, privacyId);
iTrace->Trace(_L(" Calling InsertActiveSessionL"), KTraceFileName, __LINE__);
}
@@ -5712,13 +5695,11 @@
CTriggerParams::TRequestType requestType;
TUint64 outstandingTrigger;
TUint64 interval;
- TTime endTime;
HBufC* sessionName = HBufC::NewL( KMaxSessionNameLength );
aParamValues->Get(sessionId,sessionName->Des(),notificationPresent,triggerNotificationStatus,
triggerType,requestType,outstandingTrigger,interval);
- aParamValues->GetTriggerEndTime(endTime);
//triggerNotificationStatus = ETrue;
UpdateActiveTriggerSession(); //Update UI for trigger info...
@@ -5734,7 +5715,7 @@
- TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);)
+ iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);
}