FCL/sf/os/lbs: comparison locationrequestmgmt/networkrequesthandler/src/privacyandlocationrequesthandler.cpp

equal deleted inserted replaced

-:29dbbeac905d
+:0c2046328c85
 // Description:
 //
 #include <e32std.h>
 #include <e32property.h>
+#include <centralrepository.h>
+#ifdef SYMBIAN_FEATURE_MANAGER
+#include <featdiscovery.h>
+#include <featureuids.h>
+#endif
 // LBS-specific
 #include <lbs.h>
 #include <lbs/lbsadmin.h>
 #include <lbs/lbslocerrors.h>
 #include <lbs/lbslocclasstypes.h>
 #include "nrhpanic.h"
 #include "lbsdevloggermacros.h"
 #include "lbsqualityprofile.h"
+#include "lbsrootcenrepdefs.h"
+#include "lbspositioningstatusprops.h"
 #include "privacyandlocationrequesthandler.h"
 // Special 'invalid session' SessionId.
 const TLbsNetSessionIdInt KInvalidSessionId(TUid::Uid(0), 0);
 		iFsmArray.Remove(index);
 		}
 	iFsmArray.ResetAndDestroy();
+// force the count of active network initiated positioning sessions to 0
+	// this supports the pre-APE centric architecture wherein the NRH is
+	// destroyed on completion of network initiated positioning.
+RProperty::Set(iPosStatusCategory, KLbsNiPositioningStatusKey, 0);
 	delete iEmergencyFsm;
 delete iAgpsInterface;
 delete iPrivacyHandler;
 	}
 		{
 		LBSLOG_ERR2(ELogP3, "Failed to get KLbsSpecialFeatureIntermediateFutileUpdate (err %d)", err);
 		}
 	LBSLOG2(ELogP3, "Using KLbsSpecialFeatureIntermediateFutileUpdate = %d", specialFeature);
 	iSpecialFeatureIntermediateFutileUpdate = (specialFeature == CLbsAdmin::ESpecialFeatureOn) ? ETrue : EFalse;
+#if defined __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
+	iLocationManagementSupported = EFalse;
+#else
+#ifdef SYMBIAN_FEATURE_MANAGER
+iLocationManagementSupported = CFeatureDiscovery::IsFeatureSupportedL(NFeature::KLocationManagement);
+#else
+__ASSERT_ALWAYS(EFalse, User::Invariant()); // Would happen on older versions of symbian OS if this code ever backported
+#endif // SYMBIAN_FEATURE_MANAGER
+#endif // __WINSCW__ && defined SYMBIAN_CELLMO_CENTRIC
+// Get the CategoryUid from the cenrep file owned by LbsRoot for accessing Positioning Status P&S Keys
+CRepository* rep = CRepository::NewLC(KLbsCenRepUid);
+TInt posStatusCategory;
+err = rep->Get(KNiPositioningStatusAPIKey, posStatusCategory);
+User::LeaveIfError(err);
+CleanupStack::PopAndDestroy(rep);
+iPosStatusCategory = TUid::Uid(posStatusCategory);
 	}
 /**
 		}
 	if (fsm)
 		{
 		// Add the state machine to the buffer.
-		TInt err = iFsmArray.Append(fsm);
+		iFsmArray.Append(fsm);
-		if( err != KErrNone )
-			{
-			delete fsm;
-			return NULL;
-			}
 		iNumActiveSessions++; // conceptually, a session starts when a Fsm is created for it
 		}
 RLbsNetworkRegistrationStatus& CPrivacyAndLocationHandler::NetworkRegistrationStatus()
 	{
 	return iNetRegStatus;
 	}
+// increments the P&S key tracking mobile terminated positioning requests
+void CPrivacyAndLocationHandler::IncrementPositioningStatus()
+{
+TInt count;
+RProperty::Get(iPosStatusCategory, KLbsNiPositioningStatusKey, count);
+RProperty::Set(iPosStatusCategory, KLbsNiPositioningStatusKey, count+1);
+}
+// decrements the P&S key tracking mobile terminated positioning requests
+// if location management is supported. In the alternative architecture,
+// the NRH is not aware of the positioning session's progress, but is
+// transient. Therefore the positioning status is set to zero in the
+// class destructor.
+void CPrivacyAndLocationHandler::DecrementPositioningStatus()
+{
+if (iLocationManagementSupported)
+{
+TInt count;
+RProperty::Get(iPosStatusCategory, KLbsNiPositioningStatusKey, count);
+if(count>0)
+{
+RProperty::Set(iPosStatusCategory, KLbsNiPositioningStatusKey, count-1);
+}
+else
+{
+LBSLOG_ERR(ELogP3, "CPrivacyAndLocationHandler::DecrementPositioningStatus() - Incorrect Positioning Status count\n");
+}
+}
+}
 /**
 */
 MX3pStatusHandler& CPrivacyAndLocationHandler::X3pStatusHandler()
 																TInt aReason)
 	{
 	if(aSessionId == iFsm->SessionId())
 		{
 		iFsm->ExitData().SetExitData(TPrivLocStateExitData::EExitSessionComplete, aReason);
 		iFsm->ChangeState(CLbsPrivLocFsm::EStateIdle, aSessionId);
 		}
 	}
 /** Called when a reference position arrives from the network.
 */
 RLbsNetworkRegistrationStatus& CLbsPrivLocStateBase::LbsNetworkRegistrationStatus()
 	{
 	return iFsm->PrivLocHandler().NetworkRegistrationStatus();
 	}
