commit 6f81975fb42f921b2083fdbdc6f6ce37b39c1b5f
author Anthony Léonard <anthony.leonard@savoirfairelinux.com> Fri Jan 05 09:53:40 2018 -0500
committer Anthony Léonard <anthony.leonard@savoirfairelinux.com> Mon Jan 08 12:03:56 2018 -0500
tree 54f9a835917145655bc645d61cb49c21786f1f2d
parent a9d7c8e140e3531397954b531d1ea5539af20c73

deduplicate code retrieving conversation from uid

This code had multiple occurences throughout the client. It is now an
inlinable helper function in utils.h header.

Change-Id: Ic9ba45e4622338d1c40399e58eb969d9f99faa6a
Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com>

src/CurrentCallVC.mm

diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index 79f34b2..bd44a7f 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -45,6 +45,7 @@
 #import "BrokerVC.h"
 #import "views/IconButton.h"
 #import "views/CallLayer.h"
+#import "utils.h"
 
 @interface RendererConnectionsHolder : NSObject
 
@@ -292,10 +293,7 @@
     [ringingPanel setHidden:NO];
     [controlsPanel setHidden:YES];
     [headerContainer setHidden:YES];
-    auto it = std::find_if(convModel->allFilteredConversations().begin(), convModel->allFilteredConversations().end(),
-                           [self] (const lrc::api::conversation::Info& conv) {
-                               return convUid_ == conv.uid;
-                           });
+    auto it = getConversationFromUid(convUid_, *convModel);
     if (it != convModel->allFilteredConversations().end()) {
         auto& imgManip = reinterpret_cast<Interfaces::ImageManipulationDelegate&>(GlobalInstances::pixmapManipulator());
         QVariant photo = imgManip.conversationPhoto(*it, *accountInfo_);