147 // (other items were commented in a header). |
147 // (other items were commented in a header). |
148 // ----------------------------------------------------------------------------- |
148 // ----------------------------------------------------------------------------- |
149 // |
149 // |
150 TInt COMASuplStartState::GenerateMessageL() |
150 TInt COMASuplStartState::GenerateMessageL() |
151 { |
151 { |
152 |
152 iTrace->Trace(_L("Start of COMASuplStartState::GenerateMessage"), KTraceFileName, __LINE__); |
153 iTrace->Trace(_L("Start of COMASuplStartState::GenerateMessage"), KTraceFileName, __LINE__); |
153 //if no cell stale cell id is available, retrieve current cell id |
154 //if no cell stale cell id is available, retrieve current cell id |
154 if(!iIsStaleCellId) |
155 if(!iIsStaleCellId) |
155 { |
156 { |
156 iTrace->Trace(_L("COMASuplStartState::GenerateMessage stale cell id false"), KTraceFileName, __LINE__); |
157 iTrace->Trace(_L("COMASuplStartState::GenerateMessage stale cell id false"), KTraceFileName, __LINE__); |
157 iLocationIDRequestor->GetLocationID(); |
158 iLocationIDRequestor->GetLocationID(); |
158 iTrace->Trace(_L("COMASuplStartState::GenerateMessage called get location id"), KTraceFileName, __LINE__); |
159 iTrace->Trace(_L("COMASuplStartState::GenerateMessage called get location id"), KTraceFileName, __LINE__); |
159 } |
160 } |
160 else // dont retrieve current cell id as cell id was already provided |
161 else // dont retrieve current cell id as cell id was already provided |
161 { |
162 { |
162 iGenerationStatus = EFalse; |
163 iGenerationStatus = EFalse; |
163 iECId = EFalse; |
164 iECId = EFalse; |
164 iTrace->Trace(_L("COMASuplStartState::GenerateMessage stale cell id true"), KTraceFileName, __LINE__); |
165 iTrace->Trace(_L("COMASuplStartState::GenerateMessage stale cell id true"), KTraceFileName, __LINE__); |
165 GetAssistceDataFromPluginL(KErrNone); |
166 GetAssistceDataFromPluginL(KErrNone); |
166 } |
167 } |
167 |
168 |
168 return KErrNone; |
169 return KErrNone; |
|
170 } |
169 } |
171 |
170 |
172 // ----------------------------------------------------------------------------- |
171 // ----------------------------------------------------------------------------- |
173 // COMASuplStartState::CancelOperation |
172 // COMASuplStartState::CancelOperation |
174 // Cancels the generation if SUPL START |
173 // Cancels the generation if SUPL START |
520 // ----------------------------------------------------------------------------- |
519 // ----------------------------------------------------------------------------- |
521 // |
520 // |
522 void COMASuplStartState::LocationIDRequestCompletedL(COMASuplLocationId* aLocationId, |
521 void COMASuplStartState::LocationIDRequestCompletedL(COMASuplLocationId* aLocationId, |
523 TInt aErrorCode) |
522 TInt aErrorCode) |
524 { |
523 { |
525 delete iLocationId; |
|
526 iLocationId = NULL; |
|
527 iLocationId = aLocationId; |
|
528 iTrace->Trace(_L("COMASuplStartState::LocationIDRequestCompleted..."), KTraceFileName, __LINE__); |
524 iTrace->Trace(_L("COMASuplStartState::LocationIDRequestCompleted..."), KTraceFileName, __LINE__); |
529 iGenerationStatus = EFalse; |
525 iGenerationStatus = EFalse; |
530 if(aErrorCode!=KErrNone) |
526 if(aErrorCode!=KErrNone) |
531 { |
527 { |
532 iTrace->Trace(_L("COMASuplStartState::LocationRequestFailed"), KTraceFileName, __LINE__); |
528 iTrace->Trace(_L("COMASuplStartState::LocationRequestFailed"), KTraceFileName, __LINE__); |
1010 aCurrentCellId.iCid = lRefCI; |
1008 aCurrentCellId.iCid = lRefCI; |
1011 aCurrentCellId.iMNC = lRefMNC; |
1009 aCurrentCellId.iMNC = lRefMNC; |
1012 aCurrentCellId.iMCC = lRefMCC; |
1010 aCurrentCellId.iMCC = lRefMCC; |
1013 aCurrentCellId.iLac = lRefLAC; |
1011 aCurrentCellId.iLac = lRefLAC; |
1014 } |
1012 } |
1015 } |
1013 } |
1016 |
|
1017 // ----------------------------------------------------------------------------- |
|
1018 // COMASuplStartState::SetStaleCellIdToUse |
|
1019 // Set stale cell id. |
|
1020 // |
|
1021 // (other items were commented in a header). |
|
1022 // ----------------------------------------------------------------------------- |
|
1023 // |
|
1024 void COMASuplStartState::SetStaleCellIdToUse(COMASuplLocationId* aLocationId) |
1014 void COMASuplStartState::SetStaleCellIdToUse(COMASuplLocationId* aLocationId) |
1025 { |
1015 { |
1026 if(iLocationId) |
1016 if(iLocationId) |
1027 { |
1017 { |
1028 delete iLocationId; |
1018 delete iLocationId; |