Revert "Show public username instead of jidname"
This reverts commit d6d0e2364c
.
This commit is contained in:
parent
2f7ab021d1
commit
8e326f0dac
2 changed files with 7 additions and 5 deletions
src/main/java/eu/siacs/conversations
|
@ -115,7 +115,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
||||||
final Contact contact = account.getRoster().getContact(jid);
|
final Contact contact = account.getRoster().getContact(jid);
|
||||||
boolean bothPre = contact.getOption(Contact.Options.TO) && contact.getOption(Contact.Options.FROM);
|
boolean bothPre = contact.getOption(Contact.Options.TO) && contact.getOption(Contact.Options.FROM);
|
||||||
if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
|
if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
|
||||||
contact.setServerName(contact.getPublicDisplayName());
|
contact.setServerName(name);
|
||||||
contact.parseGroupsFromElement(item);
|
contact.parseGroupsFromElement(item);
|
||||||
}
|
}
|
||||||
if ("remove".equals(subscription)) {
|
if ("remove".equals(subscription)) {
|
||||||
|
@ -485,4 +485,6 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -690,10 +690,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
|
||||||
mNotifyStatusText.setText(R.string.notify_on_all_messages);
|
mNotifyStatusText.setText(R.string.notify_on_all_messages);
|
||||||
}
|
}
|
||||||
|
|
||||||
TextView username = binding.detailsContactName;
|
TextView abtitle = binding.detailsContactName;
|
||||||
username.setText(contact.getDisplayName());
|
abtitle.setText(contact.getDisplayName());
|
||||||
username.setSelected(true);
|
abtitle.setSelected(true);
|
||||||
username.setClickable(false);
|
abtitle.setClickable(false);
|
||||||
|
|
||||||
invalidateOptionsMenu();
|
invalidateOptionsMenu();
|
||||||
if (contact.showInRoster()) {
|
if (contact.showInRoster()) {
|
||||||
|
|
Loading…
Add table
Reference in a new issue