improve name display in call view
Both incoming call view and in-call view were displaying the ringID of
the contact instead of its best name. This is now fixed and more user
friendly.
Plus, two non-necessary constraints in incoming call view are removed.
This gives a better aligment of textfields when using a language other
than english.
Change-Id: I675c95b5f996b3fa8853554f14c0ed0aab44be87
Reviewed-by: Olivier Soldano <olivier.soldano@savoirfairelinux.com>
diff --git a/src/CurrentCallVC.mm b/src/CurrentCallVC.mm
index bd44a7f..fa478fe 100644
--- a/src/CurrentCallVC.mm
+++ b/src/CurrentCallVC.mm
@@ -213,7 +213,9 @@
auto currentCall = callModel->getCall(callUid_);
NSLog(@"\n status %@ \n",@(lrc::api::call::to_string(currentCall.status).c_str()));
- [personLabel setStringValue:@(currentCall.peer.c_str())];
+ auto convIt = getConversationFromUid(convUid_, *accountInfo_->conversationModel);
+ if (convIt != accountInfo_->conversationModel->allFilteredConversations().end())
+ [personLabel setStringValue:bestNameForConversation(*convIt, *accountInfo_->conversationModel)];
[timeSpentLabel setStringValue:@(callModel->getFormattedCallDuration(callUid_).c_str())];
[timeSpentLabel setHidden:NO];
if (refreshDurationTimer == nil)
@@ -298,7 +300,7 @@
auto& imgManip = reinterpret_cast<Interfaces::ImageManipulationDelegate&>(GlobalInstances::pixmapManipulator());
QVariant photo = imgManip.conversationPhoto(*it, *accountInfo_);
[incomingPersonPhoto setImage:QtMac::toNSImage(qvariant_cast<QPixmap>(photo))];
- [incomingDisplayName setStringValue:@(call.peer.c_str())];
+ [incomingDisplayName setStringValue:bestNameForConversation(*it, *convModel)];
}
}