+/*
+* increments the network initiated positioning status count
+* and remembers that it has done
+*/
+void CLbsPrivLocStateBase::IncrementPositioningStatus()
+{
+iFsm->PrivLocHandler().IncrementPositioningStatus();
+iFsm->WasPositioningStatusIncremented() = ETrue;
+}
 // -----------------------------------------------------------------------------
 //
 // ----------------------- Class CLbsPrivLocIdleState --------------------
 //
 // Implements the Idle state of the Privacy and Location Request Handler
 if(iFsm->WasPrivacyResponseReceivedStateExited())
 {
 // The request relates to a rejected privacy request
 // or a request for this session which has already been answered.
 // In either case, it should be refused. The message is sent to the
-// network gateway as apart of exit from the state, but we want to
+// network gateway as a part of exit from the state, but we want to
 // remain in Idle state.
 iFsm->ExitData().SetExitData(TPrivLocStateExitData::EExitCancelledByPrivacyController, KErrAccessDenied);
 iFsm->ChangeState(CLbsPrivLocFsm::EStateIdle, aSessionId);
 }
 else
 				TBool aIsEmergency,
 				const TLbsExternalRequestInfo& aExternalRequestInfo,
 				const TLbsNetPosRequestPrivacyInt& aNetPosRequestPrivacy)
 	{
 	iFsm->SessionType() = aSessionType;
+	iFsm->ExternalRequestType() = aExternalRequestInfo.RequestType();
 	iFsm->ExitData().SetExitData(TPrivLocStateExitData::EExitPrivacyRequestReceived, KErrNone);
 	TPrivLocWaitPrivResponseParams privacyRequestParams(	aSessionId,
 													aSessionType,
 													aExternalRequestInfo,
 													aNetPosRequestPrivacy,
 						}
 					}
 				}
-			// For MtLrs the Protcol module should not
+			// For MtLrs the Protocol module should not
 			// send a REF position until after we have sent the Priv response to the PM
 			// Inform network of the privacy response for normal privacy requests.
 			if (iFsm->SessionType() == TLbsNetworkEnumInt::EServiceMobileTerminated)
 				{
 		iFsm->PrivacyResponse() = aRequestResult;
 		if(iFsm->PrivacyResponse() == TLbsNetworkEnumInt::EPrivacyResponseAccepted)
 			{
 			// Tell the AGPS handler that we are going to start a location request soon.
 			AgpsInterface()->PreStartPositioning(iFsm->SessionId(), iFsm->IsEmergency());
+			// Set the Positioning Status for the UI indicator.
+			// Not done for silent requests.
+			if (iFsm->ExternalRequestType() < TLbsExternalRequestInfo::ERequestSingleShotSilent)
+			    {
+IncrementPositioningStatus();
+			    }
 			if(iFsm->LocReqReceived())
 				{
 				TPrivLocWaitLocationUpdateParams updateRequestParams(iFsm->SessionId(),
 																iFsm->PosRequestMethod(),
 	iIsEmergency(EFalse),
 	iSessionType(TLbsNetworkEnumInt::EServiceNone),
 	iRefPosProcessed(EFalse),
 	iLocReqReceived(EFalse),
 	iReqCancelled(EFalse),
-	iWasPrivacyResponseReceivedStateExited(EFalse)
+	iWasPrivacyResponseReceivedStateExited(EFalse),
+	iPositioningStatusIncremented(EFalse)
 	{
 	}
 // -----------------------------------------------------------------------------
 // CLbsPrivLocFsm::~CLbsPrivLocFsm
 									const TLbsNetSessionIdInt& aSessionId,
 									TInt aReason)
 	{
 	LBSLOG3(ELogP3, "FSM(%d) OnSessionComplete reason=%d",iSessionId.SessionNum(),aReason);
 	iCurrentState->OnSessionComplete(aSessionId, aReason);
+// update the positioning status. Note this is updated only if it was previously
+// incremented as a result of this session.
+if (WasPositioningStatusIncremented())
+{
+PrivLocHandler().DecrementPositioningStatus();
+WasPositioningStatusIncremented() = EFalse;
+}
 	}
 // -----------------------------------------------------------------------------
 // CLbsPrivLocFsm::OnNetLocRequest
 // Description: The Message Switch has passed on a request for a position update

branch	RCL_3
changeset 54	0c2046328c85
parent 52	29dbbeac905d
child 55	c92d4f3c47c5