mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-19 04:28:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix displayname for chat alert

Browse source
This commit is contained in:
Erwan Croze 2018-09-11 09:12:59 +02:00
parent 3e2c1febfa
commit 01214fba33
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/android/org/linphone/chat/ChatEventsAdapter.java
View file

@ -445,6 +445,14 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
case ConferenceSecurityEvent:
String message;
holder.eventLayout.setVisibility(View.VISIBLE);
if (event.getSecurityEventFaultyDevice() != null) {
LinphoneContact contact = ContactsManager.getInstance().findContactFromAddress(event.getSecurityEventFaultyDevice());
if (contact != null) {
displayName = contact.getFullName();
} else {
displayName = LinphoneUtils.getAddressDisplayName(event.getSecurityEventFaultyDevice());
}
}
switch (event.getSecurityEventType()) {
case SecurityLevelDowngraded:
message = mContext.getString(R.string.security_level_degraded);
@ -452,7 +460,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
case MultideviceParticipantDetected:
holder.eventMessage.setTextColor(Color.RED);
if (event.getSecurityEventFaultyDevice() != null) {
message = mContext.getString(R.string.security_alert_multidevice_from).replace("%s", event.getSecurityEventFaultyDevice().getUsername());
message = mContext.getString(R.string.security_alert_multidevice_from).replace("%s", displayName);
} else {
message = mContext.getString(R.string.security_alert_multidevice);
}
@ -461,7 +469,7 @@ public class ChatEventsAdapter extends ListSelectionAdapter {
case LimeIdentityKeyChanged:
holder.eventMessage.setTextColor(Color.RED);
if (event.getSecurityEventFaultyDevice() != null) {
message = mContext.getString(R.string.security_alert_from).replace("%s", event.getSecurityEventFaultyDevice().getUsername());
message = mContext.getString(R.string.security_alert_from).replace("%s", displayName);
} else {
message = mContext.getString(R.string.security_alert);
}