mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

Revert "Show public username instead of jidname"

Browse source 
This reverts commit d6d0e2364c.
This commit is contained in:
12aw 2023-12-16 11:39:30 +01:00
parent 2f7ab021d1
commit 8e326f0dac
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/eu/siacs/conversations/parser/IqParser.java
View file

@ -115,7 +115,7 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
final Contact contact = account.getRoster().getContact(jid);
boolean bothPre = contact.getOption(Contact.Options.TO) && contact.getOption(Contact.Options.FROM);
if (!contact.getOption(Contact.Options.DIRTY_PUSH)) {
contact.setServerName(contact.getPublicDisplayName());
contact.setServerName(name);
contact.parseGroupsFromElement(item);
}
if ("remove".equals(subscription)) {
@ -485,4 +485,6 @@ public class IqParser extends AbstractParser implements OnIqPacketReceived {
}
}
}
;
}

8
src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
View file

@ -690,10 +690,10 @@ public class ContactDetailsActivity extends OmemoActivity implements OnAccountUp
mNotifyStatusText.setText(R.string.notify_on_all_messages);
}
TextView username = binding.detailsContactName;
username.setText(contact.getDisplayName());
username.setSelected(true);
username.setClickable(false);
TextView abtitle = binding.detailsContactName;
abtitle.setText(contact.getDisplayName());
abtitle.setSelected(true);
abtitle.setClickable(false);
invalidateOptionsMenu();
if (contact.showInRoster()) {