equal
deleted
inserted
replaced
247 if (iConditions[ i ]->Evaluate(currentValue, aChannelId)) |
247 if (iConditions[ i ]->Evaluate(currentValue, aChannelId)) |
248 { |
248 { |
249 matched = ETrue; |
249 matched = ETrue; |
250 CSensorConditionBase *condition = iConditions[i]; |
250 CSensorConditionBase *condition = iConditions[i]; |
251 iConditions.Remove(i); |
251 iConditions.Remove(i); |
252 |
252 if (iSensorListener) |
253 iSensorListener->ConditionMet( |
253 { |
254 condition, |
254 iSensorListener->ConditionMet( |
255 condition->GetChannelId(), |
255 condition, |
256 currentValue, |
256 condition->GetChannelId(), |
257 javaTime); |
257 currentValue, |
258 |
258 javaTime); |
|
259 } |
259 delete condition; |
260 delete condition; |
260 } |
261 } |
261 } |
262 } |
262 |
263 |
263 // Also send all values separately if we have java side custom conditions |
264 // Also send all values separately if we have java side custom conditions |
264 if (iJavaConditionEval) |
265 if (iJavaConditionEval) |
265 { |
266 { |
266 if (iSensorListener != NULL) |
|
267 iSensorListener->ConditionMet(0, aChannelId, currentValue, javaTime); |
267 iSensorListener->ConditionMet(0, aChannelId, currentValue, javaTime); |
268 } |
268 } |
269 return matched; |
269 return matched; |
270 } |
270 } |
271 |
271 |