FCL/sf/mw/locationsrv: comparison supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos

equal deleted inserted replaced

-:2b4ea9893b66
+:6b6920c56e2f
 iSuplVersion.SetSuplVersion(KSuplMajorVersion,KSuplMinorVersion,KSuplRevision);
 if( aIMSI.Length() )
 {
-User::LeaveIfError(iIMSI.Create( aIMSI ));
+iIMSI.Create( aIMSI );
 }
 if(iPosHandler)
 {
 iTrace->Trace(_L("Creating POSSession..."), KTraceFileName, __LINE__);
 TPosition posInfo;
 TOMASuplUtcTime UtcTime;
 TOMASuplPositionEstimate PosEstimate;
 TDateTime TimeStamp;
-//coverity[var_decl]
+TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
-TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
+	TInt AltitudeUncertainty = 0;
 TOMASuplAltitudeInfo AltitudeInfo;
 TInt latitude,longitude;
 TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
 TOMASuplAltitudeInfo::TOMASuplAltitudeDirection altitudeDirection;
 TOMASuplUncertainty Uncertainty;
 iTrace->Trace(msg,KTraceFileName, __LINE__);
 msg.Copy(_L("Altitude "));
 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__);
 // Convert uncertainty to meters
 TReal pwrMjr, pwrMnr, pwrAlt;
 TPosition posInfo;
 TOMASuplUtcTime UtcTime;
 TOMASuplPositionEstimate PosEstimate;
 TDateTime TimeStamp;
-//coverity[var_decl]
+TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
-TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
+	TInt AltitudeUncertainty = 0;
 TOMASuplAltitudeInfo AltitudeInfo;
 TInt latitude,longitude;
 TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
 TOMASuplAltitudeInfo::TOMASuplAltitudeDirection AltitudeDirection;
 TOMASuplUncertainty Uncertainty;
 OrientationMajorAxis);
 // Convert uncertainty to meters
 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);
 AltitudeUncertaintyReal = 10 * (pwrAlt -1);
 {
 msg.Copy(_L("The device is in ON LINE mode."));
 iTrace->Trace(msg,KTraceFileName, __LINE__);
 }
-/*CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+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();
 if(messageType == COMASuplAsnMessageBase::ESUPL_INIT && aErrorCode == KErrNone)
 {
 }
 else //Other messages than SUPL_INIT.... Send End
 {
 CreateCloneMessageL(aDecodedAsnMessage);
 UpdateSuplSessionIDL();
+		if (iRequestType == ESUPL_NETWORK && messageType == COMASuplAsnMessageBase::ESUPL_INIT)
+			{
+			ServerAddressCheckForSuplInitL();
+			}
 iSuplSessionState = ESUPL_INITIALIZED;
 iSuplMsgType = ESUPL_END;
 if((aErrorCode == KErrCompletion && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
 iTrace->Trace(_L("Failed to Generate First messsage from POS...still continueing.."), KTraceFileName, __LINE__);
 iIsFirstPOSMessage = EFalse;
 return;
 }
 }
-			//Comment to ignore coverity missing break error
-			//coverity[MISSING_BREAK  :FALSE]
 case COMASuplState::ESUPL_POS_INIT:
 {
 cancelSendRequestor = EFalse;
 iSuplSessionState = ESUPL_GENERATE;
 iSuplMsgType = ESUPL_END;
 // -----------------------------------------------------------------------------
 // COMASuplSession::SettingsUsageUICompletedL
 //
 // -----------------------------------------------------------------------------
-/*void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
+void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
 {
 iUIFlag = EFalse;
 TBuf<64> msg;
 msg.Copy(_L("SUPL Usage UI completed with ... "));
 msg.AppendNum(aError);
 msg.AppendNum(aError);
 iTrace->Trace(msg,KTraceFileName, __LINE__);
 iSessionObserver.TerminateSession(this, KErrGeneral);
 return;
 }
-	}*/
+}
 // -----------------------------------------------------------------------------
 // COMASuplSession::CheckForSuplUsageL
 //
 // -----------------------------------------------------------------------------
 void COMASuplSession::CheckForSuplUsageL()
 {
 iTrace->Trace(_L("COMASuplSession::CheckForSuplUsageL Start"), KTraceFileName, __LINE__);
-/*if (iSuplUsage >= 1)
+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
-	{
+{
-		if (iRoaming)
+iTrace->Trace(_L("CheckForSuplUsageL, Initializing"), KTraceFileName, __LINE__);
-HandleRoamingCheckCompleteL(KErrNone, EFalse);
+InitializeL(iRequestID);
-else
+}
-{
+}
-iEtelRoamingCheck = ETrue;
-iProtocolManager.CheckForRoaming();
-}
-	            //InitializeL(iRequestID);
-	          	}
-/*}
 else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
 {
 if (iRoaming)
 HandleRoamingCheckCompleteL(KErrNone, EFalse);
 iProtocolManager.CheckForRoaming();
 }
 }
 }
 else
-	        InitializeL(iRequestID); */
+InitializeL(iRequestID);
 }
 // -----------------------------------------------------------------------------
 // COMASuplSession::CheckForTimerExpiry
 iEtelRoamingCheck = EFalse;
 if (aErrorCode == KErrNone)
 {
 iUsageHomeNW = aHomeNw;
 iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);
