conversation: fix incoming call
Change-Id: Id503ab366006f30e76ff718deef1fc3214e50c80
diff --git a/src/utils.h b/src/utils.h
index b825344..8a6c958 100755
--- a/src/utils.h
+++ b/src/utils.h
@@ -127,19 +127,25 @@
* the iterator is invalid thus it needs to be checked by caller.
* @param uid UID of conversation being searched
* @param model ConversationModel in which to do the lookup
- * @param includeSearchResult include search result
* @return iterator pointing to corresponding Conversation if any. Points to past-the-end element otherwise.
*/
-static inline lrc::api::ConversationModel::ConversationQueue::const_iterator getConversationFromUid(const QString& uid, const lrc::api::ConversationModel& model, bool includeSearchResult) {
- auto result = std::find_if(model.allFilteredConversations().begin(), model.allFilteredConversations().end(),
+static inline lrc::api::ConversationModel::ConversationQueue::const_iterator getConversationFromUid(const QString& uid, const lrc::api::ConversationModel& model) {
+ return std::find_if(model.allFilteredConversations().begin(), model.allFilteredConversations().end(),
[&] (const lrc::api::conversation::Info& conv) {
- return uid == conv.uid;
- });
- if (!includeSearchResult || (result != model.allFilteredConversations().end())) {
- return result;
- }
+ return uid == conv.uid;
+ });
+}
+
+/**
+* This function return an iterator pointing to a Conversation::Info in ConversationModel given its uid. If not found
+* the iterator is invalid thus it needs to be checked by caller.
+* @param uid UID of conversation being searched
+* @param model ConversationModel in which to do the lookup
+* @return iterator pointing to corresponding Conversation if any. Points to past-the-end element otherwise.
+*/
+static inline lrc::api::ConversationModel::ConversationQueue::const_iterator getSearchResultFromUid(const QString& uid, const lrc::api::ConversationModel& model) {
return std::find_if(model.getAllSearchResults().begin(), model.getAllSearchResults().end(),
- [&] (const lrc::api::conversation::Info& conv) {
+ [&] (const lrc::api::conversation::Info& conv) {
return uid == conv.uid;
});
}
@@ -149,11 +155,21 @@
* the iterator is invalid thus it needs to be checked by caller.
* @param conversation iterator pointing to a Conversation::Info in ConversationModel
* @param model ConversationModel in which to do the lookup
- * @param includeSearchResult include search result
* @return iterator pointing to corresponding Conversation if any. Points to past-the-end element otherwise.
*/
-static inline bool conversationExists(lrc::api::ConversationModel::ConversationQueue::const_iterator conversation, const lrc::api::ConversationModel& model, bool includeSearchResult) {
- return includeSearchResult ? (conversation != model.allFilteredConversations().end() || conversation != model.getAllSearchResults().end()) : conversation != model.allFilteredConversations().end();
+static inline bool conversationExists(lrc::api::ConversationModel::ConversationQueue::const_iterator conversation, const lrc::api::ConversationModel& model) {
+ return conversation != model.allFilteredConversations().end();
+}
+
+/**
+ * This function true if conversation exists
+ * the iterator is invalid thus it needs to be checked by caller.
+ * @param conversation iterator pointing to a Conversation::Info in ConversationModel
+ * @param model ConversationModel in which to do the lookup
+ * @return iterator pointing to corresponding Conversation if any. Points to past-the-end element otherwise.
+ */
+static inline bool searchResultExists(lrc::api::ConversationModel::ConversationQueue::const_iterator conversation, const lrc::api::ConversationModel& model) {
+ return conversation != model.getAllSearchResults().end();
}
/**