-//CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-/*if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
+if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
 {
 TInt err;
 if (!aHomeNw)
 {
 iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
 {
 iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
 HandleSuplErrorL(err);
 }
-}*/
+}
-//else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
+else if (usage == CSuplSettings::ESuplUsageHomeAutomatic)
-//{
+{
-//if (!aHomeNw)
+if (!aHomeNw)
-//  {
+{
-//TInt err = KErrNone;
+TInt err;
 //if (!iSuplSettings->IsUIActive() )
 {
-//iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
+iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
-//err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
+err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);
 if(iSuplMsgType == ESUPL_INIT)
 {
 iTrace->Trace(_L("Dialog timer started"), KTraceFileName, __LINE__);
 }
 }
 }
-/*  if(!iSuplSettings->IsUIActive() && KErrNone != err)
+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
 {
 iSessionObserver.TerminateSession(this, KErrGeneral);
 }
 TBool COMASuplSession::GetSuplUsageFlag()
 {
 return iUsageDialog;
 }
-/*void COMASuplSession::StartUsageDialogLaunchL()
+void COMASuplSession::StartUsageDialogLaunchL()
 {
 iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
 ReSetSuplUsageFlag();
 iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL, flag reset done"), KTraceFileName, __LINE__);
 }
 else
 InitializeL(iRequestID);
 }
 }
-}*/
+}
 TBool COMASuplSession::IsEtelNotifySet()
 {
 iTrace->Trace(_L("COMASuplSession::IsEtelNotifySet"), KTraceFileName, __LINE__);
 return iEtelNotify;
 else
 {
 iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__);
-//if (!iIapDialogShown)
+if (!iIapDialogShown)
-	   // iProtocolManager.LaunchSuplDialogTimeoutUI(this);
+iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-// else
+else
-// iIapDlgTimerExpired = ETrue;
+iIapDlgTimerExpired = ETrue;
 }
 return;
 }
 // -----------------------------------------------------------------------------
 // COMASuplSession::SettingsTimeOutUICompletedL
 //
 // -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt /*aError*/)
+void COMASuplSession::SettingsTimeOutUICompletedL(TInt aError)
 {
-	  //  TBuf<64> msg;
+TBuf<64> msg;
-	  //  msg.Copy(_L("SUPL Timeout UI completed with ... "));
+msg.Copy(_L("SUPL Timeout UI completed with ... "));
-	  //  msg.AppendNum(aError);
+msg.AppendNum(aError);
-	  //  iTrace->Trace(msg,KTraceFileName, __LINE__);
+iTrace->Trace(msg,KTraceFileName, __LINE__);
-	  //  iSessionObserver.TerminateSession(this, KErrGeneral);
+iSessionObserver.TerminateSession(this, KErrGeneral);
 return;
 }
 // -----------------------------------------------------------------------------
 iTrace->Trace(_L("End of COMASuplSession::RunTriggerSessionL"), KTraceFileName, __LINE__);
 }
 void COMASuplSession::GetPeriodicTriggerParams()
 {
-iTrace->Trace(_L("COMASuplSession::GetPeriodicTriggerParams"),
+iTrace->Trace(_L("COMASuplSession::GetPeriodicTriggerParams"), KTraceFileName, __LINE__);
-KTraceFileName, __LINE__);
+iTriggerParams.Get(iNumFixes, iInterval, iStartTime);
-TInt ret = iTriggerParams.Get(iNumFixes, iInterval, iStartTime);
+iTotalNoOfFixes = iNumFixes;
-if (KErrNone == ret)
+iStartTimeCopy = iStartTime;
-{
+}
-iTotalNoOfFixes = iNumFixes;
-iStartTimeCopy = iStartTime;
-}
-}
 void COMASuplSession::StartPeriodicTriggerTimer()
 {
 if (iNumFixes != 0)
 {
 						{
 							requestType = CTriggerParams::ENetworkInitiated;
 						}
 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);
 iTrace->Trace(sessionId, KTraceFileName, __LINE__);
 				iTrace->Trace(_L("iNetworkPrivacy is not null"), KTraceFileName, __LINE__);
 				//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__);
 	}
 	else
 	if (!iPrivacyOverride)
 TBool triggerNotificationStatus;
 CTriggerParams::TTriggerType triggerType;
 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...
 if (triggerNotificationStatus)
 		if (iNetworkPrivacy)
 				iTrace->Trace(_L("iNetworkPrivacy is not null"), KTraceFileName, __LINE__);
-	TRAP_IGNORE(iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);)
+	iNetworkPrivacy->NotifyLocationRequestL(*iSuplReqInfo, iRequestorId);
 }
 delete sessionName;
 delete aParamValues;

branch	RCL_3
changeset 45	6b6920c56e2f
parent 44	2b4ea9893b66
child 49	10852b179f64